Эх сурвалжийг харах

Prepend the ClassLoader autoloader to avoid calling other previously registered autoloaders, fixes #1699

Jordi Boggiano 12 жил өмнө
parent
commit
d929a0813a

+ 1 - 1
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'));
 

+ 1 - 1
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'));
 

+ 1 - 1
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'));
 

+ 1 - 1
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'));
 

+ 1 - 1
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'));