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

Merge pull request #2892 from ptarjan/patch-1 

use HHVM_VERSION
pull/2894/head
Nils Adermann 2014-04-09 19:53:38 -07:00
parent 78f2ad95a9 ddec582ca1
commit f479db6934
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Repository/PlatformRepository.php
View File

@ -146,12 +146,12 @@ class PlatformRepository extends ArrayRepository
parent::addPackage($lib); parent::addPackage($lib);
} }
if (defined('HPHP_VERSION')) { if (defined('HHVM_VERSION')) {
try { try {
$prettyVersion = HPHP_VERSION; $prettyVersion = HHVM_VERSION;
$version = $versionParser->normalize($prettyVersion); $version = $versionParser->normalize($prettyVersion);
} catch (\UnexpectedValueException $e) { } catch (\UnexpectedValueException $e) {
$prettyVersion = preg_replace('#^([^~+-]+).*$#', '$1', HPHP_VERSION); $prettyVersion = preg_replace('#^([^~+-]+).*$#', '$1', HHVM_VERSION);
$version = $versionParser->normalize($prettyVersion); $version = $versionParser->normalize($prettyVersion);
} }