Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 995cf4ea7dc7 · 2015-09-24T11:01:09.000+02:00
* 2.7:
  Fix syntax in a test
  Normalize the way we check versions
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
@@ -80,7 +80,7 @@ public function testOneVar()
 }
 
 EOTXT;
-        $expected = preg_replace('/%(.*?)%/', version_compare(PHP_VERSION, '5.4.0') >= 0 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);
+        $expected = preg_replace('/%(.*?)%/', PHP_VERSION_ID >= 50400 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);
 
         $this->assertSame($expected, $compiler->compile($node)->getSource());
     }
@@ -106,7 +106,7 @@ public function testMultiVars()
 }
 
 EOTXT;
-        $expected = preg_replace('/%(.*?)%/', version_compare(PHP_VERSION, '5.4.0') >= 0 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);
+        $expected = preg_replace('/%(.*?)%/', PHP_VERSION_ID >= 50400 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);
 
         $this->assertSame($expected, $compiler->compile($node)->getSource());
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php
@@ -23,7 +23,7 @@ abstract class ServerCommand extends ContainerAwareCommand
      */
     public function isEnabled()
     {
-        if (version_compare(phpversion(), '5.4.0', '<') || defined('HHVM_VERSION')) {
+        if (PHP_VERSION_ID < 50400 || defined('HHVM_VERSION')) {
             return false;
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
@@ -36,7 +36,7 @@ abstract class AbstractComparisonValidatorTestCase extends AbstractConstraintVal
 {
     protected static function addPhp5Dot5Comparisons(array $comparisons)
     {
-        if (version_compare(PHP_VERSION, '5.5.0-dev', '<')) {
+        if (PHP_VERSION_ID < 50500) {
             return $comparisons;
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
@@ -69,7 +69,7 @@ public function provideValidComparisons()
             array(null, 1),
         );
 
-        if (version_compare(PHP_VERSION, '>=', '5.5')) {
+        if (PHP_VERSION_ID >= 50500) {
             $immutableDate = new \DateTimeImmutable('2000-01-01');
             $comparisons[] = array($immutableDate, $immutableDate);
         }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
@@ -194,7 +194,7 @@ public function getTenthToTwentiethMarch2014()
             array(new \DateTime('March 20, 2014')),
         );
 
-        if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+        if (PHP_VERSION_ID >= 50500) {
             $tests[] = array(new \DateTimeImmutable('March 10, 2014'));
             $tests[] = array(new \DateTimeImmutable('March 15, 2014'));
             $tests[] = array(new \DateTimeImmutable('March 20, 2014'));
@@ -216,7 +216,7 @@ public function getSoonerThanTenthMarch2014()
             array(new \DateTime('March 9, 2014'), 'Mar 9, 2014, 12:00 AM'),
         );
 
-        if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+        if (PHP_VERSION_ID >= 50500) {
             $tests[] = array(new \DateTimeImmutable('March 20, 2013'), 'Mar 20, 2013, 12:00 AM');
             $tests[] = array(new \DateTimeImmutable('March 9, 2014'), 'Mar 9, 2014, 12:00 AM');
         }
@@ -237,7 +237,7 @@ public function getLaterThanTwentiethMarch2014()
             array(new \DateTime('March 9, 2015'), 'Mar 9, 2015, 12:00 AM'),
         );
 
-        if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {
+        if (PHP_VERSION_ID >= 50500) {
             $tests[] = array(new \DateTimeImmutable('March 21, 2014'), 'Mar 21, 2014, 12:00 AM');
             $tests[] = array(new \DateTimeImmutable('March 9, 2015'), 'Mar 9, 2015, 12:00 AM');
         }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function testOneVar()`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`EOTXT;`
`83`		`- $expected = preg_replace('/%(.*?)%/', version_compare(PHP_VERSION, '5.4.0') >= 0 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);`
	`83`	`+ $expected = preg_replace('/%(.*?)%/', PHP_VERSION_ID >= 50400 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);`
`84`	`84`
`85`	`85`	`$this->assertSame($expected, $compiler->compile($node)->getSource());`
`86`	`86`	`}`
`@@ -106,7 +106,7 @@ public function testMultiVars()`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`EOTXT;`
`109`		`- $expected = preg_replace('/%(.*?)%/', version_compare(PHP_VERSION, '5.4.0') >= 0 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);`
	`109`	`+ $expected = preg_replace('/%(.*?)%/', PHP_VERSION_ID >= 50400 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);`
`110`	`110`
`111`	`111`	`$this->assertSame($expected, $compiler->compile($node)->getSource());`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ abstract class ServerCommand extends ContainerAwareCommand`
`23`	`23`	`*/`
`24`	`24`	`public function isEnabled()`
`25`	`25`	`{`
`26`		`- if (version_compare(phpversion(), '5.4.0', '<') \|\| defined('HHVM_VERSION')) {`
	`26`	`+ if (PHP_VERSION_ID < 50400 \|\| defined('HHVM_VERSION')) {`
`27`	`27`	`return false;`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ abstract class AbstractComparisonValidatorTestCase extends AbstractConstraintVal`
`36`	`36`	`{`
`37`	`37`	`protected static function addPhp5Dot5Comparisons(array $comparisons)`
`38`	`38`	`{`
`39`		`- if (version_compare(PHP_VERSION, '5.5.0-dev', '<')) {`
	`39`	`+ if (PHP_VERSION_ID < 50500) {`
`40`	`40`	`return $comparisons;`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function provideValidComparisons()`
`69`	`69`	`array(null, 1),`
`70`	`70`	`);`
`71`	`71`
`72`		`- if (version_compare(PHP_VERSION, '>=', '5.5')) {`
	`72`	`+ if (PHP_VERSION_ID >= 50500) {`
`73`	`73`	`$immutableDate = new \DateTimeImmutable('2000-01-01');`
`74`	`74`	`$comparisons[] = array($immutableDate, $immutableDate);`
`75`	`75`	`}`