Explorar o código

Merge pull request #2221 from Alan01252/fix-unexpectedas

Fix parse error thrown in PHP5.5+
Jordi Boggiano %!s(int64=12) %!d(string=hai) anos
pai
achega
4b38158185

+ 4 - 3
src/Composer/Autoload/AutoloadGenerator.php

@@ -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;
         }
 
 

+ 2 - 1
tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php

@@ -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;
         }
 

+ 2 - 1
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php

@@ -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;
         }
 

+ 2 - 1
tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php

@@ -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;
         }