Merge branch '2.15' into 2.16

Author: keradus

php-cs-fixer

@@ -57,6 +57,7 @@ if (class_exists('Phar')) {
     // Maybe this file is used as phar-stub? Let's try!
     try {
         Phar::mapPhar('php-cs-fixer.phar');
+
         require_once 'phar://php-cs-fixer.phar/vendor/autoload.php';
         $require = false;
     } catch (PharException $e) {

src/Console/Command/FixCommand.php

@@ -170,7 +170,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $configFile = $resolver->getConfigFile();
             $stdErr->writeln(sprintf('Loaded config <comment>%s</comment>%s.', $resolver->getConfig()->getName(), null === $configFile ? '' : ' from "'.$configFile.'"'));
             if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-                $stdErr->writeln(sprintf('Runtime: <info>PHP %s</info>', \PHP_VERSION));
+                $stdErr->writeln(sprintf('Runtime: <info>PHP %s</info>', PHP_VERSION));
             }
 
             if ($resolver->getUsingCache()) {

src/Fixer/PhpUnit/PhpUnitExpectationFixer.php

@@ -230,7 +230,7 @@ protected function applyPhpUnitClassFix(Tokens $tokens, $startIndex, $endIndex)
                 ];
 
                 if ($isMultilineWhitespace) {
-                    array_push($tokensOverrideArgStart, new Token([T_WHITESPACE, $indent.$this->whitespacesConfig->getIndent()]));
+                    $tokensOverrideArgStart[] = new Token([T_WHITESPACE, $indent.$this->whitespacesConfig->getIndent()]);
                     array_unshift($tokensOverrideArgBefore, new Token([T_WHITESPACE, $indent]));
                 }
 

src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php

@@ -264,7 +264,7 @@ private function addTestPrefix($functionName)
             return 'test_'.$functionName;
         }
 
-        return'test'.ucfirst($functionName);
+        return 'test'.ucfirst($functionName);
     }
 
     /**

src/Fixer/StringNotation/ExplicitStringVariableFixer.php

@@ -123,7 +123,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
 
                 ++$nextIndex;
             }
-            krsort($variableTokens, \SORT_NUMERIC);
+            krsort($variableTokens, SORT_NUMERIC);
 
             foreach ($variableTokens as $distinctVariableSet) {
                 if (1 === \count($distinctVariableSet['tokens'])) {

tests/Smoke/CiIntegrationTest.php

@@ -152,7 +152,7 @@ public function testIntegration(
             preg_quote($optionalIncompatibilityWarning, '/'),
             preg_quote($optionalXdebugWarning, '/'),
             preg_quote('Loaded config default from ".php_cs.dist".', '/'),
-            preg_quote(sprintf("Runtime: PHP %s\n", \PHP_VERSION), '/'),
+            preg_quote(sprintf("Runtime: PHP %s\n", PHP_VERSION), '/'),
             \strlen($expectedResult3Files),
             preg_quote('Legend: ?-unknown, I-invalid file syntax (file ignored), S-skipped (cached or empty file), .-no changes, F-fixed, E-error', '/')
         );