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

stof · stof · commit f3312e79edfa · 2018-07-24T12:05:38.000+02:00
diff --git a/Filesystem.php b/Filesystem.php
@@ -44,7 +44,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)) {
@@ -121,7 +121,7 @@ public function exists($files)
         $maxPathLength = PHP_MAXPATHLEN - 2;
 
         foreach ($this->toIterator($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);
             }
 
@@ -163,7 +163,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);
@@ -222,7 +222,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);
                 }
@@ -249,8 +249,8 @@ 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 (true !== @lchgrp($file, $group) || (defined('HHVM_VERSION') && !posix_getgrnam($group))) {
+            if (is_link($file) && \function_exists('lchgrp')) {
+                if (true !== @lchgrp($file, $group) || (\defined('HHVM_VERSION') && !posix_getgrnam($group))) {
                     throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);
                 }
             } else {
@@ -303,7 +303,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);
         }
 
@@ -332,7 +332,7 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
             }
         }
 
-        $this->mkdir(dirname($targetDir));
+        $this->mkdir(\dirname($targetDir));
 
         if (is_link($targetDir)) {
             if (readlink($targetDir) === $originDir) {
@@ -368,7 +368,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);
             }
 
@@ -386,7 +386,7 @@ public function makePathRelative($endPath, $startPath)
             $result = array();
 
             foreach ($pathSegments as $segment) {
-                if ('..' === $segment && ($absolute || count($result))) {
+                if ('..' === $segment && ($absolute || \count($result))) {
                     array_pop($result);
                 } elseif ('.' !== $segment) {
                     $result[] = $segment;
@@ -406,16 +406,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.'/' : '');
@@ -446,7 +446,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']) {
@@ -455,7 +455,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)) {
@@ -513,7 +513,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])
                 && ':' === substr($file, 1, 1)
                 && strspn($file, '/\\', 2, 1)
             )
@@ -585,7 +585,7 @@ public function tempnam($dir, $prefix)
      */
     public function dumpFile($filename, $content, $mode = 0666)
     {
-        $dir = dirname($filename);
+        $dir = \dirname($filename);
 
         if (!is_dir($dir)) {
             $this->mkdir($dir);
@@ -602,7 +602,7 @@ public function dumpFile($filename, $content, $mode = 0666)
         }
 
         if (null !== $mode) {
-            if (func_num_args() > 2) {
+            if (\func_num_args() > 2) {
                 @trigger_error('Support for modifying file permissions is deprecated since Symfony 2.3.12 and will be removed in 3.0.', E_USER_DEPRECATED);
             }
 
@@ -622,7 +622,7 @@ public function dumpFile($filename, $content, $mode = 0666)
     private function toIterator($files)
     {
         if (!$files instanceof \Traversable) {
-            $files = new \ArrayObject(is_array($files) ? $files : array($files));
+            $files = new \ArrayObject(\is_array($files) ? $files : array($files));
         }
 
         return $files;
@@ -639,7 +639,7 @@ private function getSchemeAndHierarchy($filename)
     {
         $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
@@ -449,7 +449,7 @@ public function testChmodWithWrongModLeavesPreviousPermissionsUntouched()
     {
         $this->markAsSkippedIfChmodIsMissing();
 
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             $this->markTestSkipped('chmod() changes permissions even when passing invalid modes on HHVM');
         }
 
@@ -1247,7 +1247,7 @@ public function testDumpFileOverwritesAnExistingFile()
 
     public function testDumpFileWithFileScheme()
     {
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             $this->markTestSkipped('HHVM does not handle the file:// scheme correctly');
         }
 
diff --git a/Tests/FilesystemTestCase.php b/Tests/FilesystemTestCase.php
@@ -122,7 +122,7 @@ protected function markAsSkippedIfChmodIsMissing()
 
     protected function markAsSkippedIfPosixIsMissing()
     {
-        if (!function_exists('posix_isatty')) {
+        if (!\function_exists('posix_isatty')) {
             $this->markTestSkipped('Function posix_isatty is required.');
         }
     }
diff --git a/Tests/LockHandlerTest.php b/Tests/LockHandlerTest.php
@@ -76,7 +76,7 @@ public function testErrorHandlingInLockIfLockPathBecomesUnwritable()
             $fs->remove($lockPath);
         }
 
-        $this->assertInstanceOf('Symfony\Component\Filesystem\Exception\IOException', $e, sprintf('Expected IOException to be thrown, got %s instead.', get_class($e)));
+        $this->assertInstanceOf('Symfony\Component\Filesystem\Exception\IOException', $e, sprintf('Expected IOException to be thrown, got %s instead.', \get_class($e)));
         $this->assertNull($wrongMessage, sprintf('Expected exception message to contain "Permission denied", got "%s" instead.', $wrongMessage));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)`
`44`	`44`	`throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);`
`45`	`45`	`}`
`46`	`46`
`47`		`- $this->mkdir(dirname($targetFile));`
	`47`	`+ $this->mkdir(\dirname($targetFile));`
`48`	`48`
`49`	`49`	`$doCopy = true;`
`50`	`50`	`if (!$overwriteNewerFiles && null === parse_url($originFile, PHP_URL_HOST) && is_file($targetFile)) {`
`@@ -121,7 +121,7 @@ public function exists($files)`
`121`	`121`	`$maxPathLength = PHP_MAXPATHLEN - 2;`
`122`	`122`
`123`	`123`	`foreach ($this->toIterator($files) as $file) {`
`124`		`- if (strlen($file) > $maxPathLength) {`
	`124`	`+ if (\strlen($file) > $maxPathLength) {`
`125`	`125`	`throw new IOException(sprintf('Could not check if file exist because path length exceeds %d characters.', $maxPathLength), 0, null, $file);`
`126`	`126`	`}`
`127`	`127`
`@@ -163,7 +163,7 @@ public function remove($files)`
`163`	`163`	`{`
`164`	`164`	`if ($files instanceof \Traversable) {`
`165`	`165`	`$files = iterator_to_array($files, false);`
`166`		`- } elseif (!is_array($files)) {`
	`166`	`+ } elseif (!\is_array($files)) {`
`167`	`167`	`$files = array($files);`
`168`	`168`	`}`
`169`	`169`	`$files = array_reverse($files);`
`@@ -222,7 +222,7 @@ public function chown($files, $user, $recursive = false)`
`222`	`222`	`if ($recursive && is_dir($file) && !is_link($file)) {`
`223`	`223`	`$this->chown(new \FilesystemIterator($file), $user, true);`
`224`	`224`	`}`
`225`		`- if (is_link($file) && function_exists('lchown')) {`
	`225`	`+ if (is_link($file) && \function_exists('lchown')) {`
`226`	`226`	`if (true !== @lchown($file, $user)) {`
`227`	`227`	`throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);`
`228`	`228`	`}`
`@@ -249,8 +249,8 @@ public function chgrp($files, $group, $recursive = false)`
`249`	`249`	`if ($recursive && is_dir($file) && !is_link($file)) {`
`250`	`250`	`$this->chgrp(new \FilesystemIterator($file), $group, true);`
`251`	`251`	`}`
`252`		`- if (is_link($file) && function_exists('lchgrp')) {`
`253`		`- if (true !== @lchgrp($file, $group) \|\| (defined('HHVM_VERSION') && !posix_getgrnam($group))) {`
	`252`	`+ if (is_link($file) && \function_exists('lchgrp')) {`
	`253`	`+ if (true !== @lchgrp($file, $group) \|\| (\defined('HHVM_VERSION') && !posix_getgrnam($group))) {`
`254`	`254`	`throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);`
`255`	`255`	`}`
`256`	`256`	`} else {`
`@@ -303,7 +303,7 @@ private function isReadable($filename)`
`303`	`303`	`{`
`304`	`304`	`$maxPathLength = PHP_MAXPATHLEN - 2;`
`305`	`305`
`306`		`- if (strlen($filename) > $maxPathLength) {`
	`306`	`+ if (\strlen($filename) > $maxPathLength) {`
`307`	`307`	`throw new IOException(sprintf('Could not check if file is readable because path length exceeds %d characters.', $maxPathLength), 0, null, $filename);`
`308`	`308`	`}`
`309`	`309`
`@@ -332,7 +332,7 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`
`335`		`- $this->mkdir(dirname($targetDir));`
	`335`	`+ $this->mkdir(\dirname($targetDir));`
`336`	`336`
`337`	`337`	`if (is_link($targetDir)) {`
`338`	`338`	`if (readlink($targetDir) === $originDir) {`
`@@ -368,7 +368,7 @@ public function makePathRelative($endPath, $startPath)`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`$stripDriveLetter = function ($path) {`
`371`		`- if (strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0])) {`
	`371`	`+ if (\strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0])) {`
`372`	`372`	`return substr($path, 2);`
`373`	`373`	`}`
`374`	`374`
`@@ -386,7 +386,7 @@ public function makePathRelative($endPath, $startPath)`
`386`	`386`	`$result = array();`
`387`	`387`
`388`	`388`	`foreach ($pathSegments as $segment) {`
`389`		`- if ('..' === $segment && ($absolute \|\| count($result))) {`
	`389`	`+ if ('..' === $segment && ($absolute \|\| \count($result))) {`
`390`	`390`	`array_pop($result);`
`391`	`391`	`} elseif ('.' !== $segment) {`
`392`	`392`	`$result[] = $segment;`
`@@ -406,16 +406,16 @@ public function makePathRelative($endPath, $startPath)`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`// Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)`
`409`		`- if (1 === count($startPathArr) && '' === $startPathArr[0]) {`
	`409`	`+ if (1 === \count($startPathArr) && '' === $startPathArr[0]) {`
`410`	`410`	`$depth = 0;`
`411`	`411`	`} else {`
`412`		`- $depth = count($startPathArr) - $index;`
	`412`	`+ $depth = \count($startPathArr) - $index;`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`// Repeated "../" for each level need to reach the common path`
`416`	`416`	`$traverser = str_repeat('../', $depth);`
`417`	`417`
`418`		`- $endPathRemainder = implode('/', array_slice($endPathArr, $index));`
	`418`	`+ $endPathRemainder = implode('/', \array_slice($endPathArr, $index));`
`419`	`419`
`420`	`420`	`// Construct $endPath from traversing to the common path, then to the remaining $endPath`
`421`	`421`	`$relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');`
`@@ -446,7 +446,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`446`	`446`	`{`
`447`	`447`	`$targetDir = rtrim($targetDir, '/\\');`
`448`	`448`	`$originDir = rtrim($originDir, '/\\');`
`449`		`- $originDirLen = strlen($originDir);`
	`449`	`+ $originDirLen = \strlen($originDir);`
`450`	`450`
`451`	`451`	`// Iterate in destination folder to remove obsolete entries`
`452`	`452`	`if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {`
`@@ -455,7 +455,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`455`	`455`	`$flags = \FilesystemIterator::SKIP_DOTS;`
`456`	`456`	`$deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);`
`457`	`457`	`}`
`458`		`- $targetDirLen = strlen($targetDir);`
	`458`	`+ $targetDirLen = \strlen($targetDir);`
`459`	`459`	`foreach ($deleteIterator as $file) {`
`460`	`460`	`$origin = $originDir.substr($file->getPathname(), $targetDirLen);`
`461`	`461`	`if (!$this->exists($origin)) {`
`@@ -513,7 +513,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`513`	`513`	`public function isAbsolutePath($file)`
`514`	`514`	`{`
`515`	`515`	`return strspn($file, '/\\', 0, 1)`
`516`		`- \|\| (strlen($file) > 3 && ctype_alpha($file[0])`
	`516`	`+ \|\| (\strlen($file) > 3 && ctype_alpha($file[0])`
`517`	`517`	`&& ':' === substr($file, 1, 1)`
`518`	`518`	`&& strspn($file, '/\\', 2, 1)`
`519`	`519`	`)`
`@@ -585,7 +585,7 @@ public function tempnam($dir, $prefix)`
`585`	`585`	`*/`
`586`	`586`	`public function dumpFile($filename, $content, $mode = 0666)`
`587`	`587`	`{`
`588`		`- $dir = dirname($filename);`
	`588`	`+ $dir = \dirname($filename);`
`589`	`589`
`590`	`590`	`if (!is_dir($dir)) {`
`591`	`591`	`$this->mkdir($dir);`
`@@ -602,7 +602,7 @@ public function dumpFile($filename, $content, $mode = 0666)`
`602`	`602`	`}`
`603`	`603`
`604`	`604`	`if (null !== $mode) {`
`605`		`- if (func_num_args() > 2) {`
	`605`	`+ if (\func_num_args() > 2) {`
`606`	`606`	`@trigger_error('Support for modifying file permissions is deprecated since Symfony 2.3.12 and will be removed in 3.0.', E_USER_DEPRECATED);`
`607`	`607`	`}`
`608`	`608`
`@@ -622,7 +622,7 @@ public function dumpFile($filename, $content, $mode = 0666)`
`622`	`622`	`private function toIterator($files)`
`623`	`623`	`{`
`624`	`624`	`if (!$files instanceof \Traversable) {`
`625`		`- $files = new \ArrayObject(is_array($files) ? $files : array($files));`
	`625`	`+ $files = new \ArrayObject(\is_array($files) ? $files : array($files));`
`626`	`626`	`}`
`627`	`627`
`628`	`628`	`return $files;`
`@@ -639,7 +639,7 @@ private function getSchemeAndHierarchy($filename)`
`639`	`639`	`{`
`640`	`640`	`$components = explode('://', $filename, 2);`
`641`	`641`
`642`		`- return 2 === count($components) ? array($components[0], $components[1]) : array(null, $components[0]);`
	`642`	`+ return 2 === \count($components) ? array($components[0], $components[1]) : array(null, $components[0]);`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`private static function box($func)`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ public function testFilesExistsFails()`
`383`	`383`	`$oldPath = getcwd();`
`384`	`384`	`mkdir($basePath);`
`385`	`385`	`chdir($basePath);`
`386`		`- $file = str_repeat('T', $maxPathLength - strlen($basePath) + 1);`
	`386`	`+ $file = str_repeat('T', $maxPathLength - \strlen($basePath) + 1);`
`387`	`387`	`$path = $basePath.$file;`
`388`	`388`	`exec('TYPE NUL >>'.$file); // equivalent of touch, we can not use the php touch() here because it suffers from the same limitation`
`389`	`389`	`$this->longPathNamesWindows[] = $path; // save this so we can clean up later`
`@@ -449,7 +449,7 @@ public function testChmodWithWrongModLeavesPreviousPermissionsUntouched()`
`449`	`449`	`{`
`450`	`450`	`$this->markAsSkippedIfChmodIsMissing();`
`451`	`451`
`452`		`- if (defined('HHVM_VERSION')) {`
	`452`	`+ if (\defined('HHVM_VERSION')) {`
`453`	`453`	`$this->markTestSkipped('chmod() changes permissions even when passing invalid modes on HHVM');`
`454`	`454`	`}`
`455`	`455`
`@@ -1247,7 +1247,7 @@ public function testDumpFileOverwritesAnExistingFile()`
`1247`	`1247`
`1248`	`1248`	`public function testDumpFileWithFileScheme()`
`1249`	`1249`	`{`
`1250`		`- if (defined('HHVM_VERSION')) {`
	`1250`	`+ if (\defined('HHVM_VERSION')) {`
`1251`	`1251`	`$this->markTestSkipped('HHVM does not handle the file:// scheme correctly');`
`1252`	`1252`	`}`
`1253`	`1253`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ protected function markAsSkippedIfChmodIsMissing()`
`122`	`122`
`123`	`123`	`protected function markAsSkippedIfPosixIsMissing()`
`124`	`124`	`{`
`125`		`- if (!function_exists('posix_isatty')) {`
	`125`	`+ if (!\function_exists('posix_isatty')) {`
`126`	`126`	`$this->markTestSkipped('Function posix_isatty is required.');`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function testErrorHandlingInLockIfLockPathBecomesUnwritable()`
`76`	`76`	`$fs->remove($lockPath);`
`77`	`77`	`}`
`78`	`78`
`79`		`- $this->assertInstanceOf('Symfony\Component\Filesystem\Exception\IOException', $e, sprintf('Expected IOException to be thrown, got %s instead.', get_class($e)));`
	`79`	`+ $this->assertInstanceOf('Symfony\Component\Filesystem\Exception\IOException', $e, sprintf('Expected IOException to be thrown, got %s instead.', \get_class($e)));`
`80`	`80`	`$this->assertNull($wrongMessage, sprintf('Expected exception message to contain "Permission denied", got "%s" instead.', $wrongMessage));`
`81`	`81`	`}`
`82`	`82`