[Filesystem] Fixed a bug in remove being unable to remove symlinks to unexisting file or directory.

jakzal · jakzal · commit d4243a28b61a · 2012-04-07T00:01:32.000+01:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -88,7 +88,7 @@ public function remove($files)
         $files = iterator_to_array($this->toIterator($files));
         $files = array_reverse($files);
         foreach ($files as $file) {
-            if (!file_exists($file)) {
+            if (!file_exists($file) && !is_link($file)) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -297,6 +297,22 @@ public function testRemoveIgnoresNonExistingFiles()
         $this->assertTrue(!is_dir($basePath.'dir'));
     }
 
+    public function testRemoveCleansInvalidLinks()
+    {
+        $this->markAsSkippeIfSymlinkIsMissing();
+
+        $basePath = $this->workspace.DIRECTORY_SEPARATOR.'directory'.DIRECTORY_SEPARATOR;
+
+        mkdir($basePath);
+        mkdir($basePath.'dir');
+        // create symlink to unexisting file
+        symlink($basePath.'file', $basePath.'link');
+
+        $this->filesystem->remove($basePath);
+
+        $this->assertTrue(!is_dir($basePath));
+    }
+
     public function testChmodChangesFileMode()
     {
         $file = $this->workspace.DIRECTORY_SEPARATOR.'file';

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function remove($files)`
`88`	`88`	`$files = iterator_to_array($this->toIterator($files));`
`89`	`89`	`$files = array_reverse($files);`
`90`	`90`	`foreach ($files as $file) {`
`91`		`- if (!file_exists($file)) {`
	`91`	`+ if (!file_exists($file) && !is_link($file)) {`
`92`	`92`	`continue;`
`93`	`93`	`}`
`94`	`94`