[Filesystem] remove dirs atomically if possible

nicolas-grekas · nicolas-grekas · commit 604146233d54 · 2021-02-10T18:12:50.000+01:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -167,6 +167,12 @@ public function remove($files)
         } elseif (!\is_array($files)) {
             $files = [$files];
         }
+
+        self::doRemove($files, false);
+    }
+
+    private static function doRemove(array $files, bool $isRecursive): void
+    {
         $files = array_reverse($files);
         foreach ($files as $file) {
             if (is_link($file)) {
@@ -175,10 +181,35 @@ public function remove($files)
                     throw new IOException(sprintf('Failed to remove symlink "%s": ', $file).self::$lastError);
                 }
             } elseif (is_dir($file)) {
-                $this->remove(new \FilesystemIterator($file, \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS));
+                if (!$isRecursive) {
+                    $tmpName = \dirname(realpath($file)).'/.'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-.'));
+
+                    if (file_exists($tmpName)) {
+                        try {
+                            self::doRemove([$tmpName], true);
+                        } catch (IOException $e) {
+                        }
+                    }
+
+                    if (!file_exists($tmpName) && self::box('rename', $file, $tmpName)) {
+                        $origFile = $file;
+                        $file = $tmpName;
+                    } else {
+                        $origFile = null;
+                    }
+                }
+
+                $files = new \FilesystemIterator($file, \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS);
+                self::doRemove(iterator_to_array($files, true), true);
+
+                if (!self::box('rmdir', $file) && file_exists($file) && !$isRecursive) {
+                    $lastError = self::$lastError;
+
+                    if (null !== $origFile && self::box('rename', $file, $origFile)) {
+                        $file = $origFile;
+                    }
 
-                if (!self::box('rmdir', $file) && file_exists($file)) {
-                    throw new IOException(sprintf('Failed to remove directory "%s": ', $file).self::$lastError);
+                    throw new IOException(sprintf('Failed to remove directory "%s": ', $file).$lastError);
                 }
             } 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/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -35,8 +36,10 @@ class KernelTest extends TestCase
 {
     protected function tearDown(): void
     {
-        $fs = new Filesystem();
-        $fs->remove(__DIR__.'/Fixtures/var');
+        try {
+            (new Filesystem())->remove(__DIR__.'/Fixtures/var');
+        } catch (IOException $e) {
+        }
     }
 
     public function testConstructor()

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
`17`	`17`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`18`	`18`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
	`19`	`+use Symfony\Component\Filesystem\Exception\IOException;`
`19`	`20`	`use Symfony\Component\Filesystem\Filesystem;`
`20`	`21`	`use Symfony\Component\HttpFoundation\Request;`
`21`	`22`	`use Symfony\Component\HttpFoundation\Response;`
`@@ -35,8 +36,10 @@ class KernelTest extends TestCase`
`35`	`36`	`{`
`36`	`37`	`protected function tearDown(): void`
`37`	`38`	`{`
`38`		`- $fs = new Filesystem();`
`39`		`- $fs->remove(__DIR__.'/Fixtures/var');`
	`39`	`+ try {`
	`40`	`+ (new Filesystem())->remove(__DIR__.'/Fixtures/var');`
	`41`	`+ } catch (IOException $e) {`
	`42`	`+ }`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`public function testConstructor()`