diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index a6e8715256be6..96b2e96009f43 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -179,7 +179,7 @@ public function remove($files)
if (!self::box('rmdir', $file) && file_exists($file)) {
throw new IOException(sprintf('Failed to remove directory "%s": ', $file).self::$lastError);
}
- } elseif (!self::box('unlink', $file) && file_exists($file)) {
+ } elseif (!self::box('unlink', $file) && (false !== strpos(self::$lastError, 'Permission denied') || file_exists($file))) {
throw new IOException(sprintf('Failed to remove file "%s": ', $file).self::$lastError);
}
}
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 14837152b3a10..b157cc4ed3e74 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Filesystem\Tests;
+use Symfony\Component\Filesystem\Exception\IOException;
+
/**
* Test class for Filesystem.
*/
@@ -334,6 +336,28 @@ public function testRemoveIgnoresNonExistingFiles()
$this->assertFileDoesNotExist($basePath.'dir');
}
+ public function testRemoveThrowsExceptionOnPermissionDenied()
+ {
+ $this->markAsSkippedIfChmodIsMissing();
+
+ $basePath = $this->workspace.\DIRECTORY_SEPARATOR.'dir_permissions';
+ mkdir($basePath);
+ $file = $basePath.\DIRECTORY_SEPARATOR.'file';
+ touch($file);
+ chmod($basePath, 0400);
+
+ try {
+ $this->filesystem->remove($file);
+ $this->fail('Filesystem::remove() should throw an exception');
+ } catch (IOException $e) {
+ $this->assertStringContainsString('Failed to remove file "'.$file.'"', $e->getMessage());
+ $this->assertStringContainsString('Permission denied', $e->getMessage());
+ } finally {
+ // Make sure we can clean up this file
+ chmod($basePath, 0777);
+ }
+ }
+
public function testRemoveCleansInvalidLinks()
{
$this->markAsSkippedIfSymlinkIsMissing();
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy