Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 12739dae816a · 2018-07-26T10:51:09.000+02:00
* 3.4:
  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/Filesystem.php b/Filesystem.php
@@ -45,7 +45,7 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
             throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);
         }
 
-        $this->mkdir(dirname($targetFile));
+        $this->mkdir(\dirname($targetFile));
 
         $doCopy = true;
         if (!$overwriteNewerFiles && null === parse_url($originFile, PHP_URL_HOST) && is_file($targetFile)) {
@@ -122,7 +122,7 @@ public function exists($files)
         $maxPathLength = PHP_MAXPATHLEN - 2;
 
         foreach ($this->toIterable($files) as $file) {
-            if (strlen($file) > $maxPathLength) {
+            if (\strlen($file) > $maxPathLength) {
                 throw new IOException(sprintf('Could not check if file exist because path length exceeds %d characters.', $maxPathLength), 0, null, $file);
             }
 
@@ -164,7 +164,7 @@ public function remove($files)
     {
         if ($files instanceof \Traversable) {
             $files = iterator_to_array($files, false);
-        } elseif (!is_array($files)) {
+        } elseif (!\is_array($files)) {
             $files = array($files);
         }
         $files = array_reverse($files);
@@ -223,7 +223,7 @@ public function chown($files, $user, $recursive = false)
             if ($recursive && is_dir($file) && !is_link($file)) {
                 $this->chown(new \FilesystemIterator($file), $user, true);
             }
-            if (is_link($file) && function_exists('lchown')) {
+            if (is_link($file) && \function_exists('lchown')) {
                 if (true !== @lchown($file, $user)) {
                     throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);
                 }
@@ -250,7 +250,7 @@ public function chgrp($files, $group, $recursive = false)
             if ($recursive && is_dir($file) && !is_link($file)) {
                 $this->chgrp(new \FilesystemIterator($file), $group, true);
             }
-            if (is_link($file) && function_exists('lchgrp')) {
+            if (is_link($file) && \function_exists('lchgrp')) {
                 if (true !== @lchgrp($file, $group)) {
                     throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);
                 }
@@ -304,7 +304,7 @@ private function isReadable($filename)
     {
         $maxPathLength = PHP_MAXPATHLEN - 2;
 
-        if (strlen($filename) > $maxPathLength) {
+        if (\strlen($filename) > $maxPathLength) {
             throw new IOException(sprintf('Could not check if file is readable because path length exceeds %d characters.', $maxPathLength), 0, null, $filename);
         }
 
@@ -333,7 +333,7 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
             }
         }
 
-        $this->mkdir(dirname($targetDir));
+        $this->mkdir(\dirname($targetDir));
 
         if (is_link($targetDir)) {
             if (readlink($targetDir) === $originDir) {
@@ -461,7 +461,7 @@ public function makePathRelative($endPath, $startPath)
         }
 
         $stripDriveLetter = function ($path) {
-            if (strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0])) {
+            if (\strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0])) {
                 return substr($path, 2);
             }
 
@@ -499,16 +499,16 @@ public function makePathRelative($endPath, $startPath)
         }
 
         // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
-        if (1 === count($startPathArr) && '' === $startPathArr[0]) {
+        if (1 === \count($startPathArr) && '' === $startPathArr[0]) {
             $depth = 0;
         } else {
-            $depth = count($startPathArr) - $index;
+            $depth = \count($startPathArr) - $index;
         }
 
         // Repeated "../" for each level need to reach the common path
         $traverser = str_repeat('../', $depth);
 
-        $endPathRemainder = implode('/', array_slice($endPathArr, $index));
+        $endPathRemainder = implode('/', \array_slice($endPathArr, $index));
 
         // Construct $endPath from traversing to the common path, then to the remaining $endPath
         $relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');
@@ -539,7 +539,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
     {
         $targetDir = rtrim($targetDir, '/\\');
         $originDir = rtrim($originDir, '/\\');
-        $originDirLen = strlen($originDir);
+        $originDirLen = \strlen($originDir);
 
         // Iterate in destination folder to remove obsolete entries
         if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {
@@ -548,7 +548,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
                 $flags = \FilesystemIterator::SKIP_DOTS;
                 $deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);
             }
-            $targetDirLen = strlen($targetDir);
+            $targetDirLen = \strlen($targetDir);
             foreach ($deleteIterator as $file) {
                 $origin = $originDir.substr($file->getPathname(), $targetDirLen);
                 if (!$this->exists($origin)) {
@@ -606,7 +606,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
     public function isAbsolutePath($file)
     {
         return strspn($file, '/\\', 0, 1)
-            || (strlen($file) > 3 && ctype_alpha($file[0])
+            || (\strlen($file) > 3 && ctype_alpha($file[0])
                 && ':' === $file[1]
                 && strspn($file, '/\\', 2, 1)
             )
@@ -676,7 +676,7 @@ public function tempnam($dir, $prefix)
      */
     public function dumpFile($filename, $content)
     {
-        $dir = dirname($filename);
+        $dir = \dirname($filename);
 
         if (!is_dir($dir)) {
             $this->mkdir($dir);
@@ -709,7 +709,7 @@ public function dumpFile($filename, $content)
      */
     public function appendToFile($filename, $content)
     {
-        $dir = dirname($filename);
+        $dir = \dirname($filename);
 
         if (!is_dir($dir)) {
             $this->mkdir($dir);
@@ -726,7 +726,7 @@ public function appendToFile($filename, $content)
 
     private function toIterable($files): iterable
     {
-        return is_array($files) || $files instanceof \Traversable ? $files : array($files);
+        return \is_array($files) || $files instanceof \Traversable ? $files : array($files);
     }
 
     /**
@@ -736,7 +736,7 @@ private function getSchemeAndHierarchy(string $filename): array
     {
         $components = explode('://', $filename, 2);
 
-        return 2 === count($components) ? array($components[0], $components[1]) : array(null, $components[0]);
+        return 2 === \count($components) ? array($components[0], $components[1]) : array(null, $components[0]);
     }
 
     private static function box($func)
diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -383,7 +383,7 @@ public function testFilesExistsFails()
         $oldPath = getcwd();
         mkdir($basePath);
         chdir($basePath);
-        $file = str_repeat('T', $maxPathLength - strlen($basePath) + 1);
+        $file = str_repeat('T', $maxPathLength - \strlen($basePath) + 1);
         $path = $basePath.$file;
         exec('TYPE NUL >>'.$file); // equivalent of touch, we can not use the php touch() here because it suffers from the same limitation
         $this->longPathNamesWindows[] = $path; // save this so we can clean up later
diff --git a/Tests/FilesystemTestCase.php b/Tests/FilesystemTestCase.php
@@ -48,7 +48,7 @@ public static function setUpBeforeClass()
             $targetFile = tempnam(sys_get_temp_dir(), 'li');
             if (true !== @link($originFile, $targetFile)) {
                 $report = error_get_last();
-                if (is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {
+                if (\is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {
                     self::$linkOnWindows = false;
                 }
             } else {
@@ -60,7 +60,7 @@ public static function setUpBeforeClass()
             $targetDir = tempnam(sys_get_temp_dir(), 'sl');
             if (true !== @symlink($originDir, $targetDir)) {
                 $report = error_get_last();
-                if (is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {
+                if (\is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {
                     self::$symlinkOnWindows = false;
                 }
             } else {
@@ -129,7 +129,7 @@ protected function getFileGroup($filepath)
 
     protected function markAsSkippedIfLinkIsMissing()
     {
-        if (!function_exists('link')) {
+        if (!\function_exists('link')) {
             $this->markTestSkipped('link is not supported');
         }
 
@@ -159,7 +159,7 @@ protected function markAsSkippedIfChmodIsMissing()
 
     protected function markAsSkippedIfPosixIsMissing()
     {
-        if (!function_exists('posix_isatty')) {
+        if (!\function_exists('posix_isatty')) {
             $this->markTestSkipped('Function posix_isatty is required.');
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)`
`45`	`45`	`throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);`
`46`	`46`	`}`
`47`	`47`
`48`		`- $this->mkdir(dirname($targetFile));`
	`48`	`+ $this->mkdir(\dirname($targetFile));`
`49`	`49`
`50`	`50`	`$doCopy = true;`
`51`	`51`	`if (!$overwriteNewerFiles && null === parse_url($originFile, PHP_URL_HOST) && is_file($targetFile)) {`
`@@ -122,7 +122,7 @@ public function exists($files)`
`122`	`122`	`$maxPathLength = PHP_MAXPATHLEN - 2;`
`123`	`123`
`124`	`124`	`foreach ($this->toIterable($files) as $file) {`
`125`		`- if (strlen($file) > $maxPathLength) {`
	`125`	`+ if (\strlen($file) > $maxPathLength) {`
`126`	`126`	`throw new IOException(sprintf('Could not check if file exist because path length exceeds %d characters.', $maxPathLength), 0, null, $file);`
`127`	`127`	`}`
`128`	`128`
`@@ -164,7 +164,7 @@ public function remove($files)`
`164`	`164`	`{`
`165`	`165`	`if ($files instanceof \Traversable) {`
`166`	`166`	`$files = iterator_to_array($files, false);`
`167`		`- } elseif (!is_array($files)) {`
	`167`	`+ } elseif (!\is_array($files)) {`
`168`	`168`	`$files = array($files);`
`169`	`169`	`}`
`170`	`170`	`$files = array_reverse($files);`
`@@ -223,7 +223,7 @@ public function chown($files, $user, $recursive = false)`
`223`	`223`	`if ($recursive && is_dir($file) && !is_link($file)) {`
`224`	`224`	`$this->chown(new \FilesystemIterator($file), $user, true);`
`225`	`225`	`}`
`226`		`- if (is_link($file) && function_exists('lchown')) {`
	`226`	`+ if (is_link($file) && \function_exists('lchown')) {`
`227`	`227`	`if (true !== @lchown($file, $user)) {`
`228`	`228`	`throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);`
`229`	`229`	`}`
`@@ -250,7 +250,7 @@ public function chgrp($files, $group, $recursive = false)`
`250`	`250`	`if ($recursive && is_dir($file) && !is_link($file)) {`
`251`	`251`	`$this->chgrp(new \FilesystemIterator($file), $group, true);`
`252`	`252`	`}`
`253`		`- if (is_link($file) && function_exists('lchgrp')) {`
	`253`	`+ if (is_link($file) && \function_exists('lchgrp')) {`
`254`	`254`	`if (true !== @lchgrp($file, $group)) {`
`255`	`255`	`throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);`
`256`	`256`	`}`
`@@ -304,7 +304,7 @@ private function isReadable($filename)`
`304`	`304`	`{`
`305`	`305`	`$maxPathLength = PHP_MAXPATHLEN - 2;`
`306`	`306`
`307`		`- if (strlen($filename) > $maxPathLength) {`
	`307`	`+ if (\strlen($filename) > $maxPathLength) {`
`308`	`308`	`throw new IOException(sprintf('Could not check if file is readable because path length exceeds %d characters.', $maxPathLength), 0, null, $filename);`
`309`	`309`	`}`
`310`	`310`
`@@ -333,7 +333,7 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`
`336`		`- $this->mkdir(dirname($targetDir));`
	`336`	`+ $this->mkdir(\dirname($targetDir));`
`337`	`337`
`338`	`338`	`if (is_link($targetDir)) {`
`339`	`339`	`if (readlink($targetDir) === $originDir) {`
`@@ -461,7 +461,7 @@ public function makePathRelative($endPath, $startPath)`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`$stripDriveLetter = function ($path) {`
`464`		`- if (strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0])) {`
	`464`	`+ if (\strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0])) {`
`465`	`465`	`return substr($path, 2);`
`466`	`466`	`}`
`467`	`467`
`@@ -499,16 +499,16 @@ public function makePathRelative($endPath, $startPath)`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`// Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)`
`502`		`- if (1 === count($startPathArr) && '' === $startPathArr[0]) {`
	`502`	`+ if (1 === \count($startPathArr) && '' === $startPathArr[0]) {`
`503`	`503`	`$depth = 0;`
`504`	`504`	`} else {`
`505`		`- $depth = count($startPathArr) - $index;`
	`505`	`+ $depth = \count($startPathArr) - $index;`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`// Repeated "../" for each level need to reach the common path`
`509`	`509`	`$traverser = str_repeat('../', $depth);`
`510`	`510`
`511`		`- $endPathRemainder = implode('/', array_slice($endPathArr, $index));`
	`511`	`+ $endPathRemainder = implode('/', \array_slice($endPathArr, $index));`
`512`	`512`
`513`	`513`	`// Construct $endPath from traversing to the common path, then to the remaining $endPath`
`514`	`514`	`$relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');`
`@@ -539,7 +539,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`539`	`539`	`{`
`540`	`540`	`$targetDir = rtrim($targetDir, '/\\');`
`541`	`541`	`$originDir = rtrim($originDir, '/\\');`
`542`		`- $originDirLen = strlen($originDir);`
	`542`	`+ $originDirLen = \strlen($originDir);`
`543`	`543`
`544`	`544`	`// Iterate in destination folder to remove obsolete entries`
`545`	`545`	`if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {`
`@@ -548,7 +548,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`548`	`548`	`$flags = \FilesystemIterator::SKIP_DOTS;`
`549`	`549`	`$deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);`
`550`	`550`	`}`
`551`		`- $targetDirLen = strlen($targetDir);`
	`551`	`+ $targetDirLen = \strlen($targetDir);`
`552`	`552`	`foreach ($deleteIterator as $file) {`
`553`	`553`	`$origin = $originDir.substr($file->getPathname(), $targetDirLen);`
`554`	`554`	`if (!$this->exists($origin)) {`
`@@ -606,7 +606,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`606`	`606`	`public function isAbsolutePath($file)`
`607`	`607`	`{`
`608`	`608`	`return strspn($file, '/\\', 0, 1)`
`609`		`- \|\| (strlen($file) > 3 && ctype_alpha($file[0])`
	`609`	`+ \|\| (\strlen($file) > 3 && ctype_alpha($file[0])`
`610`	`610`	`&& ':' === $file[1]`
`611`	`611`	`&& strspn($file, '/\\', 2, 1)`
`612`	`612`	`)`
`@@ -676,7 +676,7 @@ public function tempnam($dir, $prefix)`
`676`	`676`	`*/`
`677`	`677`	`public function dumpFile($filename, $content)`
`678`	`678`	`{`
`679`		`- $dir = dirname($filename);`
	`679`	`+ $dir = \dirname($filename);`
`680`	`680`
`681`	`681`	`if (!is_dir($dir)) {`
`682`	`682`	`$this->mkdir($dir);`
`@@ -709,7 +709,7 @@ public function dumpFile($filename, $content)`
`709`	`709`	`*/`
`710`	`710`	`public function appendToFile($filename, $content)`
`711`	`711`	`{`
`712`		`- $dir = dirname($filename);`
	`712`	`+ $dir = \dirname($filename);`
`713`	`713`
`714`	`714`	`if (!is_dir($dir)) {`
`715`	`715`	`$this->mkdir($dir);`
`@@ -726,7 +726,7 @@ public function appendToFile($filename, $content)`
`726`	`726`
`727`	`727`	`private function toIterable($files): iterable`
`728`	`728`	`{`
`729`		`- return is_array($files) \|\| $files instanceof \Traversable ? $files : array($files);`
	`729`	`+ return \is_array($files) \|\| $files instanceof \Traversable ? $files : array($files);`
`730`	`730`	`}`
`731`	`731`
`732`	`732`	`/**`
`@@ -736,7 +736,7 @@ private function getSchemeAndHierarchy(string $filename): array`
`736`	`736`	`{`
`737`	`737`	`$components = explode('://', $filename, 2);`
`738`	`738`
`739`		`- return 2 === count($components) ? array($components[0], $components[1]) : array(null, $components[0]);`
	`739`	`+ return 2 === \count($components) ? array($components[0], $components[1]) : array(null, $components[0]);`
`740`	`740`	`}`
`741`	`741`
`742`	`742`	`private static function box($func)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static function setUpBeforeClass()`
`48`	`48`	`$targetFile = tempnam(sys_get_temp_dir(), 'li');`
`49`	`49`	`if (true !== @link($originFile, $targetFile)) {`
`50`	`50`	`$report = error_get_last();`
`51`		`- if (is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {`
	`51`	`+ if (\is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {`
`52`	`52`	`self::$linkOnWindows = false;`
`53`	`53`	`}`
`54`	`54`	`} else {`
`@@ -60,7 +60,7 @@ public static function setUpBeforeClass()`
`60`	`60`	`$targetDir = tempnam(sys_get_temp_dir(), 'sl');`
`61`	`61`	`if (true !== @symlink($originDir, $targetDir)) {`
`62`	`62`	`$report = error_get_last();`
`63`		`- if (is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {`
	`63`	`+ if (\is_array($report) && false !== strpos($report['message'], 'error code(1314)')) {`
`64`	`64`	`self::$symlinkOnWindows = false;`
`65`	`65`	`}`
`66`	`66`	`} else {`
`@@ -129,7 +129,7 @@ protected function getFileGroup($filepath)`
`129`	`129`
`130`	`130`	`protected function markAsSkippedIfLinkIsMissing()`
`131`	`131`	`{`
`132`		`- if (!function_exists('link')) {`
	`132`	`+ if (!\function_exists('link')) {`
`133`	`133`	`$this->markTestSkipped('link is not supported');`
`134`	`134`	`}`
`135`	`135`
`@@ -159,7 +159,7 @@ protected function markAsSkippedIfChmodIsMissing()`
`159`	`159`
`160`	`160`	`protected function markAsSkippedIfPosixIsMissing()`
`161`	`161`	`{`
`162`		`- if (!function_exists('posix_isatty')) {`
	`162`	`+ if (!\function_exists('posix_isatty')) {`
`163`	`163`	`$this->markTestSkipped('Function posix_isatty is required.');`
`164`	`164`	`}`
`165`	`165`	`}`