public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Always prepend autoloaders to avoid tools (i.e. phpunit) taking precedence over the project autoloader

pull/1467/head
Jordi Boggiano 2013-01-08 17:34:37 +01:00
parent 1356021cb9
commit c80cb76b9b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -405,7 +405,7 @@ CLASSMAP;
if ($targetDirLoader) { if ($targetDirLoader) {
$file .= <<<REGISTER_AUTOLOAD $file .= <<<REGISTER_AUTOLOAD
spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'autoload')); spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'autoload'), true, true);
REGISTER_AUTOLOAD; REGISTER_AUTOLOAD;
@ -413,7 +413,7 @@ REGISTER_AUTOLOAD;
} }
$file .= <<<METHOD_FOOTER $file .= <<<METHOD_FOOTER
\$loader->register();{$filesCode} \$loader->register(true);{$filesCode}
return \$loader; return \$loader;
} }

2
tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php
View File

@ -36,7 +36,7 @@ class ComposerAutoloaderInitFilesAutoloadOrder
$loader->addClassMap($classMap); $loader->addClassMap($classMap);
} }
$loader->register(); $loader->register(true);
require $vendorDir . '/c/lorem/testC.php'; require $vendorDir . '/c/lorem/testC.php';
require $vendorDir . '/z/foo/testA.php'; require $vendorDir . '/z/foo/testA.php';

2
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
View File

@ -36,7 +36,7 @@ class ComposerAutoloaderInitFilesAutoload
$loader->addClassMap($classMap); $loader->addClassMap($classMap);
} }
$loader->register(); $loader->register(true);
require $vendorDir . '/a/a/test.php'; require $vendorDir . '/a/a/test.php';
require $vendorDir . '/b/b/test2.php'; require $vendorDir . '/b/b/test2.php';

4
tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
View File

@ -36,9 +36,9 @@ class ComposerAutoloaderInitTargetDir
$loader->addClassMap($classMap); $loader->addClassMap($classMap);
} }
spl_autoload_register(array('ComposerAutoloaderInitTargetDir', 'autoload')); spl_autoload_register(array('ComposerAutoloaderInitTargetDir', 'autoload'), true, true);
$loader->register(); $loader->register(true);
return $loader; return $loader;
} }