minor #21902 [Filesystem] respect the umask argument in dumpFile() (xabbuh)

fabpot · fabpot · commit fda2472b020f · 2017-03-06T11:24:50.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [Filesystem] respect the umask argument in dumpFile() | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21823 | License | MIT | Doc PR | In #21823 we introduced a small BC break: The `dumpFile()` method of the `Filesystem` class allowed to pass the desired file permissions (support for this feature was dropped in Symfony 3.0). Commits ------- 3a7cd08 respect the umask argument in dumpFile()
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -516,8 +516,8 @@ public function dumpFile($filename, $content, $mode = 0666)
             }
 
             $this->chmod($tmpFile, $mode);
-        } else {
-            @chmod($tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());
+        } elseif (file_exists($filename)) {
+            @chmod($tmpFile, fileperms($filename));
         }
 
         $this->rename($tmpFile, $filename, true);
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1050,6 +1050,19 @@ public function testDumpFileOverwritesAnExistingFile()
         $this->assertSame('bar', file_get_contents($filename));
     }
 
+    public function testDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $filename = $this->workspace.DIRECTORY_SEPARATOR.'foo.txt';
+        file_put_contents($filename, 'FOO BAR');
+        chmod($filename, 0745);
+
+        $this->filesystem->dumpFile($filename, 'bar', null);
+
+        $this->assertFilePermissions(745, $filename);
+    }
+
     public function testCopyShouldKeepExecutionPermission()
     {
         $this->markAsSkippedIfChmodIsMissing();

Original file line number	Diff line number	Diff line change
`@@ -516,8 +516,8 @@ public function dumpFile($filename, $content, $mode = 0666)`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`$this->chmod($tmpFile, $mode);`
`519`		`- } else {`
`520`		`- @chmod($tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());`
	`519`	`+ } elseif (file_exists($filename)) {`
	`520`	`+ @chmod($tmpFile, fileperms($filename));`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`$this->rename($tmpFile, $filename, true);`