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

Fix regression in 0b44662087, fixes #5199

pull/5208/head
Jordi Boggiano 2016-04-15 15:36:51 +01:00
parent 0b44662087
commit 4f6693ad70
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,7 +580,8 @@ INCLUDE_PATH;
} }
$file .= <<<STATIC_INIT $file .= <<<STATIC_INIT
if (PHP_VERSION_ID >= $staticPhpVersion && !defined('HHVM_VERSION')) { \$useStaticLoader = PHP_VERSION_ID >= $staticPhpVersion && !defined('HHVM_VERSION');
if (\$useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit$suffix::getInitializer(\$loader)); call_user_func(\Composer\Autoload\ComposerStaticInit$suffix::getInitializer(\$loader));
@ -646,7 +647,7 @@ REGISTER_LOADER;
if ($useIncludeFiles) { if ($useIncludeFiles) {
$file .= <<<INCLUDE_FILES $file .= <<<INCLUDE_FILES
if (PHP_VERSION_ID >= $staticPhpVersion) { if (\$useStaticLoader) {
\$includeFiles = Composer\Autoload\ComposerStaticInit$suffix::\$files; \$includeFiles = Composer\Autoload\ComposerStaticInit$suffix::\$files;
} else { } else {
\$includeFiles = require __DIR__ . '/autoload_files.php'; \$includeFiles = require __DIR__ . '/autoload_files.php';

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

@ -23,7 +23,8 @@ class ComposerAutoloaderInitFilesAutoloadOrder
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoloadOrder', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoloadOrder', 'loadClassLoader'));
if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) { $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoloadOrder::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoloadOrder::getInitializer($loader));
@ -46,7 +47,7 @@ class ComposerAutoloaderInitFilesAutoloadOrder
$loader->register(true); $loader->register(true);
if (PHP_VERSION_ID >= 50600) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitFilesAutoloadOrder::$files; $includeFiles = Composer\Autoload\ComposerStaticInitFilesAutoloadOrder::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';

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

@ -23,7 +23,8 @@ class ComposerAutoloaderInitFilesAutoload
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader'));
if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) { $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader));
@ -46,7 +47,7 @@ class ComposerAutoloaderInitFilesAutoload
$loader->register(true); $loader->register(true);
if (PHP_VERSION_ID >= 50600) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitFilesAutoload::$files; $includeFiles = Composer\Autoload\ComposerStaticInitFilesAutoload::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';

5
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php
View File

@ -27,7 +27,8 @@ class ComposerAutoloaderInitFilesAutoload
array_push($includePaths, get_include_path()); array_push($includePaths, get_include_path());
set_include_path(join(PATH_SEPARATOR, $includePaths)); set_include_path(join(PATH_SEPARATOR, $includePaths));
if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) { $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader));
@ -50,7 +51,7 @@ class ComposerAutoloaderInitFilesAutoload
$loader->register(true); $loader->register(true);
if (PHP_VERSION_ID >= 50600) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitFilesAutoload::$files; $includeFiles = Composer\Autoload\ComposerStaticInitFilesAutoload::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';

3
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_removed_include_paths_and_autolad_files.php
View File

@ -23,7 +23,8 @@ class ComposerAutoloaderInitFilesAutoload
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader'));
if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) { $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader));

3
tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php
View File

@ -23,7 +23,8 @@ class ComposerAutoloaderInitIncludePath
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitIncludePath', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInitIncludePath', 'loadClassLoader'));
if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) { $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitIncludePath::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInitIncludePath::getInitializer($loader));

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

@ -23,7 +23,8 @@ class ComposerAutoloaderInitTargetDir
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitTargetDir', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInitTargetDir', 'loadClassLoader'));
if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) { $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitTargetDir::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInitTargetDir::getInitializer($loader));
@ -48,7 +49,7 @@ class ComposerAutoloaderInitTargetDir
$loader->register(true); $loader->register(true);
if (PHP_VERSION_ID >= 50600) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitTargetDir::$files; $includeFiles = Composer\Autoload\ComposerStaticInitTargetDir::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';