diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 57f110a97..c0ebafe61 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -380,7 +380,7 @@ class ComposerAutoloaderInit$suffix return self::\$loader; } - spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'loadClassLoader'), true, true); self::\$loader = \$loader = new \\Composer\\Autoload\\ClassLoader(); spl_autoload_unregister(array('ComposerAutoloaderInit$suffix', 'loadClassLoader')); 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 3b58316c6..9c4b77c85 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 @@ -19,7 +19,7 @@ class ComposerAutoloaderInitFilesAutoloadOrder return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitFilesAutoloadOrder', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInitFilesAutoloadOrder', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoloadOrder', 'loadClassLoader')); diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php index 6080089ec..2ee1040d6 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php @@ -19,7 +19,7 @@ class ComposerAutoloaderInitFilesAutoload return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader')); 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 a410ff688..2378bf0c4 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php @@ -19,7 +19,7 @@ class ComposerAutoloaderInitIncludePath return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitIncludePath', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInitIncludePath', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); spl_autoload_unregister(array('ComposerAutoloaderInitIncludePath', 'loadClassLoader')); 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 c0fdd07ed..67ef4a9db 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php @@ -19,7 +19,7 @@ class ComposerAutoloaderInitTargetDir return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitTargetDir', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInitTargetDir', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); spl_autoload_unregister(array('ComposerAutoloaderInitTargetDir', 'loadClassLoader'));