Merge pull request #5683 from SpacePossum/1_12_No_concat

Remove useless concat from autoload.

src/Composer/Autoload/AutoloadGenerator.php

@@ -526,12 +526,19 @@ EOF;
 
     protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix)
     {
+        $lastChar = $vendorPathToTargetDirCode[strlen($vendorPathToTargetDirCode)-1];
+        if ("'" === $lastChar || '"' === $lastChar) {
+            $vendorPathToTargetDirCode = substr($vendorPathToTargetDirCode, 0, -1).'/autoload_real.php'.$lastChar;
+        } else {
+            $vendorPathToTargetDirCode .= " . '/autoload_real.php'";
+        }
+
         return <<<AUTOLOAD
 <?php
 
 // autoload.php @generated by Composer
 
-require_once $vendorPathToTargetDirCode . '/autoload_real.php';
+require_once $vendorPathToTargetDirCode;
 
 return ComposerAutoloaderInit$suffix::getLoader();
 

tests/Composer/Test/Autoload/Fixtures/autoload_functions.php

@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFilesAutoload::getLoader();

tests/Composer/Test/Autoload/Fixtures/autoload_functions_by_dependency.php

@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFilesAutoloadOrder::getLoader();

tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php

@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitTargetDir::getLoader();