Enable the fixer enforcing fully-qualified calls for compiler-optimized functions

stof · stof · commit ef3dede3875c · 2018-07-24T12:05:38.000+02:00
diff --git a/AppVariable.php b/AppVariable.php
@@ -103,7 +103,7 @@ public function getUser()
         }
 
         $user = $token->getUser();
-        if (is_object($user)) {
+        if (\is_object($user)) {
             return $user;
         }
     }
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -139,16 +139,16 @@ private function getMetadata($type, $entity)
             if (null === $cb) {
                 return;
             }
-            if (is_array($cb)) {
+            if (\is_array($cb)) {
                 if (!method_exists($cb[0], $cb[1])) {
                     return;
                 }
                 $refl = new \ReflectionMethod($cb[0], $cb[1]);
-            } elseif (is_object($cb) && method_exists($cb, '__invoke')) {
+            } elseif (\is_object($cb) && method_exists($cb, '__invoke')) {
                 $refl = new \ReflectionMethod($cb, '__invoke');
-            } elseif (function_exists($cb)) {
+            } elseif (\function_exists($cb)) {
                 $refl = new \ReflectionFunction($cb);
-            } elseif (is_string($cb) && preg_match('{^(.+)::(.+)$}', $cb, $m) && method_exists($m[1], $m[2])) {
+            } elseif (\is_string($cb) && preg_match('{^(.+)::(.+)$}', $cb, $m) && method_exists($m[1], $m[2])) {
                 $refl = new \ReflectionMethod($m[1], $m[2]);
             } else {
                 throw new \UnexpectedValueException('Unsupported callback type');
@@ -198,8 +198,8 @@ private function getPrettyMetadata($type, $entity)
         }
 
         if ('globals' === $type) {
-            if (is_object($meta)) {
-                return ' = object('.get_class($meta).')';
+            if (\is_object($meta)) {
+                return ' = object('.\get_class($meta).')';
             }
 
             return ' = '.substr(@json_encode($meta), 0, 50);
diff --git a/Command/LintCommand.php b/Command/LintCommand.php
@@ -99,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $filenames = $input->getArgument('filename');
 
-        if (0 === count($filenames)) {
+        if (0 === \count($filenames)) {
             if (0 !== ftell(STDIN)) {
                 throw new \RuntimeException('Please provide a filename or pipe template content to STDIN.');
             }
@@ -184,9 +184,9 @@ private function displayTxt(OutputInterface $output, SymfonyStyle $io, $filesInf
         }
 
         if (0 === $errors) {
-            $io->success(sprintf('All %d Twig files contain valid syntax.', count($filesInfo)));
+            $io->success(sprintf('All %d Twig files contain valid syntax.', \count($filesInfo)));
         } else {
-            $io->warning(sprintf('%d Twig files have valid syntax and %d contain errors.', count($filesInfo) - $errors, $errors));
+            $io->warning(sprintf('%d Twig files have valid syntax and %d contain errors.', \count($filesInfo) - $errors, $errors));
         }
 
         return min($errors, 1);
@@ -206,7 +206,7 @@ private function displayJson(OutputInterface $output, $filesInfo)
             }
         });
 
-        $output->writeln(json_encode($filesInfo, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : 0));
+        $output->writeln(json_encode($filesInfo, \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : 0));
 
         return min($errors, 1);
     }
@@ -239,7 +239,7 @@ private function getContext($template, $line, $context = 3)
         $lines = explode("\n", $template);
 
         $position = max(0, $line - $context);
-        $max = min(count($lines), $line - 1 + $context);
+        $max = min(\count($lines), $line - 1 + $context);
 
         $result = array();
         while ($position < $max) {
diff --git a/Extension/AssetExtension.php b/Extension/AssetExtension.php
@@ -62,13 +62,13 @@ public function getFunctions()
     public function getAssetUrl($path, $packageName = null, $absolute = false, $version = null)
     {
         // BC layer to be removed in 3.0
-        if (2 < $count = func_num_args()) {
+        if (2 < $count = \func_num_args()) {
             @trigger_error('Generating absolute URLs with the Twig asset() function was deprecated in 2.7 and will be removed in 3.0. Please use absolute_url() instead.', E_USER_DEPRECATED);
             if (4 === $count) {
                 @trigger_error('Forcing a version with the Twig asset() function was deprecated in 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
             }
 
-            $args = func_get_args();
+            $args = \func_get_args();
 
             return $this->getLegacyAssetUrl($path, $packageName, $args[2], isset($args[3]) ? $args[3] : null);
         }
diff --git a/Extension/CodeExtension.php b/Extension/CodeExtension.php
@@ -33,7 +33,7 @@ class CodeExtension extends AbstractExtension
     public function __construct($fileLinkFormat, $rootDir, $charset)
     {
         $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
-        $this->rootDir = str_replace('/', DIRECTORY_SEPARATOR, dirname($rootDir)).DIRECTORY_SEPARATOR;
+        $this->rootDir = str_replace('/', DIRECTORY_SEPARATOR, \dirname($rootDir)).DIRECTORY_SEPARATOR;
         $this->charset = $charset;
     }
 
@@ -92,7 +92,7 @@ public function formatArgs($args)
                 $short = array_pop($parts);
                 $formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
             } elseif ('array' === $item[0]) {
-                $formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
+                $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
             } elseif ('string' === $item[0]) {
                 $formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES, $this->charset));
             } elseif ('null' === $item[0]) {
@@ -105,7 +105,7 @@ public function formatArgs($args)
                 $formattedValue = str_replace("\n", '', var_export(htmlspecialchars((string) $item[1], ENT_QUOTES, $this->charset), true));
             }
 
-            $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
+            $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
         }
 
         return implode(', ', $result);
@@ -142,7 +142,7 @@ public function fileExcerpt($file, $line)
             $content = explode('<br />', $code);
 
             $lines = array();
-            for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; ++$i) {
+            for ($i = max($line - 3, 1), $max = min($line + 3, \count($content)); $i <= $max; ++$i) {
                 $lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><code>'.self::fixCodeMarkup($content[$i - 1]).'</code></li>';
             }
 
@@ -166,7 +166,7 @@ public function formatFile($file, $line, $text = null)
         if (null === $text) {
             $text = str_replace('/', DIRECTORY_SEPARATOR, $file);
             if (0 === strpos($text, $this->rootDir)) {
-                $text = substr($text, strlen($this->rootDir));
+                $text = substr($text, \strlen($this->rootDir));
                 $text = explode(DIRECTORY_SEPARATOR, $text, 2);
                 $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', $this->rootDir, $text[0], isset($text[1]) ? DIRECTORY_SEPARATOR.$text[1] : '');
             }
diff --git a/Extension/DumpExtension.php b/Extension/DumpExtension.php
@@ -56,7 +56,7 @@ public function dump(Environment $env, $context)
             return;
         }
 
-        if (2 === func_num_args()) {
+        if (2 === \func_num_args()) {
             $vars = array();
             foreach ($context as $key => $value) {
                 if (!$value instanceof Template) {
@@ -66,7 +66,7 @@ public function dump(Environment $env, $context)
 
             $vars = array($vars);
         } else {
-            $vars = func_get_args();
+            $vars = \func_get_args();
             unset($vars[0], $vars[1]);
         }
 
diff --git a/Extension/FormExtension.php b/Extension/FormExtension.php
@@ -152,8 +152,8 @@ public function humanize($text)
      */
     public function isSelectedChoice(ChoiceView $choice, $selectedValue)
     {
-        if (is_array($selectedValue)) {
-            return in_array($choice->value, $selectedValue, true);
+        if (\is_array($selectedValue)) {
+            return \in_array($choice->value, $selectedValue, true);
         }
 
         return $choice->value === $selectedValue;
diff --git a/Extension/HttpFoundationExtension.php b/Extension/HttpFoundationExtension.php
@@ -97,7 +97,7 @@ public function generateAbsoluteUrl($path)
 
         if (!$path || '/' !== $path[0]) {
             $prefix = $request->getPathInfo();
-            $last = strlen($prefix) - 1;
+            $last = \strlen($prefix) - 1;
             if ($last !== $pos = strrpos($prefix, '/')) {
                 $prefix = substr($prefix, 0, $pos).'/';
             }
diff --git a/Extension/RoutingExtension.php b/Extension/RoutingExtension.php
@@ -100,7 +100,7 @@ public function isUrlGenerationSafe(\Twig_Node $argsNode)
             $argsNode->hasNode(1) ? $argsNode->getNode(1) : null
         );
 
-        if (null === $paramsNode || $paramsNode instanceof ArrayExpression && count($paramsNode) <= 2 &&
+        if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2 &&
             (!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression)
         ) {
             return array('html');
diff --git a/Extension/YamlExtension.php b/Extension/YamlExtension.php
@@ -42,21 +42,21 @@ public function encode($input, $inline = 0, $dumpObjects = false)
             $dumper = new YamlDumper();
         }
 
-        if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {
-            return $dumper->dump($input, $inline, 0, is_bool($dumpObjects) ? Yaml::DUMP_OBJECT : 0);
+        if (\defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {
+            return $dumper->dump($input, $inline, 0, \is_bool($dumpObjects) ? Yaml::DUMP_OBJECT : 0);
         }
 
         return $dumper->dump($input, $inline, 0, false, $dumpObjects);
     }
 
     public function dump($value, $inline = 0, $dumpObjects = false)
     {
-        if (is_resource($value)) {
+        if (\is_resource($value)) {
             return '%Resource%';
         }
 
-        if (is_array($value) || is_object($value)) {
-            return '%'.gettype($value).'% '.$this->encode($value, $inline, $dumpObjects);
+        if (\is_array($value) || \is_object($value)) {
+            return '%'.\gettype($value).'% '.$this->encode($value, $inline, $dumpObjects);
         }
 
         return $this->encode($value, $inline, $dumpObjects);
diff --git a/Form/TwigRendererEngine.php b/Form/TwigRendererEngine.php
@@ -100,15 +100,15 @@ protected function loadResourceForBlockName($cacheKey, FormView $view, $blockNam
 
         // Check each theme whether it contains the searched block
         if (isset($this->themes[$cacheKey])) {
-            for ($i = count($this->themes[$cacheKey]) - 1; $i >= 0; --$i) {
+            for ($i = \count($this->themes[$cacheKey]) - 1; $i >= 0; --$i) {
                 $this->loadResourcesFromTheme($cacheKey, $this->themes[$cacheKey][$i]);
                 // CONTINUE LOADING (see doc comment)
             }
         }
 
         // Check the default themes once we reach the root view without success
         if (!$view->parent) {
-            for ($i = count($this->defaultThemes) - 1; $i >= 0; --$i) {
+            for ($i = \count($this->defaultThemes) - 1; $i >= 0; --$i) {
                 $this->loadResourcesFromTheme($cacheKey, $this->defaultThemes[$i]);
                 // CONTINUE LOADING (see doc comment)
             }
diff --git a/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -64,7 +64,7 @@ protected function doEnterNode(Node $node, Environment $env)
             return $node;
         }
 
-        if ($node instanceof FilterExpression && in_array($node->getNode('filter')->getAttribute('value'), array('trans', 'transchoice'))) {
+        if ($node instanceof FilterExpression && \in_array($node->getNode('filter')->getAttribute('value'), array('trans', 'transchoice'))) {
             $arguments = $node->getNode('arguments');
             $ind = 'trans' === $node->getNode('filter')->getAttribute('value') ? 1 : 2;
             if ($this->isNamedArguments($arguments)) {
@@ -119,7 +119,7 @@ public function getPriority()
     private function isNamedArguments($arguments)
     {
         foreach ($arguments as $name => $node) {
-            if (!is_int($name)) {
+            if (!\is_int($name)) {
                 return true;
             }
         }
diff --git a/Tests/Extension/DumpExtensionTest.php b/Tests/Extension/DumpExtensionTest.php
@@ -75,7 +75,7 @@ public function testDump($context, $args, $expectedOutput, $debug = true)
         array_unshift($args, $context);
         array_unshift($args, $twig);
 
-        $dump = call_user_func_array(array($extension, 'dump'), $args);
+        $dump = \call_user_func_array(array($extension, 'dump'), $args);
 
         if ($debug) {
             $this->assertStringStartsWith('<script>', $dump);
diff --git a/Tests/Extension/StopwatchExtensionTest.php b/Tests/Extension/StopwatchExtensionTest.php
@@ -56,7 +56,7 @@ public function getTimingTemplates()
 
     protected function getStopwatch($events = array())
     {
-        $events = is_array($events) ? $events : array($events);
+        $events = \is_array($events) ? $events : array($events);
         $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
 
         $i = -1;
diff --git a/Tests/Extension/TranslationExtensionTest.php b/Tests/Extension/TranslationExtensionTest.php
@@ -207,7 +207,7 @@ protected function getTemplate($template, $translator = null)
             $translator = new Translator('en', new MessageSelector());
         }
 
-        if (is_array($template)) {
+        if (\is_array($template)) {
             $loader = new TwigArrayLoader($template);
         } else {
             $loader = new TwigArrayLoader(array('index' => $template));
diff --git a/Tests/Translation/TwigExtractorTest.php b/Tests/Translation/TwigExtractorTest.php
@@ -90,7 +90,7 @@ public function testExtractSyntaxError($resources)
             $extractor->extract($resources, new MessageCatalogue('en'));
         } catch (Error $e) {
             if (method_exists($e, 'getSourceContext')) {
-                $this->assertSame(dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', DIRECTORY_SEPARATOR), $e->getFile());
+                $this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', DIRECTORY_SEPARATOR), $e->getFile());
                 $this->assertSame(1, $e->getLine());
                 $this->assertSame('Unclosed "block".', $e->getMessage());
             } else {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function getUser()`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`$user = $token->getUser();`
`106`		`- if (is_object($user)) {`
	`106`	`+ if (\is_object($user)) {`
`107`	`107`	`return $user;`
`108`	`108`	`}`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`99`	`99`
`100`	`100`	`$filenames = $input->getArgument('filename');`
`101`	`101`
`102`		`- if (0 === count($filenames)) {`
	`102`	`+ if (0 === \count($filenames)) {`
`103`	`103`	`if (0 !== ftell(STDIN)) {`
`104`	`104`	`throw new \RuntimeException('Please provide a filename or pipe template content to STDIN.');`
`105`	`105`	`}`
`@@ -184,9 +184,9 @@ private function displayTxt(OutputInterface $output, SymfonyStyle $io, $filesInf`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`if (0 === $errors) {`
`187`		`- $io->success(sprintf('All %d Twig files contain valid syntax.', count($filesInfo)));`
	`187`	`+ $io->success(sprintf('All %d Twig files contain valid syntax.', \count($filesInfo)));`
`188`	`188`	`} else {`
`189`		`- $io->warning(sprintf('%d Twig files have valid syntax and %d contain errors.', count($filesInfo) - $errors, $errors));`
	`189`	`+ $io->warning(sprintf('%d Twig files have valid syntax and %d contain errors.', \count($filesInfo) - $errors, $errors));`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`return min($errors, 1);`
`@@ -206,7 +206,7 @@ private function displayJson(OutputInterface $output, $filesInfo)`
`206`	`206`	`}`
`207`	`207`	`});`
`208`	`208`
`209`		`- $output->writeln(json_encode($filesInfo, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES : 0));`
	`209`	`+ $output->writeln(json_encode($filesInfo, \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES : 0));`
`210`	`210`
`211`	`211`	`return min($errors, 1);`
`212`	`212`	`}`
`@@ -239,7 +239,7 @@ private function getContext($template, $line, $context = 3)`
`239`	`239`	`$lines = explode("\n", $template);`
`240`	`240`
`241`	`241`	`$position = max(0, $line - $context);`
`242`		`- $max = min(count($lines), $line - 1 + $context);`
	`242`	`+ $max = min(\count($lines), $line - 1 + $context);`
`243`	`243`
`244`	`244`	`$result = array();`
`245`	`245`	`while ($position < $max) {`
Original file line number	Diff line number	Diff line change
`@@ -62,13 +62,13 @@ public function getFunctions()`
`62`	`62`	`public function getAssetUrl($path, $packageName = null, $absolute = false, $version = null)`
`63`	`63`	`{`
`64`	`64`	`// BC layer to be removed in 3.0`
`65`		`- if (2 < $count = func_num_args()) {`
	`65`	`+ if (2 < $count = \func_num_args()) {`
`66`	`66`	`@trigger_error('Generating absolute URLs with the Twig asset() function was deprecated in 2.7 and will be removed in 3.0. Please use absolute_url() instead.', E_USER_DEPRECATED);`
`67`	`67`	`if (4 === $count) {`
`68`	`68`	`@trigger_error('Forcing a version with the Twig asset() function was deprecated in 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`69`	`69`	`}`
`70`	`70`
`71`		`- $args = func_get_args();`
	`71`	`+ $args = \func_get_args();`
`72`	`72`
`73`	`73`	`return $this->getLegacyAssetUrl($path, $packageName, $args[2], isset($args[3]) ? $args[3] : null);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function dump(Environment $env, $context)`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (2 === func_num_args()) {`
	`59`	`+ if (2 === \func_num_args()) {`
`60`	`60`	`$vars = array();`
`61`	`61`	`foreach ($context as $key => $value) {`
`62`	`62`	`if (!$value instanceof Template) {`
`@@ -66,7 +66,7 @@ public function dump(Environment $env, $context)`
`66`	`66`
`67`	`67`	`$vars = array($vars);`
`68`	`68`	`} else {`
`69`		`- $vars = func_get_args();`
	`69`	`+ $vars = \func_get_args();`
`70`	`70`	`unset($vars[0], $vars[1]);`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ public function humanize($text)`
`152`	`152`	`*/`
`153`	`153`	`public function isSelectedChoice(ChoiceView $choice, $selectedValue)`
`154`	`154`	`{`
`155`		`- if (is_array($selectedValue)) {`
`156`		`- return in_array($choice->value, $selectedValue, true);`
	`155`	`+ if (\is_array($selectedValue)) {`
	`156`	`+ return \in_array($choice->value, $selectedValue, true);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`return $choice->value === $selectedValue;`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function generateAbsoluteUrl($path)`
`97`	`97`
`98`	`98`	`if (!$path \|\| '/' !== $path[0]) {`
`99`	`99`	`$prefix = $request->getPathInfo();`
`100`		`- $last = strlen($prefix) - 1;`
	`100`	`+ $last = \strlen($prefix) - 1;`
`101`	`101`	`if ($last !== $pos = strrpos($prefix, '/')) {`
`102`	`102`	`$prefix = substr($prefix, 0, $pos).'/';`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,21 +42,21 @@ public function encode($input, $inline = 0, $dumpObjects = false)`
`42`	`42`	`$dumper = new YamlDumper();`
`43`	`43`	`}`
`44`	`44`
`45`		`- if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {`
`46`		`- return $dumper->dump($input, $inline, 0, is_bool($dumpObjects) ? Yaml::DUMP_OBJECT : 0);`
	`45`	`+ if (\defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {`
	`46`	`+ return $dumper->dump($input, $inline, 0, \is_bool($dumpObjects) ? Yaml::DUMP_OBJECT : 0);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`return $dumper->dump($input, $inline, 0, false, $dumpObjects);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public function dump($value, $inline = 0, $dumpObjects = false)`
`53`	`53`	`{`
`54`		`- if (is_resource($value)) {`
	`54`	`+ if (\is_resource($value)) {`
`55`	`55`	`return '%Resource%';`
`56`	`56`	`}`
`57`	`57`
`58`		`- if (is_array($value) \|\| is_object($value)) {`
`59`		`- return '%'.gettype($value).'% '.$this->encode($value, $inline, $dumpObjects);`
	`58`	`+ if (\is_array($value) \|\| \is_object($value)) {`
	`59`	`+ return '%'.\gettype($value).'% '.$this->encode($value, $inline, $dumpObjects);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`return $this->encode($value, $inline, $dumpObjects);`