瀏覽代碼

Push the hash to $GLOBALS

Jonathan Eskew 10 年之前
父節點
當前提交
868a872df2

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

@@ -605,13 +605,15 @@ METHOD_FOOTER;
 
 function composerRequire$suffix(\$file)
 {
-    static \$requiredFiles = array();
+    if (empty(\$GLOBALS['composerRequiredFiles'])) {
+        \$GLOBALS['composerRequiredFiles'] = [];
+    }
     \$fileSignature = md5_file(\$file);
 
-    if (empty(\$requiredFiles[\$fileSignature])) {
+    if (empty(\$GLOBALS['composerRequiredFiles'][\$fileSignature])) {
         require \$file;
 
-        \$requiredFiles[\$fileSignature] = true;
+        \$GLOBALS['composerRequiredFiles'][\$fileSignature] = true;
     }
 }
 

+ 5 - 3
tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php

@@ -51,12 +51,14 @@ class ComposerAutoloaderInitFilesAutoloadOrder
 
 function composerRequireFilesAutoloadOrder($file)
 {
-    static $requiredFiles = array();
+    if (empty($GLOBALS['composerRequiredFiles'])) {
+        $GLOBALS['composerRequiredFiles'] = [];
+    }
     $fileSignature = md5_file($file);
 
-    if (empty($requiredFiles[$fileSignature])) {
+    if (empty($GLOBALS['composerRequiredFiles'][$fileSignature])) {
         require $file;
 
-        $requiredFiles[$fileSignature] = true;
+        $GLOBALS['composerRequiredFiles'][$fileSignature] = true;
     }
 }

+ 5 - 3
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php

@@ -51,12 +51,14 @@ class ComposerAutoloaderInitFilesAutoload
 
 function composerRequireFilesAutoload($file)
 {
-    static $requiredFiles = array();
+    if (empty($GLOBALS['composerRequiredFiles'])) {
+        $GLOBALS['composerRequiredFiles'] = [];
+    }
     $fileSignature = md5_file($file);
 
-    if (empty($requiredFiles[$fileSignature])) {
+    if (empty($GLOBALS['composerRequiredFiles'][$fileSignature])) {
         require $file;
 
-        $requiredFiles[$fileSignature] = true;
+        $GLOBALS['composerRequiredFiles'][$fileSignature] = true;
     }
 }

+ 5 - 3
tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php

@@ -67,12 +67,14 @@ class ComposerAutoloaderInitIncludePath
 
 function composerRequireIncludePath($file)
 {
-    static $requiredFiles = array();
+    if (empty($GLOBALS['composerRequiredFiles'])) {
+        $GLOBALS['composerRequiredFiles'] = [];
+    }
     $fileSignature = md5_file($file);
 
-    if (empty($requiredFiles[$fileSignature])) {
+    if (empty($GLOBALS['composerRequiredFiles'][$fileSignature])) {
         require $file;
 
-        $requiredFiles[$fileSignature] = true;
+        $GLOBALS['composerRequiredFiles'][$fileSignature] = true;
     }
 }

+ 5 - 3
tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php

@@ -71,12 +71,14 @@ class ComposerAutoloaderInitTargetDir
 
 function composerRequireTargetDir($file)
 {
-    static $requiredFiles = array();
+    if (empty($GLOBALS['composerRequiredFiles'])) {
+        $GLOBALS['composerRequiredFiles'] = [];
+    }
     $fileSignature = md5_file($file);
 
-    if (empty($requiredFiles[$fileSignature])) {
+    if (empty($GLOBALS['composerRequiredFiles'][$fileSignature])) {
         require $file;
 
-        $requiredFiles[$fileSignature] = true;
+        $GLOBALS['composerRequiredFiles'][$fileSignature] = true;
     }
 }