Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit ddab6278a24b · 2015-12-31T10:09:12.000+01:00
* 2.3: bug symfony#14246 [Filesystem] dumpFile() non atomic Conflicts: src/Symfony/Component/Filesystem/Filesystem.php
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -478,14 +478,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
`@@ -478,14 +478,14 @@ public function dumpFile($filename, $content, $mode = 0666)`
`478`	`478`	`throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);`
`479`	`479`	`}`
`480`	`480`
`481`		`- $this->rename($tmpFile, $filename, true);`
`482`	`481`	`if (null !== $mode) {`
`483`	`482`	`if (func_num_args() > 2) {`
`484`	`483`	`@trigger_error('Support for modifying file permissions is deprecated since version 2.3.12 and will be removed in 3.0.', E_USER_DEPRECATED);`
`485`	`484`	`}`
`486`	`485`
`487`		`- $this->chmod($filename, $mode);`
	`486`	`+ $this->chmod($tmpFile, $mode);`
`488`	`487`	`}`
	`488`	`+ $this->rename($tmpFile, $filename, true);`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`/**`