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

nicolas-grekas · nicolas-grekas · commit c72eacefdbb1 · 2016-03-08T08:49:49.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);

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`	`}`