From 00a6f8e38d6402bb94b00e00238212d8338308d7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 6 Feb 2014 11:53:42 +0100
Subject: [PATCH] dedicated scope isolation function for autoload_real

---
 src/Composer/Autoload/AutoloadGenerator.php         | 13 +++++++++----
 src/Composer/Autoload/ClassLoader.php               |  4 ++--
 .../Fixtures/autoload_real_files_by_dependency.php  |  7 ++++++-
 .../Autoload/Fixtures/autoload_real_functions.php   |  7 ++++++-
 .../Fixtures/autoload_real_include_path.php         |  5 +++++
 .../Autoload/Fixtures/autoload_real_target_dir.php  |  7 ++++++-
 6 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 59c8a719c..c4c172898 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -530,10 +530,10 @@ REGISTER_AUTOLOAD;
 REGISTER_LOADER;
 
         if ($useIncludeFiles) {
-            $file .= <<<'INCLUDE_FILES'
-        $includeFiles = require __DIR__ . '/autoload_files.php';
-        foreach ($includeFiles as $file) {
-            \Composer\Autoload\includeFile($file);
+            $file .= <<<INCLUDE_FILES
+        \$includeFiles = require __DIR__ . '/autoload_files.php';
+        foreach (\$includeFiles as \$file) {
+            composerRequire$suffix(\$file);
         }
 
 
@@ -552,6 +552,11 @@ METHOD_FOOTER;
         return $file . <<<FOOTER
 }
 
+function composerRequire$suffix(\$file)
+{
+    require \$file;
+}
+
 FOOTER;
 
     }
diff --git a/src/Composer/Autoload/ClassLoader.php b/src/Composer/Autoload/ClassLoader.php
index ef6761ef1..47ae2ee92 100644
--- a/src/Composer/Autoload/ClassLoader.php
+++ b/src/Composer/Autoload/ClassLoader.php
@@ -358,7 +358,7 @@ class ClassLoader
  *
  * Prevents access to $this/self from included files.
  */
-function includeFile()
+function includeFile($file)
 {
-    include func_get_arg(0);
+    include $file;
 }
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php
index 928b5fb0c..ad8591237 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php
@@ -45,9 +45,14 @@ class ComposerAutoloaderInitFilesAutoloadOrder
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            \Composer\Autoload\includeFile($file);
+            composerRequireFilesAutoloadOrder($file);
         }
 
         return $loader;
     }
 }
+
+function composerRequireFilesAutoloadOrder($file)
+{
+    require $file;
+}
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
index 6caacb0e6..4c44366b3 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
@@ -45,9 +45,14 @@ class ComposerAutoloaderInitFilesAutoload
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            \Composer\Autoload\includeFile($file);
+            composerRequireFilesAutoload($file);
         }
 
         return $loader;
     }
 }
+
+function composerRequireFilesAutoload($file)
+{
+    require $file;
+}
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php
index e72ea108a..aae480897 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php
@@ -67,3 +67,8 @@ class ComposerAutoloaderInitIncludePath
         }
     }
 }
+
+function composerRequireIncludePath($file)
+{
+    require $file;
+}
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
index f47584238..22d7d1653 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
@@ -47,7 +47,7 @@ class ComposerAutoloaderInitTargetDir
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            \Composer\Autoload\includeFile($file);
+            composerRequireTargetDir($file);
         }
 
         return $loader;
@@ -71,3 +71,8 @@ class ComposerAutoloaderInitTargetDir
         }
     }
 }
+
+function composerRequireTargetDir($file)
+{
+    require $file;
+}