Skip to content

Commit

Permalink
Merge branch '4.4' into 5.1
Browse files Browse the repository at this point in the history
* 4.4:
  Fix CS
  Fix CS
  [Validator] Add Polish translation for ISIN constraint
  • Loading branch information
fabpot committed Aug 17, 2020
2 parents a25271d + 18e708f commit b6886c4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion NumberFormatter/NumberFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,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;
}

Expand Down
2 changes: 1 addition & 1 deletion Resources/bin/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Tests/DateFormatter/IntlDateFormatterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.');
}

Expand Down
4 changes: 2 additions & 2 deletions Util/IntlTestHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.');
}
}
Expand All @@ -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.');
}
}
Expand Down

0 comments on commit b6886c4

Please sign in to comment.