Browse Source

Merge pull request #2187 from benjisg/fix-AutoloadNamespacesGenerator

Fixes the autoload_namespaces generator
Jordi Boggiano 11 years ago
parent
commit
c0b889a78a
1 changed files with 6 additions and 2 deletions
  1. 6 2
      src/Composer/Autoload/AutoloadGenerator.php

+ 6 - 2
src/Composer/Autoload/AutoloadGenerator.php

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