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

Autoload Generator handles multiple PSR-0 paths 

The Autoload Generator was not behaving exactly as expected.
This PR is an alternate version of #203 based on some of
@stof's input on that PR.

The main differences are:

 * The main package is added first instead of last
 * parseAutoloads returns a different structure:
     array('psr-0' => array('Ns\\Foo' => array('installDir')))
 * dump and createLoader updated to account for new structure
pull/204/head
Beau Simensen 2012-01-12 21:14:30 -06:00
parent 2f3b188d5f
commit e8fcf281fa
3 changed files with 63 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,10 @@ EOF;
// build package => install path map
$packageMap = array();
// add main package
$packageMap[] = array($mainPackage, '');
foreach ($localRepo->getPackages() as $installedPackage) {
$packageMap[] = array(
$installedPackage,
@ -74,32 +78,38 @@ EOF;
);
}
// add main package
$packageMap[] = array($mainPackage, '');
$autoloads = $this->parseAutoloads($packageMap);
$appBaseDir = $filesystem->findShortestPathCode($vendorPath, getcwd(), true);
$appBaseDir = str_replace('__DIR__', '$vendorDir', $appBaseDir);
if (isset($autoloads['psr-0'])) {
foreach ($autoloads['psr-0'] as $def) {
$def['path'] = strtr($def['path'], '\\', '/');
foreach ($autoloads['psr-0'] as $namespace => $paths) {
$exportedPaths = array();
foreach ($paths as $path) {
$path = strtr($path, '\\', '/');
$baseDir = '';
if (!$filesystem->isAbsolutePath($def['path'])) {
if (strpos($def['path'], $relVendorPath) === 0) {
$def['path'] = substr($def['path'], strlen($relVendorPath));
if (!$filesystem->isAbsolutePath($path)) {
if (strpos($path, $relVendorPath) === 0) {
$path = substr($path, strlen($relVendorPath));
$baseDir = '$vendorDir . ';
} else {
$def['path'] = '/'.$def['path'];
$path = '/'.$path;
$baseDir = $appBaseDir . ' . ';
}
} elseif (strpos($def['path'], $vendorPath) === 0) {
$def['path'] = substr($def['path'], strlen($vendorPath));
} elseif (strpos($path, $vendorPath) === 0) {
$path = substr($path, strlen($vendorPath));
$baseDir = '$vendorDir . ';
}
$exportedPrefix = var_export($def['namespace'], true);
$exportedPath = var_export($def['path'], true);
$namespacesFile .= " $exportedPrefix => {$baseDir}{$exportedPath},\n";
$exportedPaths[] = $baseDir.var_export($path, true);
}
$exportedPrefix = var_export($namespace, true);
$namespacesFile .= " $exportedPrefix => ";
if (count($exportedPaths)>1) {
$namespacesFile .= "array(".implode(',',$exportedPaths)."),\n";
} else {
$namespacesFile .= $exportedPaths[0].",\n";
}
}
}
@ -113,7 +123,7 @@ EOF;
* Compiles an ordered list of namespace => path mappings
*
* @param array $packageMap array of array(package, installDir-relative-to-composer.json)
* @return array array('psr-0' => array(array('namespace' => 'Foo', 'path' => 'installDir')))
* @return array array('psr-0' => array('Ns\\Foo' => array('installDir')))
*/
public function parseAutoloads(array $packageMap)
{
@ -127,19 +137,14 @@ EOF;
foreach ($package->getAutoload() as $type => $mapping) {
foreach ($mapping as $namespace => $path) {
$autoloads[$type][] = array(
'namespace' => $namespace,
'path' => empty($installPath) ? $path : $installPath.'/'.$path,
);
$autoloads[$type][$namespace][] = empty($installPath) ? $path : $installPath.'/'.$path;
}
}
}
foreach ($autoloads as $type => $maps) {
usort($autoloads[$type], function ($a, $b) {
return strcmp($b['namespace'], $a['namespace']);
});
krsort($autoloads[$type]);
}
return $autoloads;
@ -156,8 +161,8 @@ EOF;
$loader = new ClassLoader();
if (isset($autoloads['psr-0'])) {
foreach ($autoloads['psr-0'] as $def) {
$loader->add($def['namespace'], $def['path']);
foreach ($autoloads['psr-0'] as $namespace => $path) {
$loader->add($namespace, $path);
}
}

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

@ -111,6 +111,26 @@ class AutoloadGeneratorTest extends \PHPUnit_Framework_TestCase
$this->assertAutoloadFiles('vendors', $this->vendorDir.'/.composer');
}
public function testOverrideVendorsAutoloading()
{
$package = new MemoryPackage('a', '1.0', '1.0');
$package->setAutoload(array('psr-0' => array('A\\B' => '/home/deveuser/local-packages/a-a/lib')));
$packages = array();
$packages[] = $a = new MemoryPackage('a/a', '1.0', '1.0');
$packages[] = $b = new MemoryPackage('b/b', '1.0', '1.0');
$a->setAutoload(array('psr-0' => array('A' => 'src/', 'A\\B' => 'lib/')));
$b->setAutoload(array('psr-0' => array('B\\Sub\\Name' => 'src/')));
$this->repo->expects($this->once())
->method('getPackages')
->will($this->returnValue($packages));
mkdir($this->vendorDir.'/.composer', 0777, true);
$this->generator->dump($this->repo, $package, $this->im, $this->vendorDir.'/.composer');
$this->assertAutoloadFiles('override_vendors', $this->vendorDir.'/.composer');
}
private function assertAutoloadFiles($name, $dir)
{
$this->assertFileEquals(__DIR__.'/Fixtures/autoload_'.$name.'.php', $dir.'/autoload_namespaces.php');

11
tests/Composer/Test/Autoload/Fixtures/autoload_override_vendors.php Normal file
View File

@ -0,0 +1,11 @@
<?php
// autoload_namespace.php generated by Composer
$vendorDir = dirname(__DIR__);
return array(
'B\\Sub\\Name' => $vendorDir . '/b/b/src/',
'A\\B' => array('/home/deveuser/local-packages/a-a/lib',$vendorDir . '/a/a/lib/'),
'A' => $vendorDir . '/a/a/src/',
);