From cc5c5dbee16f1c3bf1c6a19c4ae3b8266bdd713a Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Mon, 2 Mar 2020 13:28:10 +0100 Subject: [PATCH] merge fix from https://github.com/composer/composer/pull/8651 --- src/Composer/Autoload/AutoloadGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 46a57a542..c5b0714c1 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/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: Ambiguous class resolution, "'.$className.'"'.