[Filesystem] Fix false positive in ->remove()

nicolas-grekas · nicolas-grekas · commit ebb510c325dc · 2016-03-08T10:01:36.000+01:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -156,9 +156,9 @@ public function remove($files)
                     $error = error_get_last();
                     throw new IOException(sprintf('Failed to remove directory "%s": %s.', $file, $error['message']));
                 }
-            } elseif ($this->exists($file)) {
-                if (!@unlink($file)) {
-                    $error = error_get_last();
+            } elseif (!@unlink($file)) {
+                $error = error_get_last();
+                if (file_exists($file)) {
                     throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));
                 }
             }
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -38,8 +38,7 @@ public static function setUpBeforeClass()
         if ('\\' === DIRECTORY_SEPARATOR && null === self::$symlinkOnWindows) {
             $target = tempnam(sys_get_temp_dir(), 'sl');
             $link = sys_get_temp_dir().'/sl'.microtime(true).mt_rand();
-            if (@symlink($target, $link)) {
-                self::$symlinkOnWindows = @is_link($link);
+            if (self::$symlinkOnWindows = @symlink($target, $link)) {
                 unlink($link);
             }
             unlink($target);
@@ -61,6 +60,7 @@ protected function tearDown()
             foreach ($this->longPathNamesWindows as $path) {
                 exec('DEL '.$path);
             }
+            $this->longPathNamesWindows = array();
         }
 
         $this->filesystem->remove($this->workspace);
@@ -350,7 +350,7 @@ public function testRemoveCleansInvalidLinks()
 
         // create symlink to nonexistent dir
         rmdir($basePath.'dir');
-        $this->assertFalse(is_dir($basePath.'dir-link'));
+        $this->assertFalse(@readlink($basePath.'dir-link'));
 
         $this->filesystem->remove($basePath);
 
@@ -1089,7 +1089,7 @@ private function markAsSkippedIfChmodIsMissing()
 
     private function markAsSkippedIfPosixIsMissing()
     {
-        if ('\\' === DIRECTORY_SEPARATOR || !function_exists('posix_isatty')) {
+        if (!function_exists('posix_isatty')) {
             $this->markTestSkipped('POSIX is not supported');
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,9 @@ public function remove($files)`
`156`	`156`	`$error = error_get_last();`
`157`	`157`	`throw new IOException(sprintf('Failed to remove directory "%s": %s.', $file, $error['message']));`
`158`	`158`	`}`
`159`		`- } elseif ($this->exists($file)) {`
`160`		`- if (!@unlink($file)) {`
`161`		`- $error = error_get_last();`
	`159`	`+ } elseif (!@unlink($file)) {`
	`160`	`+ $error = error_get_last();`
	`161`	`+ if (file_exists($file)) {`
`162`	`162`	`throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));`
`163`	`163`	`}`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ public static function setUpBeforeClass()`
`38`	`38`	`if ('\\' === DIRECTORY_SEPARATOR && null === self::$symlinkOnWindows) {`
`39`	`39`	`$target = tempnam(sys_get_temp_dir(), 'sl');`
`40`	`40`	`$link = sys_get_temp_dir().'/sl'.microtime(true).mt_rand();`
`41`		`- if (@symlink($target, $link)) {`
`42`		`- self::$symlinkOnWindows = @is_link($link);`
	`41`	`+ if (self::$symlinkOnWindows = @symlink($target, $link)) {`
`43`	`42`	`unlink($link);`
`44`	`43`	`}`
`45`	`44`	`unlink($target);`
`@@ -61,6 +60,7 @@ protected function tearDown()`
`61`	`60`	`foreach ($this->longPathNamesWindows as $path) {`
`62`	`61`	`exec('DEL '.$path);`
`63`	`62`	`}`
	`63`	`+ $this->longPathNamesWindows = array();`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`$this->filesystem->remove($this->workspace);`
`@@ -350,7 +350,7 @@ public function testRemoveCleansInvalidLinks()`
`350`	`350`
`351`	`351`	`// create symlink to nonexistent dir`
`352`	`352`	`rmdir($basePath.'dir');`
`353`		`- $this->assertFalse(is_dir($basePath.'dir-link'));`
	`353`	`+ $this->assertFalse(@readlink($basePath.'dir-link'));`
`354`	`354`
`355`	`355`	`$this->filesystem->remove($basePath);`
`356`	`356`
`@@ -1089,7 +1089,7 @@ private function markAsSkippedIfChmodIsMissing()`
`1089`	`1089`
`1090`	`1090`	`private function markAsSkippedIfPosixIsMissing()`
`1091`	`1091`	`{`
`1092`		`- if ('\\' === DIRECTORY_SEPARATOR \|\| !function_exists('posix_isatty')) {`
	`1092`	`+ if (!function_exists('posix_isatty')) {`
`1093`	`1093`	`$this->markTestSkipped('POSIX is not supported');`
`1094`	`1094`	`}`
`1095`	`1095`	`}`