Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 41ab1ff37dd7 · 2018-07-26T10:45:46.000+02:00
* 2.8:
  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/Catalogue/AbstractOperation.php b/Catalogue/AbstractOperation.php
@@ -91,7 +91,7 @@ public function getDomains()
      */
     public function getMessages($domain)
     {
-        if (!in_array($domain, $this->getDomains())) {
+        if (!\in_array($domain, $this->getDomains())) {
             throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
         }
 
@@ -107,7 +107,7 @@ public function getMessages($domain)
      */
     public function getNewMessages($domain)
     {
-        if (!in_array($domain, $this->getDomains())) {
+        if (!\in_array($domain, $this->getDomains())) {
             throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
         }
 
@@ -123,7 +123,7 @@ public function getNewMessages($domain)
      */
     public function getObsoleteMessages($domain)
     {
-        if (!in_array($domain, $this->getDomains())) {
+        if (!\in_array($domain, $this->getDomains())) {
             throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
         }
 
diff --git a/Command/XliffLintCommand.php b/Command/XliffLintCommand.php
@@ -143,7 +143,7 @@ private function display(SymfonyStyle $io, array $files)
 
     private function displayTxt(SymfonyStyle $io, array $filesInfo)
     {
-        $countFiles = count($filesInfo);
+        $countFiles = \count($filesInfo);
         $erroredFiles = 0;
 
         foreach ($filesInfo as $info) {
@@ -193,7 +193,7 @@ private function getFiles($fileOrDirectory)
         }
 
         foreach ($this->getDirectoryIterator($fileOrDirectory) as $file) {
-            if (!in_array($file->getExtension(), array('xlf', 'xliff'))) {
+            if (!\in_array($file->getExtension(), array('xlf', 'xliff'))) {
                 continue;
             }
 
@@ -225,7 +225,7 @@ private function getDirectoryIterator($directory)
         };
 
         if (null !== $this->directoryIteratorProvider) {
-            return call_user_func($this->directoryIteratorProvider, $directory, $default);
+            return \call_user_func($this->directoryIteratorProvider, $directory, $default);
         }
 
         return $default($directory);
@@ -238,7 +238,7 @@ private function isReadable($fileOrDirectory)
         };
 
         if (null !== $this->isReadableProvider) {
-            return call_user_func($this->isReadableProvider, $fileOrDirectory, $default);
+            return \call_user_func($this->isReadableProvider, $fileOrDirectory, $default);
         }
 
         return $default($fileOrDirectory);
diff --git a/DataCollector/TranslationDataCollector.php b/DataCollector/TranslationDataCollector.php
@@ -99,7 +99,7 @@ public function getLocale()
 
     public function getFallbackLocales()
     {
-        return (isset($this->data['fallback_locales']) && count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : array();
+        return (isset($this->data['fallback_locales']) && \count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : array();
     }
 
     /**
@@ -158,7 +158,7 @@ private function sanitizeString($string, $length = 80)
             if (mb_strlen($string, $encoding) > $length) {
                 return mb_substr($string, 0, $length - 3, $encoding).'...';
             }
-        } elseif (strlen($string) > $length) {
+        } elseif (\strlen($string) > $length) {
             return substr($string, 0, $length - 3).'...';
         }
 
diff --git a/DataCollectorTranslator.php b/DataCollectorTranslator.php
@@ -35,7 +35,7 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter
     public function __construct(TranslatorInterface $translator)
     {
         if (!$translator instanceof TranslatorBagInterface) {
-            throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', get_class($translator)));
+            throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', \get_class($translator)));
         }
 
         $this->translator = $translator;
@@ -106,7 +106,7 @@ public function getFallbackLocales()
      */
     public function __call($method, $args)
     {
-        return call_user_func_array(array($this->translator, $method), $args);
+        return \call_user_func_array(array($this->translator, $method), $args);
     }
 
     /**
diff --git a/DependencyInjection/TranslatorPass.php b/DependencyInjection/TranslatorPass.php
@@ -26,7 +26,7 @@ class TranslatorPass implements CompilerPassInterface
 
     public function __construct($translatorServiceId = 'translator.default', $readerServiceId = 'translation.loader', $loaderTag = 'translation.loader', $debugCommandServiceId = 'console.command.translation_debug', $updateCommandServiceId = 'console.command.translation_update')
     {
-        if ('translation.loader' === $readerServiceId && 2 > func_num_args()) {
+        if ('translation.loader' === $readerServiceId && 2 > \func_num_args()) {
             @trigger_error(sprintf('The default value for $readerServiceId in "%s()" will change in 4.0 to "translation.reader".', __METHOD__), E_USER_DEPRECATED);
         }
 
diff --git a/Dumper/FileDumper.php b/Dumper/FileDumper.php
@@ -79,7 +79,7 @@ public function dump(MessageCatalogue $messages, $options = array())
                     copy($fullpath, $fullpath.'~');
                 }
             } else {
-                $directory = dirname($fullpath);
+                $directory = \dirname($fullpath);
                 if (!file_exists($directory) && !@mkdir($directory, 0777, true)) {
                     throw new RuntimeException(sprintf('Unable to create directory "%s".', $directory));
                 }
diff --git a/Dumper/IcuResFileDumper.php b/Dumper/IcuResFileDumper.php
@@ -33,7 +33,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
         $data = $indexes = $resources = '';
 
         foreach ($messages->all($domain) as $source => $target) {
-            $indexes .= pack('v', strlen($data) + 28);
+            $indexes .= pack('v', \strlen($data) + 28);
             $data .= $source."\0";
         }
 
@@ -44,15 +44,15 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
         foreach ($messages->all($domain) as $source => $target) {
             $resources .= pack('V', $this->getPosition($data));
 
-            $data .= pack('V', strlen($target))
+            $data .= pack('V', \strlen($target))
                 .mb_convert_encoding($target."\0", 'UTF-16LE', 'UTF-8')
                 .$this->writePadding($data)
                   ;
         }
 
         $resOffset = $this->getPosition($data);
 
-        $data .= pack('v', count($messages->all($domain)))
+        $data .= pack('v', \count($messages->all($domain)))
             .$indexes
             .$this->writePadding($data)
             .$resources
@@ -66,7 +66,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
             $keyTop,                        // Index keys top
             $bundleTop,                     // Index resources top
             $bundleTop,                     // Index bundle top
-            count($messages->all($domain)), // Index max table length
+            \count($messages->all($domain)), // Index max table length
             0                               // Index attributes
         );
 
@@ -84,7 +84,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
 
     private function writePadding($data)
     {
-        $padding = strlen($data) % 4;
+        $padding = \strlen($data) % 4;
 
         if ($padding) {
             return str_repeat("\xAA", 4 - $padding);
@@ -93,7 +93,7 @@ private function writePadding($data)
 
     private function getPosition($data)
     {
-        return (strlen($data) + 28) / 4;
+        return (\strlen($data) + 28) / 4;
     }
 
     /**
diff --git a/Dumper/JsonFileDumper.php b/Dumper/JsonFileDumper.php
@@ -28,7 +28,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
         if (isset($options['json_encoding'])) {
             $flags = $options['json_encoding'];
         } else {
-            $flags = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;
+            $flags = \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;
         }
 
         return json_encode($messages->all($domain), $flags);
diff --git a/Dumper/MoFileDumper.php b/Dumper/MoFileDumper.php
@@ -47,7 +47,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
             'offsetHashes' => MoFileLoader::MO_HEADER_SIZE + (16 * $size),
         );
 
-        $sourcesSize = strlen($sources);
+        $sourcesSize = \strlen($sources);
         $sourcesStart = $header['offsetHashes'] + 1;
 
         foreach ($offsets as $offset) {
diff --git a/Dumper/XliffFileDumper.php b/Dumper/XliffFileDumper.php
@@ -195,6 +195,6 @@ private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain,
      */
     private function hasMetadataArrayInfo($key, $metadata = null)
     {
-        return null !== $metadata && array_key_exists($key, $metadata) && ($metadata[$key] instanceof \Traversable || is_array($metadata[$key]));
+        return null !== $metadata && array_key_exists($key, $metadata) && ($metadata[$key] instanceof \Traversable || \is_array($metadata[$key]));
     }
 }
diff --git a/Extractor/AbstractFileExtractor.php b/Extractor/AbstractFileExtractor.php
@@ -27,7 +27,7 @@ abstract class AbstractFileExtractor
      */
     protected function extractFiles($resource)
     {
-        if (is_array($resource) || $resource instanceof \Traversable) {
+        if (\is_array($resource) || $resource instanceof \Traversable) {
             $files = array();
             foreach ($resource as $file) {
                 if ($this->canBeExtracted($file)) {
diff --git a/Extractor/PhpExtractor.php b/Extractor/PhpExtractor.php
@@ -210,7 +210,7 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
                     } elseif (self::MESSAGE_TOKEN === $item) {
                         $message = $this->getValue($tokenIterator);
 
-                        if (count($sequence) === ($sequenceKey + 1)) {
+                        if (\count($sequence) === ($sequenceKey + 1)) {
                             break;
                         }
                     } elseif (self::METHOD_ARGUMENTS_TOKEN === $item) {
diff --git a/Extractor/PhpStringTokenParser.php b/Extractor/PhpStringTokenParser.php
@@ -113,9 +113,9 @@ private static function parseCallback($matches)
         if (isset(self::$replacements[$str])) {
             return self::$replacements[$str];
         } elseif ('x' === $str[0] || 'X' === $str[0]) {
-            return chr(hexdec($str));
+            return \chr(hexdec($str));
         } else {
-            return chr(octdec($str));
+            return \chr(octdec($str));
         }
     }
 
diff --git a/Loader/ArrayLoader.php b/Loader/ArrayLoader.php
@@ -52,7 +52,7 @@ private function flatten(array &$messages, array $subnode = null, $path = null)
             $subnode = &$messages;
         }
         foreach ($subnode as $key => $value) {
-            if (is_array($value)) {
+            if (\is_array($value)) {
                 $nodePath = $path ? $path.'.'.$key : $key;
                 $this->flatten($messages, $value, $nodePath);
                 if (null === $path) {
diff --git a/Loader/CsvFileLoader.php b/Loader/CsvFileLoader.php
@@ -41,7 +41,7 @@ protected function loadResource($resource)
         $file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
 
         foreach ($file as $data) {
-            if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === count($data)) {
+            if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === \count($data)) {
                 $messages[$data[0]] = $data[1];
             }
         }
diff --git a/Loader/FileLoader.php b/Loader/FileLoader.php
@@ -41,7 +41,7 @@ public function load($resource, $locale, $domain = 'messages')
         }
 
         // not an array
-        if (!is_array($messages)) {
+        if (!\is_array($messages)) {
             throw new InvalidResourceException(sprintf('Unable to load file "%s".', $resource));
         }
 
diff --git a/Loader/MoFileLoader.php b/Loader/MoFileLoader.php
@@ -111,7 +111,7 @@ protected function loadResource($resource)
             $ids = array('singular' => $singularId, 'plural' => $pluralId);
             $item = compact('ids', 'translated');
 
-            if (is_array($item['translated'])) {
+            if (\is_array($item['translated'])) {
                 $messages[$item['ids']['singular']] = stripcslashes($item['translated'][0]);
                 if (isset($item['ids']['plural'])) {
                     $plurals = array();
diff --git a/Loader/PoFileLoader.php b/Loader/PoFileLoader.php
@@ -78,7 +78,7 @@ protected function loadResource($resource)
 
             if ('' === $line) {
                 // Whitespace indicated current item is done
-                if (!in_array('fuzzy', $flags)) {
+                if (!\in_array('fuzzy', $flags)) {
                     $this->addMessage($messages, $item);
                 }
                 $item = $defaults;
@@ -96,7 +96,7 @@ protected function loadResource($resource)
             } elseif ('"' === $line[0]) {
                 $continues = isset($item['translated']) ? 'translated' : 'ids';
 
-                if (is_array($item[$continues])) {
+                if (\is_array($item[$continues])) {
                     end($item[$continues]);
                     $item[$continues][key($item[$continues])] .= substr($line, 1, -1);
                 } else {
@@ -110,7 +110,7 @@ protected function loadResource($resource)
             }
         }
         // save last item
-        if (!in_array('fuzzy', $flags)) {
+        if (!\in_array('fuzzy', $flags)) {
             $this->addMessage($messages, $item);
         }
         fclose($stream);
@@ -126,7 +126,7 @@ protected function loadResource($resource)
      */
     private function addMessage(array &$messages, array $item)
     {
-        if (is_array($item['translated'])) {
+        if (\is_array($item['translated'])) {
             $messages[stripcslashes($item['ids']['singular'])] = stripcslashes($item['translated'][0]);
             if (isset($item['ids']['plural'])) {
                 $plurals = $item['translated'];
diff --git a/LoggingTranslator.php b/LoggingTranslator.php
@@ -33,7 +33,7 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface
     public function __construct(TranslatorInterface $translator, LoggerInterface $logger)
     {
         if (!$translator instanceof TranslatorBagInterface) {
-            throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', get_class($translator)));
+            throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', \get_class($translator)));
         }
 
         $this->translator = $translator;
@@ -105,7 +105,7 @@ public function getFallbackLocales()
      */
     public function __call($method, $args)
     {
-        return call_user_func_array(array($this->translator, $method), $args);
+        return \call_user_func_array(array($this->translator, $method), $args);
     }
 
     /**
diff --git a/MessageSelector.php b/MessageSelector.php
@@ -82,7 +82,7 @@ public function choose($message, $number, $locale)
         if (!isset($standardRules[$position])) {
             // when there's exactly one rule given, and that rule is a standard
             // rule, use this rule
-            if (1 === count($parts) && isset($standardRules[0])) {
+            if (1 === \count($parts) && isset($standardRules[0])) {
                 return $standardRules[0];
             }
 
diff --git a/PluralizationRules.php b/PluralizationRules.php
@@ -35,14 +35,14 @@ public static function get($number, $locale)
             $locale = 'xbr';
         }
 
-        if (strlen($locale) > 3) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
+        if (\strlen($locale) > 3) {
+            $locale = substr($locale, 0, -\strlen(strrchr($locale, '_')));
         }
 
         if (isset(self::$rules[$locale])) {
-            $return = call_user_func(self::$rules[$locale], $number);
+            $return = \call_user_func(self::$rules[$locale], $number);
 
-            if (!is_int($return) || $return < 0) {
+            if (!\is_int($return) || $return < 0) {
                 return 0;
             }
 
@@ -201,8 +201,8 @@ public static function set(callable $rule, $locale)
             $locale = 'xbr';
         }
 
-        if (strlen($locale) > 3) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
+        if (\strlen($locale) > 3) {
+            $locale = substr($locale, 0, -\strlen(strrchr($locale, '_')));
         }
 
         self::$rules[$locale] = $rule;
diff --git a/Reader/TranslationReader.php b/Reader/TranslationReader.php
@@ -55,7 +55,7 @@ public function read($directory, MessageCatalogue $catalogue)
             $extension = $catalogue->getLocale().'.'.$format;
             $files = $finder->files()->name('*.'.$extension)->in($directory);
             foreach ($files as $file) {
-                $domain = substr($file->getFilename(), 0, -1 * strlen($extension) - 1);
+                $domain = substr($file->getFilename(), 0, -1 * \strlen($extension) - 1);
                 $catalogue->addCatalogue($loader->load($file->getPathname(), $catalogue->getLocale(), $domain));
             }
         }
diff --git a/Tests/DependencyInjection/TranslationDumperPassTest.php b/Tests/DependencyInjection/TranslationDumperPassTest.php
@@ -35,8 +35,8 @@ public function testProcessNoDefinitionFound()
     {
         $container = new ContainerBuilder();
 
-        $definitionsBefore = count($container->getDefinitions());
-        $aliasesBefore = count($container->getAliases());
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
 
         $translationDumperPass = new TranslationDumperPass();
         $translationDumperPass->process($container);
diff --git a/Tests/DependencyInjection/TranslationExtractorPassTest.php b/Tests/DependencyInjection/TranslationExtractorPassTest.php
@@ -35,8 +35,8 @@ public function testProcessNoDefinitionFound()
     {
         $container = new ContainerBuilder();
 
-        $definitionsBefore = count($container->getDefinitions());
-        $aliasesBefore = count($container->getAliases());
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
 
         $translationDumperPass = new TranslationExtractorPass();
         $translationDumperPass->process($container);
diff --git a/Tests/Loader/LocalizedTestCase.php b/Tests/Loader/LocalizedTestCase.php
@@ -17,7 +17,7 @@ abstract class LocalizedTestCase extends TestCase
 {
     protected function setUp()
     {
-        if (!extension_loaded('intl')) {
+        if (!\extension_loaded('intl')) {
             $this->markTestSkipped('Extension intl is required.');
         }
     }
diff --git a/Tests/PluralizationRulesTest.php b/Tests/PluralizationRulesTest.php
diff --git a/Translator.php b/Translator.php
diff --git a/Util/ArrayConverter.php b/Util/ArrayConverter.php

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function getDomains()`
`91`	`91`	`*/`
`92`	`92`	`public function getMessages($domain)`
`93`	`93`	`{`
`94`		`- if (!in_array($domain, $this->getDomains())) {`
	`94`	`+ if (!\in_array($domain, $this->getDomains())) {`
`95`	`95`	`throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));`
`96`	`96`	`}`
`97`	`97`
`@@ -107,7 +107,7 @@ public function getMessages($domain)`
`107`	`107`	`*/`
`108`	`108`	`public function getNewMessages($domain)`
`109`	`109`	`{`
`110`		`- if (!in_array($domain, $this->getDomains())) {`
	`110`	`+ if (!\in_array($domain, $this->getDomains())) {`
`111`	`111`	`throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));`
`112`	`112`	`}`
`113`	`113`
`@@ -123,7 +123,7 @@ public function getNewMessages($domain)`
`123`	`123`	`*/`
`124`	`124`	`public function getObsoleteMessages($domain)`
`125`	`125`	`{`
`126`		`- if (!in_array($domain, $this->getDomains())) {`
	`126`	`+ if (!\in_array($domain, $this->getDomains())) {`
`127`	`127`	`throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private function display(SymfonyStyle $io, array $files)`
`143`	`143`
`144`	`144`	`private function displayTxt(SymfonyStyle $io, array $filesInfo)`
`145`	`145`	`{`
`146`		`- $countFiles = count($filesInfo);`
	`146`	`+ $countFiles = \count($filesInfo);`
`147`	`147`	`$erroredFiles = 0;`
`148`	`148`
`149`	`149`	`foreach ($filesInfo as $info) {`
`@@ -193,7 +193,7 @@ private function getFiles($fileOrDirectory)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`foreach ($this->getDirectoryIterator($fileOrDirectory) as $file) {`
`196`		`- if (!in_array($file->getExtension(), array('xlf', 'xliff'))) {`
	`196`	`+ if (!\in_array($file->getExtension(), array('xlf', 'xliff'))) {`
`197`	`197`	`continue;`
`198`	`198`	`}`
`199`	`199`
`@@ -225,7 +225,7 @@ private function getDirectoryIterator($directory)`
`225`	`225`	`};`
`226`	`226`
`227`	`227`	`if (null !== $this->directoryIteratorProvider) {`
`228`		`- return call_user_func($this->directoryIteratorProvider, $directory, $default);`
	`228`	`+ return \call_user_func($this->directoryIteratorProvider, $directory, $default);`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`return $default($directory);`
`@@ -238,7 +238,7 @@ private function isReadable($fileOrDirectory)`
`238`	`238`	`};`
`239`	`239`
`240`	`240`	`if (null !== $this->isReadableProvider) {`
`241`		`- return call_user_func($this->isReadableProvider, $fileOrDirectory, $default);`
	`241`	`+ return \call_user_func($this->isReadableProvider, $fileOrDirectory, $default);`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`return $default($fileOrDirectory);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function getLocale()`
`99`	`99`
`100`	`100`	`public function getFallbackLocales()`
`101`	`101`	`{`
`102`		`- return (isset($this->data['fallback_locales']) && count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : array();`
	`102`	`+ return (isset($this->data['fallback_locales']) && \count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : array();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/**`
`@@ -158,7 +158,7 @@ private function sanitizeString($string, $length = 80)`
`158`	`158`	`if (mb_strlen($string, $encoding) > $length) {`
`159`	`159`	`return mb_substr($string, 0, $length - 3, $encoding).'...';`
`160`	`160`	`}`
`161`		`- } elseif (strlen($string) > $length) {`
	`161`	`+ } elseif (\strlen($string) > $length) {`
`162`	`162`	`return substr($string, 0, $length - 3).'...';`
`163`	`163`	`}`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter`
`35`	`35`	`public function __construct(TranslatorInterface $translator)`
`36`	`36`	`{`
`37`	`37`	`if (!$translator instanceof TranslatorBagInterface) {`
`38`		`- throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', get_class($translator)));`
	`38`	`+ throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', \get_class($translator)));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$this->translator = $translator;`
`@@ -106,7 +106,7 @@ public function getFallbackLocales()`
`106`	`106`	`*/`
`107`	`107`	`public function __call($method, $args)`
`108`	`108`	`{`
`109`		`- return call_user_func_array(array($this->translator, $method), $args);`
	`109`	`+ return \call_user_func_array(array($this->translator, $method), $args);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class TranslatorPass implements CompilerPassInterface`
`26`	`26`
`27`	`27`	`public function __construct($translatorServiceId = 'translator.default', $readerServiceId = 'translation.loader', $loaderTag = 'translation.loader', $debugCommandServiceId = 'console.command.translation_debug', $updateCommandServiceId = 'console.command.translation_update')`
`28`	`28`	`{`
`29`		`- if ('translation.loader' === $readerServiceId && 2 > func_num_args()) {`
	`29`	`+ if ('translation.loader' === $readerServiceId && 2 > \func_num_args()) {`
`30`	`30`	`@trigger_error(sprintf('The default value for $readerServiceId in "%s()" will change in 4.0 to "translation.reader".', __METHOD__), E_USER_DEPRECATED);`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function dump(MessageCatalogue $messages, $options = array())`
`79`	`79`	`copy($fullpath, $fullpath.'~');`
`80`	`80`	`}`
`81`	`81`	`} else {`
`82`		`- $directory = dirname($fullpath);`
	`82`	`+ $directory = \dirname($fullpath);`
`83`	`83`	`if (!file_exists($directory) && !@mkdir($directory, 0777, true)) {`
`84`	`84`	`throw new RuntimeException(sprintf('Unable to create directory "%s".', $directory));`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti`
`28`	`28`	`if (isset($options['json_encoding'])) {`
`29`	`29`	`$flags = $options['json_encoding'];`
`30`	`30`	`} else {`
`31`		`- $flags = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;`
	`31`	`+ $flags = \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`return json_encode($messages->all($domain), $flags);`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,6 @@ private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain,`
`195`	`195`	`*/`
`196`	`196`	`private function hasMetadataArrayInfo($key, $metadata = null)`
`197`	`197`	`{`
`198`		`- return null !== $metadata && array_key_exists($key, $metadata) && ($metadata[$key] instanceof \Traversable \|\| is_array($metadata[$key]));`
	`198`	`+ return null !== $metadata && array_key_exists($key, $metadata) && ($metadata[$key] instanceof \Traversable \|\| \is_array($metadata[$key]));`
`199`	`199`	`}`
`200`	`200`	`}`