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

Merge pull request #2187 from benjisg/fix-AutoloadNamespacesGenerator 

Fixes the autoload_namespaces generator
pull/2195/head
Jordi Boggiano 2013-08-18 14:17:49 -07:00
parent e0051a4652 f5048059d8
commit c0b889a78a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,11 @@ EOF;
$baseDir = ''; $baseDir = '';
if (strpos($path, $vendorPath) === 0) { if (strpos($path, $vendorPath) === 0) {
$path = substr($path, strlen($vendorPath)); $path = substr($path, strlen($vendorPath));
$baseDir = '$vendorDir . '; $baseDir = '$vendorDir';
if ($path !== false) {
$baseDir .= " . ";
}
} else { } else {
$path = $filesystem->normalizePath($filesystem->findShortestPath($basePath, $path, true)); $path = $filesystem->normalizePath($filesystem->findShortestPath($basePath, $path, true));
if (!$filesystem->isAbsolutePath($path)) { if (!$filesystem->isAbsolutePath($path)) {
@ -343,7 +347,7 @@ EOF;
$baseDir = "'phar://' . " . $baseDir; $baseDir = "'phar://' . " . $baseDir;
} }
return $baseDir.var_export($path, true); return $baseDir . (($path !== false) ? var_export($path, true) : "");
} }
protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix) protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix)