Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 2b394729398f · 2020-09-02T18:08:58.000+02:00
* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
diff --git a/Collator/Collator.php b/Collator/Collator.php
@@ -109,9 +109,9 @@ public static function create($locale)
     public function asort(&$array, $sortFlag = self::SORT_REGULAR)
     {
         $intlToPlainFlagMap = [
-            self::SORT_REGULAR => SORT_REGULAR,
-            self::SORT_NUMERIC => SORT_NUMERIC,
-            self::SORT_STRING => SORT_STRING,
+            self::SORT_REGULAR => \SORT_REGULAR,
+            self::SORT_NUMERIC => \SORT_NUMERIC,
+            self::SORT_STRING => \SORT_STRING,
         ];
 
         $plainSortFlag = isset($intlToPlainFlagMap[$sortFlag]) ? $intlToPlainFlagMap[$sortFlag] : self::SORT_REGULAR;
diff --git a/Data/Bundle/Writer/JsonBundleWriter.php b/Data/Bundle/Writer/JsonBundleWriter.php
@@ -35,7 +35,7 @@ public function write($path, $locale, $data)
             }
         });
 
-        $contents = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)."\n";
+        $contents = json_encode($data, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE)."\n";
 
         file_put_contents($path.'/'.$locale.'.json', $contents);
     }
diff --git a/Data/Generator/LocaleDataGenerator.php b/Data/Generator/LocaleDataGenerator.php
@@ -67,7 +67,7 @@ protected function preGenerate()
         // Write parents locale file for the Translation component
         file_put_contents(
             __DIR__.'/../../../Translation/Resources/data/parents.json',
-            json_encode($this->localeParents, JSON_PRETTY_PRINT).PHP_EOL
+            json_encode($this->localeParents, \JSON_PRETTY_PRINT).\PHP_EOL
         );
     }
 
diff --git a/Data/Util/LocaleScanner.php b/Data/Util/LocaleScanner.php
@@ -40,7 +40,7 @@ class LocaleScanner
      */
     public function scanLocales(string $sourceDir): array
     {
-        $locales = glob($sourceDir.'/*.txt', GLOB_NOSORT);
+        $locales = glob($sourceDir.'/*.txt', \GLOB_NOSORT);
 
         // Remove file extension and sort
         array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); });
diff --git a/DateFormatter/DateFormat/Transformer.php b/DateFormatter/DateFormat/Transformer.php
@@ -60,6 +60,6 @@ abstract public function extractDateOptions(string $matched, int $length): array
      */
     protected function padLeft(string $value, int $length): string
     {
-        return str_pad($value, $length, '0', STR_PAD_LEFT);
+        return str_pad($value, $length, '0', \STR_PAD_LEFT);
     }
 }
diff --git a/Intl.php b/Intl.php
@@ -123,7 +123,7 @@ public static function isExtensionLoaded(): bool
      */
     public static function getCurrencyBundle(): CurrencyBundleInterface
     {
-        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Currencies::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Currencies::class), \E_USER_DEPRECATED);
 
         if (null === self::$currencyBundle) {
             self::$currencyBundle = new CurrencyBundle(
@@ -145,7 +145,7 @@ public static function getCurrencyBundle(): CurrencyBundleInterface
      */
     public static function getLanguageBundle(): LanguageBundleInterface
     {
-        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" or "%s" instead.', __METHOD__, Languages::class, Scripts::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" or "%s" instead.', __METHOD__, Languages::class, Scripts::class), \E_USER_DEPRECATED);
 
         if (null === self::$languageBundle) {
             self::$languageBundle = new LanguageBundle(
@@ -171,7 +171,7 @@ public static function getLanguageBundle(): LanguageBundleInterface
      */
     public static function getLocaleBundle(): LocaleBundleInterface
     {
-        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Locales::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Locales::class), \E_USER_DEPRECATED);
 
         if (null === self::$localeBundle) {
             self::$localeBundle = new LocaleBundle(
@@ -192,7 +192,7 @@ public static function getLocaleBundle(): LocaleBundleInterface
      */
     public static function getRegionBundle(): RegionBundleInterface
     {
-        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Countries::class), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The method "%s()" is deprecated since Symfony 4.3, use "%s" instead.', __METHOD__, Countries::class), \E_USER_DEPRECATED);
 
         if (null === self::$regionBundle) {
             self::$regionBundle = new RegionBundle(
@@ -216,7 +216,7 @@ public static function getIcuVersion(): ?string
             if (!self::isExtensionLoaded()) {
                 self::$icuVersion = self::getIcuStubVersion();
             } elseif (\defined('INTL_ICU_VERSION')) {
-                self::$icuVersion = INTL_ICU_VERSION;
+                self::$icuVersion = \INTL_ICU_VERSION;
             } else {
                 try {
                     $reflector = new \ReflectionExtension('intl');
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -201,9 +201,9 @@ abstract class NumberFormatter
      * @see https://php.net/round
      */
     private static $phpRoundingMap = [
-        self::ROUND_HALFDOWN => PHP_ROUND_HALF_DOWN,
-        self::ROUND_HALFEVEN => PHP_ROUND_HALF_EVEN,
-        self::ROUND_HALFUP => PHP_ROUND_HALF_UP,
+        self::ROUND_HALFDOWN => \PHP_ROUND_HALF_DOWN,
+        self::ROUND_HALFEVEN => \PHP_ROUND_HALF_EVEN,
+        self::ROUND_HALFUP => \PHP_ROUND_HALF_UP,
     ];
 
     /**
@@ -357,7 +357,7 @@ public function format($value, $type = self::TYPE_DEFAULT)
 
         // The original NumberFormatter does not support this format type
         if (self::TYPE_CURRENCY === $type) {
-            trigger_error(__METHOD__.'(): Unsupported format type '.$type, E_USER_WARNING);
+            trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
         }
@@ -513,7 +513,7 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
         $type = (int) $type;
 
         if (self::TYPE_DEFAULT === $type || self::TYPE_CURRENCY === $type) {
-            trigger_error(__METHOD__.'(): Unsupported format type '.$type, E_USER_WARNING);
+            trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
         }
diff --git a/Resources/bin/common.php b/Resources/bin/common.php
@@ -68,7 +68,7 @@ function get_icu_version_from_genrb($genrb)
     return $matches[1];
 }
 
-error_reporting(E_ALL);
+error_reporting(\E_ALL);
 
 set_error_handler(function ($type, $msg, $file, $line) {
     throw new \ErrorException($msg, 0, $type, $file, $line);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function write($path, $locale, $data)`
`35`	`35`	`}`
`36`	`36`	`});`
`37`	`37`
`38`		`- $contents = json_encode($data, JSON_PRETTY_PRINT \| JSON_UNESCAPED_UNICODE)."\n";`
	`38`	`+ $contents = json_encode($data, \JSON_PRETTY_PRINT \| \JSON_UNESCAPED_UNICODE)."\n";`
`39`	`39`
`40`	`40`	`file_put_contents($path.'/'.$locale.'.json', $contents);`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ protected function preGenerate()`
`67`	`67`	`// Write parents locale file for the Translation component`
`68`	`68`	`file_put_contents(`
`69`	`69`	`__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`
`71`	`71`	`);`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class LocaleScanner`
`40`	`40`	`*/`
`41`	`41`	`public function scanLocales(string $sourceDir): array`
`42`	`42`	`{`
`43`		`- $locales = glob($sourceDir.'/*.txt', GLOB_NOSORT);`
	`43`	`+ $locales = glob($sourceDir.'/*.txt', \GLOB_NOSORT);`
`44`	`44`
`45`	`45`	`// Remove file extension and sort`
`46`	`46`	`array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); });`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,6 @@ abstract public function extractDateOptions(string $matched, int $length): array`
`60`	`60`	`*/`
`61`	`61`	`protected function padLeft(string $value, int $length): string`
`62`	`62`	`{`
`63`		`- return str_pad($value, $length, '0', STR_PAD_LEFT);`
	`63`	`+ return str_pad($value, $length, '0', \STR_PAD_LEFT);`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ function get_icu_version_from_genrb($genrb)`
`68`	`68`	`return $matches[1];`
`69`	`69`	`}`
`70`	`70`
`71`		`-error_reporting(E_ALL);`
	`71`	`+error_reporting(\E_ALL);`
`72`	`72`
`73`	`73`	`set_error_handler(function ($type, $msg, $file, $line) {`
`74`	`74`	`throw new \ErrorException($msg, 0, $type, $file, $line);`