Verified Commit 4f0778d2 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3291830 by webflo: Fix PSR4 path for database driver 

(cherry picked from commit a80dddcc)
parent 17fcbdbb

core/lib/Drupal/Core/Site/Settings.php

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ public static function initialize($app_root, $site_path, &$class_loader) { 
        // the database. Therefore, allow the connection info to specify an

        // autoload directory for the driver.

        if (isset($info['autoload'])) {

          $class_loader->addPsr4($info['namespace'] . '\\', $info['autoload']);

          $class_loader->addPsr4($info['namespace'] . '\\', $app_root . '/' . $info['autoload']);

        }

      }

    }

core/tests/Drupal/Tests/Core/Site/SettingsTest.php

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ public function testDatabaseInfoInitialization(string $driver, ?string $namespac 
    if (!empty($expected_autoload)) {

      $class_loader->expects($this->once())

        ->method('addPsr4')

        ->with($expected_namespace . '\\', $expected_autoload);

        ->with($expected_namespace . '\\', vfsStream::url('root') . '/' . $expected_autoload);

    }

    else {

      $class_loader->expects($this->never())