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

Merge pull request #273 from hason/autoloader 

Fixed autoload generator
pull/274/merge
Jordi Boggiano 2012-02-02 07:02:13 -08:00
parent 2e9de65ae0 d27989c808
commit ad92154c8f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ EOF;
$filesystem = new Filesystem(); $filesystem = new Filesystem();
$vendorPath = strtr(realpath($installationManager->getVendorPath()), '\\', '/'); $vendorPath = strtr(realpath($installationManager->getVendorPath()), '\\', '/');
$relVendorPath = ltrim(substr($vendorPath, strlen(getcwd())), '/'); $relVendorPath = $filesystem->findShortestPath(getcwd(), $vendorPath);
$vendorDirCode = $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true); $vendorDirCode = $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true);
$namespacesFile = <<<EOF $namespacesFile = <<<EOF

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

@ -77,6 +77,12 @@ class AutoloadGeneratorTest extends \PHPUnit_Framework_TestCase
$this->assertAutoloadFiles('main', $this->vendorDir.'/.composer'); $this->assertAutoloadFiles('main', $this->vendorDir.'/.composer');
} }
public function testVendorDirSameAsWorkingDir()
{
chdir($this->vendorDir);
$this->testMainPackageAutoloading();
}
public function testMainPackageAutoloadingAlternativeVendorDir() public function testMainPackageAutoloadingAlternativeVendorDir()
{ {
$package = new MemoryPackage('a', '1.0', '1.0'); $package = new MemoryPackage('a', '1.0', '1.0');