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

Simplify version ranges (hopefully includes hhvm), refs #3049

pull/2415/merge
Jordi Boggiano 2014-06-29 12:26:48 +02:00
parent 1d8b627b57
commit 8881cec174
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/Composer/Test/Json/JsonFileTest.php
View File

@ -131,16 +131,7 @@ class JsonFileTest extends \PHPUnit_Framework_TestCase
public function testFormatEmptyArray() public function testFormatEmptyArray()
{ {
$data = array('test' => array(), 'test2' => new \stdClass); $data = array('test' => array(), 'test2' => new \stdClass);
if ( if (PHP_VERSION_ID < 50429 || (PHP_VERSION_ID >= 50500 && PHP_VERSION_ID < 50513)) {
(PHP_VERSION_ID < 50500 && PHP_VERSION_ID >= 50429)
|| (PHP_VERSION_ID < 50600 && PHP_VERSION_ID >= 50513)
|| (PHP_VERSION_ID >= 50600)
) {
$json = '{
"test": [],
"test2": {}
}';
} else {
$json = '{ $json = '{
"test": [ "test": [
@ -149,7 +140,11 @@ class JsonFileTest extends \PHPUnit_Framework_TestCase
} }
}'; }';
} else {
$json = '{
"test": [],
"test2": {}
}';
} }
$this->assertJsonFormat($json, $data); $this->assertJsonFormat($json, $data);
} }