Skip to content

Commit 18e708f

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fix CS [Validator] Add Polish translation for ISIN constraint
2 parents 31bf359 + 11f8ba8 commit 18e708f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

NumberFormatter/NumberFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ private function getInt64Value($value)
826826
return false;
827827
}
828828

829-
if (PHP_INT_SIZE !== 8 && ($value > self::$int32Max || $value < -self::$int32Max - 1)) {
829+
if (\PHP_INT_SIZE !== 8 && ($value > self::$int32Max || $value < -self::$int32Max - 1)) {
830830
return (float) $value;
831831
}
832832

Resources/bin/common.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function get_icu_version_from_genrb($genrb)
7474
throw new \ErrorException($msg, 0, $type, $file, $line);
7575
});
7676

77-
set_exception_handler(function (\Throwable $exception) {
77+
set_exception_handler(function (Throwable $exception) {
7878
echo "\n";
7979

8080
$cause = $exception;

Tests/DateFormatter/IntlDateFormatterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function parseQuarterProvider()
168168

169169
public function testParseThreeDigitsYears()
170170
{
171-
if (PHP_INT_SIZE < 8) {
171+
if (\PHP_INT_SIZE < 8) {
172172
$this->markTestSkipped('Parsing three digits years requires a 64bit PHP.');
173173
}
174174

Util/IntlTestHelper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static function requireFullIntl(TestCase $testCase, $minimumIcuVersion =
8686
*/
8787
public static function require32Bit(TestCase $testCase)
8888
{
89-
if (4 !== PHP_INT_SIZE) {
89+
if (4 !== \PHP_INT_SIZE) {
9090
$testCase->markTestSkipped('PHP 32 bit is required.');
9191
}
9292
}
@@ -96,7 +96,7 @@ public static function require32Bit(TestCase $testCase)
9696
*/
9797
public static function require64Bit(TestCase $testCase)
9898
{
99-
if (8 !== PHP_INT_SIZE) {
99+
if (8 !== \PHP_INT_SIZE) {
100100
$testCase->markTestSkipped('PHP 64 bit is required.');
101101
}
102102
}

0 commit comments

Comments
 (0)