bug #21823 dumpFile(), preserve existing file permissions (chs2)

fabpot · fabpot · commit c91db73fbbec · 2017-03-06T10:29:47.000-08:00
This PR was squashed before being merged into the 2.7 branch (closes #21823). Discussion ---------- dumpFile(), preserve existing file permissions When calling Filesystem::dumpFile() on an already existing file, its permissions are lost. | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...   Commits ------- 040a9ab dumpFile(), preserve existing file permissions
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -516,7 +516,10 @@ public function dumpFile($filename, $content, $mode = 0666)
             }
 
             $this->chmod($tmpFile, $mode);
+        } else {
+            @chmod($tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());
         }
+
         $this->rename($tmpFile, $filename, true);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,10 @@ 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`	`521`	`}`
	`522`	`+`
`520`	`523`	`$this->rename($tmpFile, $filename, true);`
`521`	`524`	`}`
`522`	`525`