Merge pull request #5902 from kenjis/fix-autoloader-psr4

fix: Composer PSR-4 overwrites Config\Autoload::$psr4
codeigniter4 · Apr 16, 2022 · fc6bb8e · fc6bb8e
2 parents dd48692 + 0208c72
commit fc6bb8e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
@@ -328,7 +328,7 @@ private function loadComposerNamespaces(ClassLoader $composer): void
  $newPaths[rtrim($key, '\\ ')] = $value;
  }
 
- $this->prefixes = array_merge($this->prefixes, $newPaths);
+ $this->addNamespace($newPaths);
  }
 
  private function loadComposerClassmap(ClassLoader $composer): void

diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
@@ -233,6 +233,23 @@ public function testFindsComposerRoutes()
  $this->assertArrayHasKey('Laminas\\Escaper', $namespaces);
  }
 
+ public function testComposerNamespaceDoesNotOverwriteConfigAutoloadPsr4()
+ {
+ $config = new Autoload();
+ $config->psr4 = [
+ 'Psr\Log' => '/Config/Autoload/Psr/Log/',
+ ];
+ $modules = new Modules();
+ $modules->discoverInComposer = true;
+
+ $this->loader = new Autoloader();
+ $this->loader->initialize($config, $modules);
+
+ $namespaces = $this->loader->getNamespace();
+ $this->assertSame('/Config/Autoload/Psr/Log/', $namespaces['Psr\Log'][0]);
+ $this->assertStringContainsString(VENDORPATH, $namespaces['Psr\Log'][1]);
+ }
+
  public function testFindsComposerRoutesWithComposerPathNotFound()
  {
  $composerPath = COMPOSER_PATH;