public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fixed order of packages in the classmap autoloader

pull/1223/head
Martin Hasoň 2012-10-17 01:40:15 +02:00
parent b7f96d5dc3
commit e75abcbb41
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -200,8 +200,10 @@ EOF;
{ {
$psr0 = $this->parseAutoloadsType($packageMap, 'psr-0'); $psr0 = $this->parseAutoloadsType($packageMap, 'psr-0');
krsort($psr0); krsort($psr0);
$classmap = $this->parseAutoloadsType($packageMap, 'classmap');
$files = $this->parseAutoloadsType($this->sortPackageMap($packageMap), 'files'); $sortedPackageMap = $this->sortPackageMap($packageMap);
$classmap = $this->parseAutoloadsType($sortedPackageMap, 'classmap');
$files = $this->parseAutoloadsType($sortedPackageMap, 'files');
return array('psr-0' => $psr0, 'classmap' => $classmap, 'files' => $files); return array('psr-0' => $psr0, 'classmap' => $classmap, 'files' => $files);
} }

9
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
View File

@ -367,13 +367,13 @@ class AutoloadGeneratorTest extends TestCase
public function testOverrideVendorsAutoloading() public function testOverrideVendorsAutoloading()
{ {
$package = new Package('z', '1.0', '1.0'); $package = new Package('z', '1.0', '1.0');
$package->setAutoload(array('psr-0' => array('A\\B' => $this->workingDir.'/lib'))); $package->setAutoload(array('psr-0' => array('A\\B' => $this->workingDir.'/lib'), 'classmap' => array($this->workingDir.'/src')));
$package->setRequires(array(new Link('z', 'a/a'))); $package->setRequires(array(new Link('z', 'a/a')));
$packages = array(); $packages = array();
$packages[] = $a = new Package('a/a', '1.0', '1.0'); $packages[] = $a = new Package('a/a', '1.0', '1.0');
$packages[] = $b = new Package('b/b', '1.0', '1.0'); $packages[] = $b = new Package('b/b', '1.0', '1.0');
$a->setAutoload(array('psr-0' => array('A' => 'src/', 'A\\B' => 'lib/'))); $a->setAutoload(array('psr-0' => array('A' => 'src/', 'A\\B' => 'lib/'), 'classmap' => array('classmap')));
$b->setAutoload(array('psr-0' => array('B\\Sub\\Name' => 'src/'))); $b->setAutoload(array('psr-0' => array('B\\Sub\\Name' => 'src/')));
$this->repository->expects($this->once()) $this->repository->expects($this->once())
@ -381,12 +381,16 @@ class AutoloadGeneratorTest extends TestCase
->will($this->returnValue($packages)); ->will($this->returnValue($packages));
$this->fs->ensureDirectoryExists($this->workingDir.'/lib/A/B'); $this->fs->ensureDirectoryExists($this->workingDir.'/lib/A/B');
$this->fs->ensureDirectoryExists($this->workingDir.'/src/');
$this->fs->ensureDirectoryExists($this->vendorDir.'/composer'); $this->fs->ensureDirectoryExists($this->vendorDir.'/composer');
$this->fs->ensureDirectoryExists($this->vendorDir.'/a/a/classmap');
$this->fs->ensureDirectoryExists($this->vendorDir.'/a/a/src'); $this->fs->ensureDirectoryExists($this->vendorDir.'/a/a/src');
$this->fs->ensureDirectoryExists($this->vendorDir.'/a/a/lib/A/B'); $this->fs->ensureDirectoryExists($this->vendorDir.'/a/a/lib/A/B');
$this->fs->ensureDirectoryExists($this->vendorDir.'/b/b/src'); $this->fs->ensureDirectoryExists($this->vendorDir.'/b/b/src');
file_put_contents($this->workingDir.'/lib/A/B/C.php', '<?php namespace A\\B; class C {}'); file_put_contents($this->workingDir.'/lib/A/B/C.php', '<?php namespace A\\B; class C {}');
file_put_contents($this->workingDir.'/src/classes.php', '<?php namespace Foo; class Bar {}');
file_put_contents($this->vendorDir.'/a/a/lib/A/B/C.php', '<?php namespace A\\B; class C {}'); file_put_contents($this->vendorDir.'/a/a/lib/A/B/C.php', '<?php namespace A\\B; class C {}');
file_put_contents($this->vendorDir.'/a/a/classmap/classes.php', '<?php namespace Foo; class Bar {}');
$workDir = strtr($this->workingDir, '\\', '/'); $workDir = strtr($this->workingDir, '\\', '/');
$expectedNamespace = <<<EOF $expectedNamespace = <<<EOF
@ -415,6 +419,7 @@ EOF;
return array( return array(
'A\\\\B\\\\C' => \$baseDir . '/lib/A/B/C.php', 'A\\\\B\\\\C' => \$baseDir . '/lib/A/B/C.php',
'Foo\\\\Bar' => \$baseDir . '/src/classes.php',
); );
EOF; EOF;