Verified Commit ede017cc authored by godotislate's avatar godotislate
Browse files

task: #3582506 Connection::open() should have SensitiveParameter 

By: prudloff
By: adhershmnair
By: smustgrave
By: longwave
dquote>

(cherry picked from commit ac8820e1)
parent 016fd084

core/lib/Drupal/Core/Database/Connection.php

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public function __construct(object $connection, array $connection_options) { 
   * @return object

   *   A client connection object.

   */

  abstract public static function open(array &$connection_options = []);

  abstract public static function open(#[\SensitiveParameter] array &$connection_options = []);



  /**

   * Ensures that the client connection can be garbage collected.

core/modules/mysql/src/Driver/Database/mysql/Connection.php

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public function __construct(\PDO $connection, array $connection_options) { 
  /**

   * {@inheritdoc}

   */

  public static function open(array &$connection_options = []) {

  public static function open(#[\SensitiveParameter] array &$connection_options = []) {

    // The DSN should use either a socket or a host/port.

    if (isset($connection_options['unix_socket'])) {

      $dsn = 'mysql:unix_socket=' . $connection_options['unix_socket'];

core/modules/mysqli/src/Driver/Database/mysqli/Connection.php

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public function __construct( 
  /**

   * {@inheritdoc}

   */

  public static function open(array &$connection_options = []) {

  public static function open(#[\SensitiveParameter] array &$connection_options = []) {

    // Sets mysqli error reporting mode to report errors from mysqli function

    // calls and to throw mysqli_sql_exception for errors.

    // @see https://www.php.net/manual/en/mysqli-driver.report-mode.php

core/modules/pgsql/src/Driver/Database/pgsql/Connection.php

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ protected function setPrefix($prefix) { 
  /**

   * {@inheritdoc}

   */

  public static function open(array &$connection_options = []) {

  public static function open(#[\SensitiveParameter] array &$connection_options = []) {

    // Default to TCP connection on port 5432.

    if (empty($connection_options['port'])) {

      $connection_options['port'] = 5432;

core/modules/sqlite/src/Driver/Database/sqlite/Connection.php

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public function __construct(\PDO $connection, array $connection_options) { 
  /**

   * {@inheritdoc}

   */

  public static function open(array &$connection_options = []) {

  public static function open(#[\SensitiveParameter] array &$connection_options = []) {

    // Allow PDO options to be overridden.

    $connection_options += [

      'pdo' => [],