Skip to content

Commit 2d1fb70

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fix CS Fix CS
2 parents 519bcb2 + f675f13 commit 2d1fb70

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Collator/Collator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ public static function create(?string $locale)
109109
public function asort(array &$array, int $sortFlag = self::SORT_REGULAR)
110110
{
111111
$intlToPlainFlagMap = [
112-
self::SORT_REGULAR => \SORT_REGULAR,
113-
self::SORT_NUMERIC => \SORT_NUMERIC,
114-
self::SORT_STRING => \SORT_STRING,
112+
self::SORT_REGULAR => SORT_REGULAR,
113+
self::SORT_NUMERIC => SORT_NUMERIC,
114+
self::SORT_STRING => SORT_STRING,
115115
];
116116

117117
$plainSortFlag = isset($intlToPlainFlagMap[$sortFlag]) ? $intlToPlainFlagMap[$sortFlag] : self::SORT_REGULAR;

Data/Generator/LocaleDataGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected function preGenerate()
6767
// Write parents locale file for the Translation component
6868
file_put_contents(
6969
__DIR__.'/../../../Translation/Resources/data/parents.json',
70-
json_encode($this->localeParents, \JSON_PRETTY_PRINT).\PHP_EOL
70+
json_encode($this->localeParents, JSON_PRETTY_PRINT).PHP_EOL
7171
);
7272
}
7373

NumberFormatter/NumberFormatter.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ abstract class NumberFormatter
201201
* @see https://php.net/round
202202
*/
203203
private static $phpRoundingMap = [
204-
self::ROUND_HALFDOWN => \PHP_ROUND_HALF_DOWN,
205-
self::ROUND_HALFEVEN => \PHP_ROUND_HALF_EVEN,
206-
self::ROUND_HALFUP => \PHP_ROUND_HALF_UP,
204+
self::ROUND_HALFDOWN => PHP_ROUND_HALF_DOWN,
205+
self::ROUND_HALFEVEN => PHP_ROUND_HALF_EVEN,
206+
self::ROUND_HALFUP => PHP_ROUND_HALF_UP,
207207
];
208208

209209
/**
@@ -354,7 +354,7 @@ public function format($value, int $type = self::TYPE_DEFAULT)
354354
{
355355
// The original NumberFormatter does not support this format type
356356
if (self::TYPE_CURRENCY === $type) {
357-
trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
357+
trigger_error(__METHOD__.'(): Unsupported format type '.$type, E_USER_WARNING);
358358

359359
return false;
360360
}
@@ -508,7 +508,7 @@ public function parseCurrency(string $value, string &$currency, int &$position =
508508
public function parse(string $value, int $type = self::TYPE_DOUBLE, int &$position = 0)
509509
{
510510
if (self::TYPE_DEFAULT === $type || self::TYPE_CURRENCY === $type) {
511-
trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
511+
trigger_error(__METHOD__.'(): Unsupported format type '.$type, E_USER_WARNING);
512512

513513
return false;
514514
}

0 commit comments

Comments
 (0)