Skip to content

[Filesystem] Fixed a bug in remove() being unable to unlink broken symlinks #3811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabpot merged 15 commits into from
Apr 7, 2012
Merged

[Filesystem] Fixed a bug in remove() being unable to unlink broken symlinks #3811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1c833e7
[Filesystem] Added missing docblock comment.
jakzal Apr 6, 2012
6ac5486
[Filesystem] Added unit tests for copy method.
jakzal Apr 6, 2012
7e297db
[Filesystem] Added unit tests for mkdir method.
jakzal Apr 6, 2012
a91e200
[Filesystem] Added unit tests for touch method.
jakzal Apr 6, 2012
8e861b7
[Filesystem] Introduced workspace directory to limit complexity of te…
jakzal Apr 6, 2012
bba0080
[Filesystem] Added unit tests for remove method.
jakzal Apr 6, 2012
8071859
[Filesystem] Added unit tests for chmod method.
jakzal Apr 6, 2012
a041feb
[Filesystem] Added unit tests for rename method.
jakzal Apr 6, 2012
21860cb
[Filesystem] Added unit tests for symlink method.
jakzal Apr 6, 2012
2ee4b88
[Filesystem] Added unit tests for makePathRelative method.
jakzal Apr 6, 2012
8c94069
[Filesystem] Added unit tests for isAbsolutePath method.
jakzal Apr 6, 2012
11a676d
[Filesystem] Added unit tests for mirror method.
jakzal Apr 6, 2012
d4243a2
[Filesystem] Fixed a bug in remove being unable to remove symlinks to…
jakzal Apr 6, 2012
f5f5c21
[Filesystem] Fixed typos in the docblocks.
jakzal Apr 6, 2012
100e97e
[Filesystem] Fixed warnings in makePathRelative().
jakzal Apr 7, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/Symfony/Component/Filesystem/Filesystem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function mkdir($dirs, $mode = 0777)
/**
* Creates empty files.
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to remove
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
*/
public function touch($files)
{
Expand All @@ -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;
}

Expand All @@ -105,7 +105,7 @@ public function remove($files)
/**
* Change mode for an array of files or directories.
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to remove
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to change mode
* @param integer $mode The new mode
* @param integer $umask The mode mask (octal)
*/
Expand Down Expand Up @@ -171,16 +171,16 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
/**
* Given an existing path, convert it to a path relative to a given starting path
*
* @var string Absolute path of target
* @var string Absolute path where traversal begins
* @param string $endPath Absolute path of target
* @param string $startPath Absolute path where traversal begins
*
* @return string Path of target relative to starting path
*/
public function makePathRelative($endPath, $startPath)
{
// Find for which character the the common path stops
$offset = 0;
while ($startPath[$offset] === $endPath[$offset]) {
while (isset($startPath[$offset]) && isset($endPath[$offset]) && $startPath[$offset] === $endPath[$offset]) {
$offset++;
}

Expand Down Expand Up @@ -264,6 +264,11 @@ public function isAbsolutePath($file)
return false;
}

/**
* @param mixed $files
*
* @return \Traversable
*/
private function toIterator($files)
{
if (!$files instanceof \Traversable) {
Expand Down
Loading