From d7697574ff364b1682c0e75a9518af8b6a7cf0e1 Mon Sep 17 00:00:00 2001 From: Sander Marechal Date: Fri, 29 Mar 2013 17:09:39 +0100 Subject: [PATCH] Fix shortest absolute paths from cwd to classmap path --- src/Composer/Autoload/AutoloadGenerator.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index fce0756c3..49b1ebf77 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -158,8 +158,12 @@ EOF; $autoloads['classmap'] = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($autoloads['classmap'])); foreach ($autoloads['classmap'] as $dir) { foreach (ClassMapGenerator::createMap($dir) as $class => $path) { - $path = '/'.$filesystem->findShortestPath(getcwd(), $path, true); - $classMap[$class] = '$baseDir . '.var_export($path, true).",\n"; + $path = $filesystem->findShortestPath(getcwd(), $path, true); + if ($path[0] == '/') { + $classMap[$class] = var_export($path, true).",\n"; + } else { + $classMap[$class] = '$baseDir . '.var_export('/'.$path, true).",\n"; + } } }