Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion system/Autoloader/Autoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,9 @@ private function loadComposerNamespaces(ClassLoader $composer, array $composerPa
$packageList = [];

foreach ($allData as $list) {
$packageList = array_merge($packageList, $list['versions']);
foreach ($list['versions'] as $packageName => $data) {
$packageList[$packageName] = $data;
}
}

// Check config for $composerPackages.
Expand Down
17 changes: 17 additions & 0 deletions tests/system/Autoloader/AutoloaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use CodeIgniter\Exceptions\RuntimeException;
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\ReflectionHelper;
use Composer\Autoload\ClassLoader;
use Config\Autoload;
use Config\Modules;
use PHPUnit\Framework\Attributes\Group;
Expand Down Expand Up @@ -417,6 +418,22 @@ public function testFindsComposerRoutesWithComposerPathNotFound(): void
$this->assertArrayNotHasKey('Laminas\\Escaper', $namespaces);
}

public function testLoadComposerNamespacesAccumulatesCorrectly(): void
{
$composer = $this->createMock(ClassLoader::class);
$composer->method('getPrefixesPsr4')->willReturn([
'Laminas\\Escaper\\' => [VENDORPATH . 'composer/../laminas/laminas-escaper/src'],
]);

$loader = new Autoloader();
$invoker = self::getPrivateMethodInvoker($loader, 'loadComposerNamespaces');

$invoker($composer, []);

$namespaces = $loader->getNamespace();
$this->assertArrayHasKey('Laminas\\Escaper', $namespaces);
}

public function testAutoloaderLoadsNonClassFiles(): void
{
$config = new Autoload();
Expand Down
Loading