Commitd4243a2

committed

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

1 parent11a676d commitd4243a2Copy full SHA for d4243a2

File tree

+17

-1

lines changed

src/Symfony/Component/Filesystem
- Filesystem.php
- Tests
  - FilesystemTest.php

+17

-1

lines changed

Lines changed: 1 addition & 1 deletion

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 ($filesas$file) {`
`91`		`-if (!file_exists($file)) {`
	`91`	`+if (!file_exists($file) && !is_link($file)) {`
`92`	`92`	`continue;`
`93`	`93`	`}`
`94`	`94`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,22 @@ public function testRemoveIgnoresNonExistingFiles()`
`297`	`297`	`$this->assertTrue(!is_dir($basePath.'dir'));`
`298`	`298`	`}`
`299`	`299`
	`300`	`+publicfunctiontestRemoveCleansInvalidLinks()`
	`301`	`+ {`
	`302`	`+$this->markAsSkippeIfSymlinkIsMissing();`
	`303`	`+`
	`304`	`+$basePath =$this->workspace.DIRECTORY_SEPARATOR.'directory'.DIRECTORY_SEPARATOR;`
	`305`	`+`
	`306`	`+mkdir($basePath);`
	`307`	`+mkdir($basePath.'dir');`
	`308`	`+// create symlink to unexisting file`
	`309`	`+symlink($basePath.'file',$basePath.'link');`
	`310`	`+`
	`311`	`+$this->filesystem->remove($basePath);`
	`312`	`+`
	`313`	`+$this->assertTrue(!is_dir($basePath));`
	`314`	`+ }`
	`315`	`+`
`300`	`316`	`publicfunctiontestChmodChangesFileMode()`
`301`	`317`	`{`
`302`	`318`	`$file =$this->workspace.DIRECTORY_SEPARATOR.'file';`

Comments

(0)