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

Disable static autoloader on HHVM, fixes #5192

pull/5208/head
Jordi Boggiano 2016-04-15 14:57:07 +01:00
parent 74b3f6fc21
commit 0b44662087
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -580,7 +580,7 @@ INCLUDE_PATH;
} }
$file .= <<<STATIC_INIT $file .= <<<STATIC_INIT
if (PHP_VERSION_ID >= $staticPhpVersion) { if (PHP_VERSION_ID >= $staticPhpVersion && !defined('HHVM_VERSION')) {
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));

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

@ -23,7 +23,7 @@ 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) { if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) {
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));

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

@ -23,7 +23,7 @@ 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) { if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) {
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));

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

@ -27,7 +27,7 @@ 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) { if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) {
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));

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

@ -23,7 +23,7 @@ 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) { if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) {
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));

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

@ -23,7 +23,7 @@ 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) { if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) {
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));

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

@ -23,7 +23,7 @@ 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) { if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) {
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));