Using FQ name for PHP_VERSION_ID

fabpot · fabpot · commit 0fdc793c35ee · 2017-06-01T13:44:56.000-07:00
diff --git a/Extension/Core/Type/DateType.php b/Extension/Core/Type/DateType.php
@@ -272,7 +272,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
         $timezone = $formatter->getTimezoneId();
         $formattedTimestamps = array();
 
-        if ($setTimeZone = PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {
+        if ($setTimeZone = \PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {
             $formatter->setTimeZone('UTC');
         } else {
             $formatter->setTimeZoneId('UTC');
diff --git a/Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php b/Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php
@@ -85,7 +85,7 @@ public function isCsrfTokenValid($intention, $token)
      */
     protected function getSessionId()
     {
-        if (PHP_VERSION_ID >= 50400) {
+        if (\PHP_VERSION_ID >= 50400) {
             if (PHP_SESSION_NONE === session_status()) {
                 session_start();
             }
diff --git a/Tests/Extension/Validator/ValidatorTypeGuesserTest.php b/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
@@ -90,7 +90,7 @@ public function testGuessRequired($constraint, $guess)
      */
     public function testLegacyGuessRequired()
     {
-        if (PHP_VERSION_ID >= 70000) {
+        if (\PHP_VERSION_ID >= 70000) {
             $this->markTestSkipped('Cannot use a class called True on PHP 7 or higher.');
         }
         $true = 'Symfony\Component\Validator\Constraints\True';

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function isCsrfTokenValid($intention, $token)`
`85`	`85`	`*/`
`86`	`86`	`protected function getSessionId()`
`87`	`87`	`{`
`88`		`- if (PHP_VERSION_ID >= 50400) {`
	`88`	`+ if (\PHP_VERSION_ID >= 50400) {`
`89`	`89`	`if (PHP_SESSION_NONE === session_status()) {`
`90`	`90`	`session_start();`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function testGuessRequired($constraint, $guess)`
`90`	`90`	`*/`
`91`	`91`	`public function testLegacyGuessRequired()`
`92`	`92`	`{`
`93`		`- if (PHP_VERSION_ID >= 70000) {`
	`93`	`+ if (\PHP_VERSION_ID >= 70000) {`
`94`	`94`	`$this->markTestSkipped('Cannot use a class called True on PHP 7 or higher.');`
`95`	`95`	`}`
`96`	`96`	`$true = 'Symfony\Component\Validator\Constraints\True';`