From 868a872df2cc447bc04209fcfbd466ae533da24d Mon Sep 17 00:00:00 2001 From: Jonathan Eskew Date: Sun, 28 Jun 2015 13:44:43 -0700 Subject: [PATCH] Push the hash to $GLOBALS --- src/Composer/Autoload/AutoloadGenerator.php | 8 +++++--- .../Fixtures/autoload_real_files_by_dependency.php | 8 +++++--- .../Test/Autoload/Fixtures/autoload_real_functions.php | 8 +++++--- .../Test/Autoload/Fixtures/autoload_real_include_path.php | 8 +++++--- .../Test/Autoload/Fixtures/autoload_real_target_dir.php | 8 +++++--- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index a7dd76706..1f19dbc2d 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/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; } } 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 43ce6855a..47a73b42c 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 @@ -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; } } diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php index d13f7e65e..71ff7b433 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php +++ b/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; } } 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 78e3bc8da..c9876f150 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php +++ b/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; } } 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 eb38a1035..1e2ca1384 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php +++ b/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; } }