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

Use HHVM_VERSION instead of HPHP_VERSION

pull/3831/head
Fred Emmott 2015-03-09 10:02:10 -07:00
parent 33ea86573e
commit cb1ea889d6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ class ClassMapGenerator
{ {
$traits = version_compare(PHP_VERSION, '5.4', '<') ? '' : '|trait'; $traits = version_compare(PHP_VERSION, '5.4', '<') ? '' : '|trait';
$enums = ''; $enums = '';
if (defined('HPHP_VERSION') && version_compare(HPHP_VERSION, '3.3', '>=')) { if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) {
$enums = '|enum'; $enums = '|enum';
} }

2
tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
View File

@ -74,7 +74,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
'Foo\\CBar' => __DIR__.'/Fixtures/php5.4/traits.php', 'Foo\\CBar' => __DIR__.'/Fixtures/php5.4/traits.php',
)); ));
} }
if (defined('HPHP_VERSION') && version_compare(HPHP_VERSION, '3.3', '>=')) { if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) {
$data[] = array(__DIR__.'/Fixtures/hhvm3.3', array( $data[] = array(__DIR__.'/Fixtures/hhvm3.3', array(
'FooEnum' => __DIR__.'/Fixtures/hhvm3.3/HackEnum.php', 'FooEnum' => __DIR__.'/Fixtures/hhvm3.3/HackEnum.php',
'Foo\BarEnum' => __DIR__.'/Fixtures/hhvm3.3/NamespacedHackEnum.php', 'Foo\BarEnum' => __DIR__.'/Fixtures/hhvm3.3/NamespacedHackEnum.php',