[Filesystem] fix cleaning up tmp files when dumpFile() fails

symfony · Nov 11, 2020 · 17b83e3 · 17b83e3
1 parent 5c547b8
commit 17b83e3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/Filesystem.php b/Filesystem.php
@@ -686,13 +686,17 @@ public function dumpFile($filename, $content)
         // when the filesystem supports chmod.
         $tmpFile = $this->tempnam($dir, basename($filename));
 
-        if (false === @file_put_contents($tmpFile, $content)) {
-            throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);
-        }
+        try {
+            if (false === @file_put_contents($tmpFile, $content)) {
+                throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);
+            }
 
-        @chmod($tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());
+            @chmod($tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());
 
-        $this->rename($tmpFile, $filename, true);
+            $this->rename($tmpFile, $filename, true);
+        } finally {
+            @unlink($tmpFile);
+        }
     }
 
     /**

diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -1710,6 +1710,18 @@ public function testAppendToFileCreateTheFileIfNotExists()
         $this->assertStringEqualsFile($filename, 'bar');
     }
 
+    public function testDumpRemovesTmpFilesOnFailure()
+    {
+        $expected = scandir(__DIR__, \SCANDIR_SORT_ASCENDING);
+
+        try {
+            $this->filesystem->dumpFile(__DIR__.'/Fixtures', 'bar');
+            $this->fail('IOException expected.');
+        } catch (IOException $e) {
+            $this->assertSame($expected, scandir(__DIR__, \SCANDIR_SORT_ASCENDING));
+        }
+    }
+
     public function testDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()
     {
         $this->markAsSkippedIfChmodIsMissing();