diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 79039e4f7..c33204509 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -1106,9 +1106,9 @@ METHOD_FOOTER; function composerRequire$suffix(\$fileIdentifier, \$file) { if (empty(\$GLOBALS['__composer_autoload_files'][\$fileIdentifier])) { - require \$file; - \$GLOBALS['__composer_autoload_files'][\$fileIdentifier] = true; + + require \$file; } } @@ -1416,8 +1416,8 @@ INITIALIZER; function composerRequire($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { - require $file; - $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + + require $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 5f8cb74fc..83b8246e1 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 @@ -71,8 +71,8 @@ class ComposerAutoloaderInitFilesAutoloadOrder function composerRequireFilesAutoloadOrder($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { - require $file; - $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + + 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 87175ab6c..32248df65 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php @@ -71,8 +71,8 @@ class ComposerAutoloaderInitFilesAutoload function composerRequireFilesAutoload($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { - require $file; - $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + + require $file; } } diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php index 692a0d9af..e6d647004 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php @@ -75,8 +75,8 @@ class ComposerAutoloaderInitFilesAutoload function composerRequireFilesAutoload($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { - require $file; - $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + + 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 397ab52e6..c807f003a 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php @@ -91,8 +91,8 @@ class ComposerAutoloaderInitTargetDir function composerRequireTargetDir($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { - require $file; - $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + + require $file; } } diff --git a/tests/Composer/Test/Fixtures/functional/installed-versions2/vendor/composer/autoload_real.php b/tests/Composer/Test/Fixtures/functional/installed-versions2/vendor/composer/autoload_real.php index 0d3d4676c..2b7e62135 100644 --- a/tests/Composer/Test/Fixtures/functional/installed-versions2/vendor/composer/autoload_real.php +++ b/tests/Composer/Test/Fixtures/functional/installed-versions2/vendor/composer/autoload_real.php @@ -68,8 +68,8 @@ class ComposerAutoloaderInit46489d6835a727203ffccd612295440e function composerRequire46489d6835a727203ffccd612295440e($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { - require $file; - $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + + require $file; } }