Merge branch '3.4' into 4.4

* 3.4: Fix CS [Validator] Add Polish translation for ISIN constraint
symfony · Aug 17, 2020 · 18e708f · 18e708f
2 parents 31bf359 + 11f8ba8
commit 18e708f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -826,7 +826,7 @@ private function getInt64Value($value)
             return false;
         }
 
-        if (PHP_INT_SIZE !== 8 && ($value > self::$int32Max || $value < -self::$int32Max - 1)) {
+        if (\PHP_INT_SIZE !== 8 && ($value > self::$int32Max || $value < -self::$int32Max - 1)) {
             return (float) $value;
         }
 

diff --git a/Resources/bin/common.php b/Resources/bin/common.php
@@ -74,7 +74,7 @@ function get_icu_version_from_genrb($genrb)
     throw new \ErrorException($msg, 0, $type, $file, $line);
 });
 
-set_exception_handler(function (\Throwable $exception) {
+set_exception_handler(function (Throwable $exception) {
     echo "\n";
 
     $cause = $exception;

diff --git a/Tests/DateFormatter/IntlDateFormatterTest.php b/Tests/DateFormatter/IntlDateFormatterTest.php
@@ -168,7 +168,7 @@ public function parseQuarterProvider()
 
     public function testParseThreeDigitsYears()
     {
-        if (PHP_INT_SIZE < 8) {
+        if (\PHP_INT_SIZE < 8) {
             $this->markTestSkipped('Parsing three digits years requires a 64bit PHP.');
         }
 

diff --git a/Util/IntlTestHelper.php b/Util/IntlTestHelper.php
@@ -86,7 +86,7 @@ public static function requireFullIntl(TestCase $testCase, $minimumIcuVersion =
      */
     public static function require32Bit(TestCase $testCase)
     {
-        if (4 !== PHP_INT_SIZE) {
+        if (4 !== \PHP_INT_SIZE) {
             $testCase->markTestSkipped('PHP 32 bit is required.');
         }
     }
@@ -96,7 +96,7 @@ public static function require32Bit(TestCase $testCase)
      */
     public static function require64Bit(TestCase $testCase)
     {
-        if (8 !== PHP_INT_SIZE) {
+        if (8 !== \PHP_INT_SIZE) {
             $testCase->markTestSkipped('PHP 64 bit is required.');
         }
     }