Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 98f013fe0c3d · 2015-12-31T10:09:35.000+01:00
* 2.7: bug symfony#14246 [Filesystem] dumpFile() non atomic
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -530,14 +530,14 @@ public function dumpFile($filename, $content, $mode = 0666)
             throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);
         }
 
-        $this->rename($tmpFile, $filename, true);
         if (null !== $mode) {
             if (func_num_args() > 2) {
                 @trigger_error('Support for modifying file permissions is deprecated since version 2.3.12 and will be removed in 3.0.', E_USER_DEPRECATED);
             }
 
-            $this->chmod($filename, $mode);
+            $this->chmod($tmpFile, $mode);
         }
+        $this->rename($tmpFile, $filename, true);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -530,14 +530,14 @@ public function dumpFile($filename, $content, $mode = 0666)`
`530`	`530`	`throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);`
`531`	`531`	`}`
`532`	`532`
`533`		`- $this->rename($tmpFile, $filename, true);`
`534`	`533`	`if (null !== $mode) {`
`535`	`534`	`if (func_num_args() > 2) {`
`536`	`535`	`@trigger_error('Support for modifying file permissions is deprecated since version 2.3.12 and will be removed in 3.0.', E_USER_DEPRECATED);`
`537`	`536`	`}`
`538`	`537`
`539`		`- $this->chmod($filename, $mode);`
	`538`	`+ $this->chmod($tmpFile, $mode);`
`540`	`539`	`}`
	`540`	`+ $this->rename($tmpFile, $filename, true);`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`/**`