Unverified Commit 8f2269dd authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3210310 by mondrake, murilohp, andypost, daffie, alexpott: Adjust... 

Issue #3210310 by mondrake, murilohp, andypost, daffie, alexpott: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
parent 8afba834

composer.lock

+1 −2
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ 
            "dist": {

                "type": "path",

                "url": "core",

                "reference": "34bfd0597745e88afb64bf5294f6af4975930fdc"

                "reference": "25a2835ba98c19a6fa4d60089d813a81de36e5e5"

            },

            "require": {

                "asm89/stack-cors": "^1.1",
@@ -670,7 +670,6 @@ 
                    "lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php",

                    "lib/Drupal/Core/Database/Connection.php",

                    "lib/Drupal/Core/Database/Database.php",

                    "lib/Drupal/Core/Database/Statement.php",

                    "lib/Drupal/Core/Database/StatementInterface.php",

                    "lib/Drupal/Core/DependencyInjection/Container.php",

                    "lib/Drupal/Core/DrupalKernel.php",

core/composer.json

+1 −3
Original line number Diff line number Diff line
@@ -172,8 +172,7 @@ 
    "autoload": {

        "psr-4": {

            "Drupal\\Core\\": "lib/Drupal/Core",

            "Drupal\\Component\\": "lib/Drupal/Component",

            "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"

            "Drupal\\Component\\": "lib/Drupal/Component"

        },

        "classmap": [

            "lib/Drupal.php",
@@ -191,7 +190,6 @@ 
            "lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php",

            "lib/Drupal/Core/Database/Connection.php",

            "lib/Drupal/Core/Database/Database.php",

            "lib/Drupal/Core/Database/Statement.php",

            "lib/Drupal/Core/Database/StatementInterface.php",

            "lib/Drupal/Core/DependencyInjection/Container.php",

            "lib/Drupal/Core/DrupalKernel.php",

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

+10 −348

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −25
Original line number Diff line number Diff line
@@ -644,31 +644,6 @@ public static function getConnectionInfoAsUrl($key = 'default') { 
    return $connection_class::createUrlFromConnectionOptions($db_info['default']);

  }



  /**

   * Gets the PHP namespace of a database driver from the connection info.

   *

   * @param array $connection_info

   *   The database connection information, as defined in settings.php. The

   *   structure of this array depends on the database driver it is connecting

   *   to.

   *

   * @return string

   *   The PHP namespace of the driver's database.

   *

   * @deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. There is no

   *   replacement as $connection_info['namespace'] is always set.

   *

   * @see https://www.drupal.org/node/3127769

   */

  protected static function getDatabaseDriverNamespace(array $connection_info) {

    @trigger_error(__METHOD__ . " is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. There is no replacement as \$connection_info['namespace'] is always set. See https://www.drupal.org/node/3127769.", E_USER_DEPRECATED);

    if (isset($connection_info['namespace'])) {

      return $connection_info['namespace'];

    }

    // Fallback for when the namespace is not provided in settings.php.

    return 'Drupal\\' . $connection_info['driver'] . '\\Driver\\Database\\' . $connection_info['driver'];

  }



  /**

   * Checks whether a namespace is within the namespace of a Drupal module.

   *

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

+0 −14

File changed.

Preview size limit exceeded, changes collapsed.