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

Merge remote-tracking branch 'bp1222/save-loads'

pull/4757/head
Jordi Boggiano 2016-01-09 19:10:39 +00:00
parent 814e09c456 e0a6419992
commit e05207dbad
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,33 +568,35 @@ class ComposerAutoloaderInit$suffix
HEADER; HEADER;
if ($useIncludePath) { if (!$this->classMapAuthoritative) {
$file .= <<<'INCLUDE_PATH' if ($useIncludePath) {
$includePaths = require __DIR__ . '/include_paths.php'; $file .= <<<'INCLUDE_PATH'
array_push($includePaths, get_include_path()); $includePaths = require __DIR__ . '/include_paths.php';
set_include_path(join(PATH_SEPARATOR, $includePaths)); array_push($includePaths, get_include_path());
set_include_path(join(PATH_SEPARATOR, $includePaths));
INCLUDE_PATH; INCLUDE_PATH;
} }
$file .= <<<'PSR0' $file .= <<<'PSR0'
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
$loader->set($namespace, $path); $loader->set($namespace, $path);
} }
PSR0; PSR0;
$file .= <<<'PSR4' $file .= <<<'PSR4'
$map = require __DIR__ . '/autoload_psr4.php'; $map = require __DIR__ . '/autoload_psr4.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
$loader->setPsr4($namespace, $path); $loader->setPsr4($namespace, $path);
} }
PSR4; PSR4;
}
if ($useClassMap) { if ($useClassMap) {
$file .= <<<'CLASSMAP' $file .= <<<'CLASSMAP'