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

Revert "Merge remote-tracking branch 'till/bugfix-broken-classmap'" 

This reverts commit d837b8a657, reversing
changes made to 520d915860.
pull/931/head
Jordi Boggiano 2012-07-18 18:41:07 +02:00
parent 6fb5d26474
commit defe5766a4
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,15 +118,8 @@ EOF;
$autoloads['classmap'] = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($autoloads['classmap'])); $autoloads['classmap'] = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($autoloads['classmap']));
foreach ($autoloads['classmap'] as $dir) { foreach ($autoloads['classmap'] as $dir) {
foreach (ClassMapGenerator::createMap($dir) as $class => $path) { foreach (ClassMapGenerator::createMap($dir) as $class => $path) {
$path = '/'.$filesystem->findShortestPath(getcwd(), $path, true);
$classmapFile .= ' '.var_export($class, true) . ' => '; $classmapFile .= ' '.var_export($class, true).' => $baseDir . '.var_export($path, true).",\n";
if (0 === strpos($path, dirname($vendorPath), 0)) {
// this path seems to be located within this application/package
$path = '/' . $filesystem->findShortestPath(getcwd(), $path, true);
$classmapFile .= '$baseDir . ';
}
$classmapFile .= var_export($path, true).",\n";
} }
} }
$classmapFile .= ");\n"; $classmapFile .= ");\n";