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

Merge pull request #2221 from Alan01252/fix-unexpectedas 

Fix parse error thrown in PHP5.5+
pull/2210/merge
Jordi Boggiano 2013-08-31 06:31:43 -07:00
parent 2bf90b544a 1892f57e47
commit 4b38158185
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,9 +460,10 @@ REGISTER_AUTOLOAD;
REGISTER_LOADER;
if ($useIncludeFiles) {
$file .= <<<INCLUDE_FILES
foreach (require __DIR__ . '/autoload_files.php' as \$file) {
require \$file;
$file .= <<<'INCLUDE_FILES'
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
require $file;
}

3
tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php
View File

@ -38,7 +38,8 @@ class ComposerAutoloaderInitFilesAutoloadOrder
$loader->register(true);
foreach (require __DIR__ . '/autoload_files.php' as $file) {
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
require $file;
}

3
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
View File

@ -38,7 +38,8 @@ class ComposerAutoloaderInitFilesAutoload
$loader->register(true);
foreach (require __DIR__ . '/autoload_files.php' as $file) {
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
require $file;
}

3
tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
View File

@ -40,7 +40,8 @@ class ComposerAutoloaderInitTargetDir
$loader->register(true);
foreach (require __DIR__ . '/autoload_files.php' as $file) {
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
require $file;
}