bug #17626 Try to delete broken symlinks (IchHabRecht)

nicolas-grekas · nicolas-grekas · commit 36cb46a71a4e · 2016-03-02T14:09:42.000+01:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17626). Discussion ---------- Try to delete broken symlinks If you delete the target of a symlink (at least on Windows systems) you don't get the kind of the target anymore (obviously). Therefore it might happen that a broken symlink to a directory should be removed with unlink() which fails. This patch adds another check for a broken symlink and tries to remove with rmdir() before throwing an exception. It helps to clean up test folders on Windows systems (so already proofed by the existing tests). Commits ------- 8442ab1 [Filesystem] Try to delete broken symlinks
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -161,8 +161,15 @@ public function remove($files)
                     }
                 } else {
                     if (true !== @unlink($file)) {
-                        $error = error_get_last();
-                        throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));
+                        // handle broken symlinks on Windows systems
+                        if (is_link($file) && false === @readlink($file)) {
+                            if (true !== @rmdir($file)) {
+                                throw new IOException(sprintf('Failed to remove broken symlink "%s".', $file), 0, null, $file);
+                            }
+                        } else {
+                            $error = error_get_last();
+                            throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));
+                        }
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,15 @@ public function remove($files)`
`161`	`161`	`}`
`162`	`162`	`} else {`
`163`	`163`	`if (true !== @unlink($file)) {`
`164`		`- $error = error_get_last();`
`165`		`- throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));`
	`164`	`+ // handle broken symlinks on Windows systems`
	`165`	`+ if (is_link($file) && false === @readlink($file)) {`
	`166`	`+ if (true !== @rmdir($file)) {`
	`167`	`+ throw new IOException(sprintf('Failed to remove broken symlink "%s".', $file), 0, null, $file);`
	`168`	`+ }`
	`169`	`+ } else {`
	`170`	`+ $error = error_get_last();`
	`171`	`+ throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));`
	`172`	`+ }`
`166`	`173`	`}`
`167`	`174`	`}`
`168`	`175`	`}`