瀏覽代碼

merge fix from https://github.com/composer/composer/pull/8651

Markus Staab 5 年之前
父節點
當前提交
cc5c5dbee1
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/Composer/Autoload/AutoloadGenerator.php

+ 1 - 1
src/Composer/Autoload/AutoloadGenerator.php

@@ -268,7 +268,7 @@ EOF;
         }
 
         foreach ($ambiguousClasses as $className => $ambigiousPaths) {
-            $cleanPath = str_replace(array('$vendorDir . \'', "',\n"), array($vendorPath, ''), $classMap[$className]);
+            $cleanPath = str_replace(array('$vendorDir . \'', '$baseDir . \'', "',\n"), array($vendorPath, $basePath, ''), $classMap[$className]);
 
             $this->io->writeError(
                 '<warning>Warning: Ambiguous class resolution, "'.$className.'"'.