Merge branch '4.0' into 4.1

nicolas-grekas · nicolas-grekas · commit a684a1e1c9c9 · 2018-07-26T10:55:25.000+02:00
* 4.0:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
diff --git a/Data/Bundle/Reader/BundleEntryReader.php b/Data/Bundle/Reader/BundleEntryReader.php
@@ -90,7 +90,7 @@ public function readEntry($path, $locale, array $indices, $fallback = true)
                 $readSucceeded = true;
 
                 $isCurrentTraversable = $currentEntry instanceof \Traversable;
-                $isCurrentMultiValued = $isCurrentTraversable || is_array($currentEntry);
+                $isCurrentMultiValued = $isCurrentTraversable || \is_array($currentEntry);
 
                 // Return immediately if fallback is disabled or we are dealing
                 // with a scalar non-null entry
@@ -162,7 +162,7 @@ public function readEntry($path, $locale, array $indices, $fallback = true)
         );
 
         // Append fallback locales, if any
-        if (count($testedLocales) > 1) {
+        if (\count($testedLocales) > 1) {
             // Remove original locale
             array_shift($testedLocales);
 
diff --git a/Data/Bundle/Reader/JsonBundleReader.php b/Data/Bundle/Reader/JsonBundleReader.php
@@ -31,7 +31,7 @@ public function read($path, $locale)
         $fileName = $path.'/'.$locale.'.json';
 
         // prevent directory traversal attacks
-        if (dirname($fileName) !== $path) {
+        if (\dirname($fileName) !== $path) {
             throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
diff --git a/Data/Bundle/Reader/PhpBundleReader.php b/Data/Bundle/Reader/PhpBundleReader.php
@@ -31,7 +31,7 @@ public function read($path, $locale)
         $fileName = $path.'/'.$locale.'.php';
 
         // prevent directory traversal attacks
-        if (dirname($fileName) !== $path) {
+        if (\dirname($fileName) !== $path) {
             throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
diff --git a/Data/Bundle/Writer/TextBundleWriter.php b/Data/Bundle/Writer/TextBundleWriter.php
@@ -72,7 +72,7 @@ private function writeResourceBundle($file, $bundleName, $value, $fallback)
      */
     private function writeResource($file, $value, $indentation, $requireBraces = true)
     {
-        if (is_int($value)) {
+        if (\is_int($value)) {
             $this->writeInteger($file, $value);
 
             return;
@@ -82,13 +82,13 @@ private function writeResource($file, $value, $indentation, $requireBraces = tru
             $value = iterator_to_array($value);
         }
 
-        if (is_array($value)) {
-            $intValues = count($value) === count(array_filter($value, 'is_int'));
+        if (\is_array($value)) {
+            $intValues = \count($value) === \count(array_filter($value, 'is_int'));
 
             $keys = array_keys($value);
 
             // check that the keys are 0-indexed and ascending
-            $intKeys = $keys === range(0, count($keys) - 1);
+            $intKeys = $keys === range(0, \count($keys) - 1);
 
             if ($intValues && $intKeys) {
                 $this->writeIntVector($file, $value, $indentation);
@@ -107,7 +107,7 @@ private function writeResource($file, $value, $indentation, $requireBraces = tru
             return;
         }
 
-        if (is_bool($value)) {
+        if (\is_bool($value)) {
             $value = $value ? 'true' : 'false';
         }
 
@@ -206,7 +206,7 @@ private function writeArray($file, array $value, $indentation)
      */
     private function writeTable($file, $value, $indentation, $fallback = true)
     {
-        if (!is_array($value) && !$value instanceof \Traversable) {
+        if (!\is_array($value) && !$value instanceof \Traversable) {
             throw new UnexpectedTypeException($value, 'array or \Traversable');
         }
 
diff --git a/Data/Generator/LanguageDataGenerator.php b/Data/Generator/LanguageDataGenerator.php
@@ -169,7 +169,7 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me
 
         foreach ($aliases as $alias => $language) {
             $language = $language['replacement'];
-            if (2 === strlen($language) && 3 === strlen($alias)) {
+            if (2 === \strlen($language) && 3 === \strlen($alias)) {
                 if (isset(self::$preferredAlpha2ToAlpha3Mapping[$language])) {
                     // Validate to prevent typos
                     if (!isset($aliases[self::$preferredAlpha2ToAlpha3Mapping[$language]])) {
diff --git a/Data/Generator/LocaleDataGenerator.php b/Data/Generator/LocaleDataGenerator.php
@@ -106,7 +106,7 @@ public function generateData(GeneratorConfig $config)
             }
 
             // If no names remain to be saved for the current locale, skip it
-            if (0 === count($localeNames[$displayLocale])) {
+            if (0 === \count($localeNames[$displayLocale])) {
                 continue;
             }
 
@@ -147,7 +147,7 @@ private function generateLocaleName($locale, $displayLocale)
 
         // Currently the only available variant is POSIX, which we don't want
         // to include in the list
-        if (count($variants) > 0) {
+        if (\count($variants) > 0) {
             return;
         }
 
@@ -192,7 +192,7 @@ private function generateLocaleName($locale, $displayLocale)
             $extras[] = $regionName;
         }
 
-        if (count($extras) > 0) {
+        if (\count($extras) > 0) {
             // Remove any existing extras
             // For example, in German, zh_Hans is "Chinesisch (vereinfacht)".
             // The latter is the script part which is already included in the
@@ -219,7 +219,7 @@ private function generateFallbackMapping(array $displayLocales, array $aliases)
             while (null !== ($fallback = Locale::getFallback($fallback))) {
                 // Currently, no locale has an alias as fallback locale.
                 // If this starts to be the case, we need to add code here.
-                assert(!isset($aliases[$fallback]));
+                \assert(!isset($aliases[$fallback]));
 
                 // Check whether the fallback exists
                 if (isset($displayLocales[$fallback])) {
diff --git a/Data/Generator/RegionDataGenerator.php b/Data/Generator/RegionDataGenerator.php
@@ -140,7 +140,7 @@ protected function generateRegionNames(ArrayAccessibleResourceBundle $localeBund
             }
 
             // WORLD/CONTINENT/SUBCONTINENT/GROUPING
-            if (ctype_digit($region) || is_int($region)) {
+            if (ctype_digit($region) || \is_int($region)) {
                 continue;
             }
 
diff --git a/Data/Util/RecursiveArrayAccess.php b/Data/Util/RecursiveArrayAccess.php
@@ -24,7 +24,7 @@ public static function get($array, array $indices)
     {
         foreach ($indices as $index) {
             // Use array_key_exists() for arrays, isset() otherwise
-            if (is_array($array)) {
+            if (\is_array($array)) {
                 if (array_key_exists($index, $array)) {
                     $array = $array[$index];
                     continue;
diff --git a/DateFormatter/DateFormat/FullTransformer.php b/DateFormatter/DateFormat/FullTransformer.php
@@ -107,7 +107,7 @@ public function format(\DateTime $dateTime)
      */
     public function formatReplace($dateChars, $dateTime)
     {
-        $length = strlen($dateChars);
+        $length = \strlen($dateChars);
 
         if ($this->isQuoteMatch($dateChars)) {
             return $this->replaceQuoteMatch($dateChars);
@@ -147,7 +147,7 @@ public function parse(\DateTime $dateTime, $value)
 
             foreach ($this->transformers as $char => $transformer) {
                 if (isset($matches[$char])) {
-                    $length = strlen($matches[$char]['pattern']);
+                    $length = \strlen($matches[$char]['pattern']);
                     $options = array_merge($options, $transformer->extractDateOptions($matches[$char]['value'], $length));
                 }
             }
@@ -181,7 +181,7 @@ public function getReverseMatchingRegExp($pattern)
         $escapedPattern = preg_replace('/\\\[\-|\/]/', '[\/\-]', $escapedPattern);
 
         $reverseMatchingRegExp = preg_replace_callback($this->regExp, function ($matches) {
-            $length = strlen($matches[0]);
+            $length = \strlen($matches[0]);
             $transformerIndex = $matches[0][0];
 
             $dateChars = $matches[0];
@@ -258,7 +258,7 @@ protected function normalizeArray(array $data)
         $ret = array();
 
         foreach ($data as $key => $value) {
-            if (!is_string($key)) {
+            if (!\is_string($key)) {
                 continue;
             }
 
@@ -313,7 +313,7 @@ protected function calculateUnixTimestamp(\DateTime $dateTime, array $options)
 
         // Normalize yy year
         preg_match_all($this->regExp, $this->pattern, $matches);
-        if (in_array('yy', $matches[0])) {
+        if (\in_array('yy', $matches[0])) {
             $dateTime->setTimestamp(time());
             $year = $year > $dateTime->format('y') + 20 ? 1900 + $year : 2000 + $year;
         }
diff --git a/DateFormatter/DateFormat/MonthTransformer.php b/DateFormatter/DateFormat/MonthTransformer.php
@@ -52,7 +52,7 @@ class MonthTransformer extends Transformer
 
     public function __construct()
     {
-        if (0 === count(self::$shortMonths)) {
+        if (0 === \count(self::$shortMonths)) {
             self::$shortMonths = array_map(function ($month) {
                 return substr($month, 0, 3);
             }, self::$months);
diff --git a/DateFormatter/DateFormat/TimezoneTransformer.php b/DateFormatter/DateFormat/TimezoneTransformer.php
@@ -31,7 +31,7 @@ public function format(\DateTime $dateTime, int $length): string
     {
         $timeZone = substr($dateTime->getTimezone()->getName(), 0, 3);
 
-        if (!in_array($timeZone, array('Etc', 'UTC', 'GMT'))) {
+        if (!\in_array($timeZone, array('Etc', 'UTC', 'GMT'))) {
             throw new NotImplementedException('Time zone different than GMT or UTC is not supported as a formatting output.');
         }
 
@@ -41,7 +41,7 @@ public function format(\DateTime $dateTime, int $length): string
         }
 
         // From ICU >= 59.1 GMT and UTC are no longer unified
-        if (in_array($timeZone, array('UTC', 'UCT', 'Universal', 'Zulu'))) {
+        if (\in_array($timeZone, array('UTC', 'UCT', 'Universal', 'Zulu'))) {
             // offset is not supported with UTC
             return $length > 3 ? 'Coordinated Universal Time' : 'UTC';
         }
diff --git a/DateFormatter/IntlDateFormatter.php b/DateFormatter/IntlDateFormatter.php
@@ -187,15 +187,15 @@ public static function create($locale, $datetype, $timetype, $timezone = null, $
     public function format($timestamp)
     {
         // intl allows timestamps to be passed as arrays - we don't
-        if (is_array($timestamp)) {
+        if (\is_array($timestamp)) {
             $message = 'Only integer Unix timestamps and DateTime objects are supported';
 
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'timestamp', $timestamp, $message);
         }
 
         // behave like the intl extension
         $argumentError = null;
-        if (!is_int($timestamp) && !$timestamp instanceof \DateTime) {
+        if (!\is_int($timestamp) && !$timestamp instanceof \DateTime) {
             $argumentError = sprintf('datefmt_format: string \'%s\' is not numeric, which would be required for it to be a valid date', $timestamp);
         }
 
diff --git a/Exception/UnexpectedTypeException.php b/Exception/UnexpectedTypeException.php
@@ -20,6 +20,6 @@ class UnexpectedTypeException extends InvalidArgumentException
 {
     public function __construct($value, string $expectedType)
     {
-        parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, is_object($value) ? get_class($value) : gettype($value)));
+        parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, \is_object($value) ? \get_class($value) : \gettype($value)));
     }
 }
diff --git a/Intl.php b/Intl.php
@@ -194,7 +194,7 @@ public static function getIcuVersion()
         if (false === self::$icuVersion) {
             if (!self::isExtensionLoaded()) {
                 self::$icuVersion = self::getIcuStubVersion();
-            } elseif (defined('INTL_ICU_VERSION')) {
+            } elseif (\defined('INTL_ICU_VERSION')) {
                 self::$icuVersion = INTL_ICU_VERSION;
             } else {
                 try {
diff --git a/Locale.php b/Locale.php
@@ -67,16 +67,16 @@ public static function getDefaultFallback(): ?string
      */
     public static function getFallback($locale): ?string
     {
-        if (function_exists('locale_parse')) {
+        if (\function_exists('locale_parse')) {
             $localeSubTags = locale_parse($locale);
-            if (1 === count($localeSubTags)) {
+            if (1 === \count($localeSubTags)) {
                 if (self::$defaultFallback === $localeSubTags['language']) {
                     return 'root';
                 }
 
                 // Don't return default fallback for "root", "meta" or others
                 // Normal locales have two or three letters
-                if (strlen($locale) < 4) {
+                if (\strlen($locale) < 4) {
                     return self::$defaultFallback;
                 }
 
@@ -102,7 +102,7 @@ public static function getFallback($locale): ?string
 
         // Don't return default fallback for "root", "meta" or others
         // Normal locales have two or three letters
-        if (strlen($locale) < 4) {
+        if (\strlen($locale) < 4) {
             return self::$defaultFallback;
         }
 
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -263,7 +263,7 @@ public function __construct(?string $locale = 'en', int $style = null, $pattern
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'locale', $locale, 'Only the locale "en" is supported');
         }
 
-        if (!in_array($style, self::$supportedStyles)) {
+        if (!\in_array($style, self::$supportedStyles)) {
             $message = sprintf('The available styles are: %s.', implode(', ', array_keys(self::$supportedStyles)));
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'style', $style, $message);
         }
@@ -521,9 +521,9 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
         // Any string before the numeric value causes error in the parsing
         if (preg_match("/^-?(?:\.\d++|([\d{$groupSep}]++)(?:\.\d++)?)/", $value, $matches)) {
             $value = $matches[0];
-            $position = strlen($value);
+            $position = \strlen($value);
             if ($error = $groupSep && isset($matches[1]) && !preg_match('/^\d{1,3}+(?:(?:,\d{3})++|\d*+)$/', $matches[1])) {
-                $position -= strlen(preg_replace('/^\d{1,3}+(?:(?:,\d++)++|\d*+)/', '', $matches[1]));
+                $position -= \strlen(preg_replace('/^\d{1,3}+(?:(?:,\d++)++|\d*+)/', '', $matches[1]));
             }
         } else {
             $error = 1;
@@ -564,7 +564,7 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
      */
     public function setAttribute($attr, $value)
     {
-        if (!in_array($attr, self::$supportedAttributes)) {
+        if (!\in_array($attr, self::$supportedAttributes)) {
             $message = sprintf(
                 'The available attributes are: %s',
                 implode(', ', array_keys(self::$supportedAttributes))
@@ -765,7 +765,7 @@ private function getUninitializedPrecision($value, $precision)
         if (!$this->isInitializedAttribute(self::FRACTION_DIGITS)) {
             preg_match('/.*\.(.*)/', (string) $value, $digits);
             if (isset($digits[1])) {
-                $precision = strlen($digits[1]);
+                $precision = \strlen($digits[1]);
             }
         }
 
@@ -850,7 +850,7 @@ private function getInt64Value($value)
      */
     private function isInvalidRoundingMode($value)
     {
-        if (in_array($value, self::$roundingModes, true)) {
+        if (\in_array($value, self::$roundingModes, true)) {
             return false;
         }
 
diff --git a/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -189,7 +189,7 @@ public function provideMergeableValues()
      */
     public function testMergeDataWithFallbackData($childData, $parentData, $result)
     {
-        if (null === $childData || is_array($childData)) {
+        if (null === $childData || \is_array($childData)) {
             $this->readerImpl->expects($this->at(0))
                 ->method('read')
                 ->with(self::RES_DIR, 'en')
@@ -227,7 +227,7 @@ public function testDontMergeDataIfFallbackDisabled($childData, $parentData, $re
      */
     public function testMergeExistingEntryWithExistingFallbackEntry($childData, $parentData, $result)
     {
-        if (null === $childData || is_array($childData)) {
+        if (null === $childData || \is_array($childData)) {
             $this->readerImpl->expects($this->at(0))
                 ->method('read')
                 ->with(self::RES_DIR, 'en')
@@ -270,7 +270,7 @@ public function testMergeNonExistingEntryWithExistingFallbackEntry($childData, $
      */
     public function testMergeExistingEntryWithNonExistingFallbackEntry($childData, $parentData, $result)
     {
-        if (null === $childData || is_array($childData)) {
+        if (null === $childData || \is_array($childData)) {
             $this->readerImpl->expects($this->at(0))
                 ->method('read')
                 ->with(self::RES_DIR, 'en_GB')
@@ -313,8 +313,8 @@ public function testFailIfEntryFoundNeitherInParentNorChild()
      */
     public function testMergeTraversables($childData, $parentData, $result)
     {
-        $parentData = is_array($parentData) ? new \ArrayObject($parentData) : $parentData;
-        $childData = is_array($childData) ? new \ArrayObject($childData) : $childData;
+        $parentData = \is_array($parentData) ? new \ArrayObject($parentData) : $parentData;
+        $childData = \is_array($childData) ? new \ArrayObject($childData) : $childData;
 
         if (null === $childData || $childData instanceof \ArrayObject) {
             $this->readerImpl->expects($this->at(0))
@@ -343,7 +343,7 @@ public function testFollowLocaleAliases($childData, $parentData, $result)
     {
         $this->reader->setLocaleAliases(array('mo' => 'ro_MD'));
 
-        if (null === $childData || is_array($childData)) {
+        if (null === $childData || \is_array($childData)) {
             $this->readerImpl->expects($this->at(0))
                 ->method('read')
                 ->with(self::RES_DIR, 'ro_MD')
diff --git a/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -432,7 +432,7 @@ public function testFormatWithDateTimeZoneGmtOffset()
 
     public function testFormatWithIntlTimeZone()
     {
-        if (!extension_loaded('intl')) {
+        if (!\extension_loaded('intl')) {
             $this->markTestSkipped('Extension intl is required.');
         }
 
diff --git a/Tests/Locale/LocaleTest.php b/Tests/Locale/LocaleTest.php
@@ -170,8 +170,8 @@ public function testSetDefaultAcceptsEn()
 
     protected function call($methodName)
     {
-        $args = array_slice(func_get_args(), 1);
+        $args = \array_slice(\func_get_args(), 1);
 
-        return call_user_func_array(array('Symfony\Component\Intl\Locale\Locale', $methodName), $args);
+        return \call_user_func_array(array('Symfony\Component\Intl\Locale\Locale', $methodName), $args);
     }
 }
diff --git a/Tests/Locale/Verification/LocaleTest.php b/Tests/Locale/Verification/LocaleTest.php
diff --git a/Tests/LocaleTest.php b/Tests/LocaleTest.php
diff --git a/Util/IcuVersion.php b/Util/IcuVersion.php

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function read($path, $locale)`
`31`	`31`	`$fileName = $path.'/'.$locale.'.json';`
`32`	`32`
`33`	`33`	`// prevent directory traversal attacks`
`34`		`- if (dirname($fileName) !== $path) {`
	`34`	`+ if (\dirname($fileName) !== $path) {`
`35`	`35`	`throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ private function writeResourceBundle($file, $bundleName, $value, $fallback)`
`72`	`72`	`*/`
`73`	`73`	`private function writeResource($file, $value, $indentation, $requireBraces = true)`
`74`	`74`	`{`
`75`		`- if (is_int($value)) {`
	`75`	`+ if (\is_int($value)) {`
`76`	`76`	`$this->writeInteger($file, $value);`
`77`	`77`
`78`	`78`	`return;`
`@@ -82,13 +82,13 @@ private function writeResource($file, $value, $indentation, $requireBraces = tru`
`82`	`82`	`$value = iterator_to_array($value);`
`83`	`83`	`}`
`84`	`84`
`85`		`- if (is_array($value)) {`
`86`		`- $intValues = count($value) === count(array_filter($value, 'is_int'));`
	`85`	`+ if (\is_array($value)) {`
	`86`	`+ $intValues = \count($value) === \count(array_filter($value, 'is_int'));`
`87`	`87`
`88`	`88`	`$keys = array_keys($value);`
`89`	`89`
`90`	`90`	`// check that the keys are 0-indexed and ascending`
`91`		`- $intKeys = $keys === range(0, count($keys) - 1);`
	`91`	`+ $intKeys = $keys === range(0, \count($keys) - 1);`
`92`	`92`
`93`	`93`	`if ($intValues && $intKeys) {`
`94`	`94`	`$this->writeIntVector($file, $value, $indentation);`
`@@ -107,7 +107,7 @@ private function writeResource($file, $value, $indentation, $requireBraces = tru`
`107`	`107`	`return;`
`108`	`108`	`}`
`109`	`109`
`110`		`- if (is_bool($value)) {`
	`110`	`+ if (\is_bool($value)) {`
`111`	`111`	`$value = $value ? 'true' : 'false';`
`112`	`112`	`}`
`113`	`113`
`@@ -206,7 +206,7 @@ private function writeArray($file, array $value, $indentation)`
`206`	`206`	`*/`
`207`	`207`	`private function writeTable($file, $value, $indentation, $fallback = true)`
`208`	`208`	`{`
`209`		`- if (!is_array($value) && !$value instanceof \Traversable) {`
	`209`	`+ if (!\is_array($value) && !$value instanceof \Traversable) {`
`210`	`210`	`throw new UnexpectedTypeException($value, 'array or \Traversable');`
`211`	`211`	`}`
`212`	`212`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ protected function generateRegionNames(ArrayAccessibleResourceBundle $localeBund`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`// WORLD/CONTINENT/SUBCONTINENT/GROUPING`
`143`		`- if (ctype_digit($region) \|\| is_int($region)) {`
	`143`	`+ if (ctype_digit($region) \|\| \is_int($region)) {`
`144`	`144`	`continue;`
`145`	`145`	`}`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static function get($array, array $indices)`
`24`	`24`	`{`
`25`	`25`	`foreach ($indices as $index) {`
`26`	`26`	`// Use array_key_exists() for arrays, isset() otherwise`
`27`		`- if (is_array($array)) {`
	`27`	`+ if (\is_array($array)) {`
`28`	`28`	`if (array_key_exists($index, $array)) {`
`29`	`29`	`$array = $array[$index];`
`30`	`30`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class MonthTransformer extends Transformer`
`52`	`52`
`53`	`53`	`public function __construct()`
`54`	`54`	`{`
`55`		`- if (0 === count(self::$shortMonths)) {`
	`55`	`+ if (0 === \count(self::$shortMonths)) {`
`56`	`56`	`self::$shortMonths = array_map(function ($month) {`
`57`	`57`	`return substr($month, 0, 3);`
`58`	`58`	`}, self::$months);`