From d1a0502f92d834fdb2bbf324f182345e35bd0820 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 5 May 2016 14:57:07 +0100 Subject: [PATCH] Make sure we only replace complete paths to the base-dir/vendor-dir, not partial dir matches, fixes #5289 --- src/Composer/Autoload/AutoloadGenerator.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 24414083c..cf2593d86 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -725,11 +725,11 @@ HEADER; $filesystem = new Filesystem(); - $vendorPathCode = ' ' . $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true, true) . " . '"; - $appBaseDirCode = ' ' . $filesystem->findShortestPathCode(realpath($targetDir), $basePath, true, true) . " . '"; + $vendorPathCode = ' ' . $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true, true) . " . '/"; + $appBaseDirCode = ' ' . $filesystem->findShortestPathCode(realpath($targetDir), $basePath, true, true) . " . '/"; - $absoluteVendorPathCode = ' ' . substr(var_export($vendorDir, true), 0, -1); - $absoluteAppBaseDirCode = ' ' . substr(var_export($baseDir, true), 0, -1); + $absoluteVendorPathCode = ' ' . substr(var_export(rtrim($vendorDir, '\\/') . '/', true), 0, -1); + $absoluteAppBaseDirCode = ' ' . substr(var_export(rtrim($baseDir, '\\/') . '/', true), 0, -1); $initializer = ''; $prefix = "\0Composer\Autoload\ClassLoader\0";