public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #5683 from SpacePossum/1_12_No_concat 

Remove useless concat from autoload.
pull/5688/head
Jordi Boggiano 2016-09-16 15:15:01 +02:00 committed by GitHub
parent a2b3e89d56 2ae0800cd3
commit d4afef35cd
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -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();

2
tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
View File

@ -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();

2
tests/Composer/Test/Autoload/Fixtures/autoload_functions_by_dependency.php
View File

@ -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();

2
tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
View File

@ -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();