With dumpFile() in the Filesystem class, the mode must be a param.

mpdude · mpdude · commit 327befe5927f · 2013-04-21T14:16:30.000+02:00
Clients of ConfigCache are/were using 0666 &amp; ~umask().
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php
@@ -21,7 +21,11 @@ class CompilerDebugDumpPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $filesystem = new Filesystem();
-        $filesystem->dumpFile($this->getCompilerLogFilename($container), implode("\n", $container->getCompiler()->getLog()));
+        $filesystem->dumpFile(
+            $this->getCompilerLogFilename($container),
+            implode("\n", $container->getCompiler()->getLog()),
+            0666 & ~umask()
+        );
     }
 
     public static function getCompilerLogFilename(ContainerInterface $container)
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
@@ -28,7 +28,11 @@ class ContainerBuilderDebugDumpPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $dumper = new XmlDumper($container);
-        $fs = new Filesystem();
-        $fs->dumpFile($container->getParameter('debug.container.dump'), $dumper->dump());
+        $filesystem = new Filesystem();
+        $filesystem->dumpFile(
+            $container->getParameter('debug.container.dump'),
+            $dumper->dump(),
+            0666 & ~umask()
+        );
     }
 }
diff --git a/src/Symfony/Component/Config/ConfigCache.php b/src/Symfony/Component/Config/ConfigCache.php
@@ -102,11 +102,12 @@ public function isFresh()
      */
     public function write($content, array $metadata = null)
     {
+        $mode = 0666 & ~umask();
         $filesystem = new Filesystem();
-        $filesystem->dumpFile($this->file, $content);
+        $filesystem->dumpFile($this->file, $content, $mode);
 
         if (null !== $metadata && true === $this->debug) {
-            $filesystem->dumpFile($this->getMetaFile(), serialize($metadata));
+            $filesystem->dumpFile($this->getMetaFile(), serialize($metadata), $mode);
         }
     }
 }
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -434,11 +434,12 @@ private function toIterator($files)
     /**
      * Atomically dumps content into a file.
      *
-     * @param  string $filename The file to be written to.
-     * @param  string $content  The data to write into the file.
-     * @throws IOException      If the file cannot be written to.
+     * @param  string  $filename The file to be written to.
+     * @param  string  $content  The data to write into the file.
+     * @param  integer $mode     The file mode (octal).
+     * @throws IOException       If the file cannot be written to.
      */
-    public function dumpFile($filename, $content)
+    public function dumpFile($filename, $content, $mode = 0666)
     {
         $dir = dirname($filename);
 
@@ -455,6 +456,6 @@ public function dumpFile($filename, $content)
         }
 
         $this->rename($tmpFile, $filename);
-        $this->chmod($filename, 0666, umask());
+        $this->chmod($filename, $mode);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,11 @@ class CompilerDebugDumpPass implements CompilerPassInterface`
`21`	`21`	`public function process(ContainerBuilder $container)`
`22`	`22`	`{`
`23`	`23`	`$filesystem = new Filesystem();`
`24`		`- $filesystem->dumpFile($this->getCompilerLogFilename($container), implode("\n", $container->getCompiler()->getLog()));`
	`24`	`+ $filesystem->dumpFile(`
	`25`	`+ $this->getCompilerLogFilename($container),`
	`26`	`+ implode("\n", $container->getCompiler()->getLog()),`
	`27`	`+ 0666 & ~umask()`
	`28`	`+ );`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`public static function getCompilerLogFilename(ContainerInterface $container)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,11 @@ class ContainerBuilderDebugDumpPass implements CompilerPassInterface`
`28`	`28`	`public function process(ContainerBuilder $container)`
`29`	`29`	`{`
`30`	`30`	`$dumper = new XmlDumper($container);`
`31`		`- $fs = new Filesystem();`
`32`		`- $fs->dumpFile($container->getParameter('debug.container.dump'), $dumper->dump());`
	`31`	`+ $filesystem = new Filesystem();`
	`32`	`+ $filesystem->dumpFile(`
	`33`	`+ $container->getParameter('debug.container.dump'),`
	`34`	`+ $dumper->dump(),`
	`35`	`+ 0666 & ~umask()`
	`36`	`+ );`
`33`	`37`	`}`
`34`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,12 @@ public function isFresh()`
`102`	`102`	`*/`
`103`	`103`	`public function write($content, array $metadata = null)`
`104`	`104`	`{`
	`105`	`+ $mode = 0666 & ~umask();`
`105`	`106`	`$filesystem = new Filesystem();`
`106`		`- $filesystem->dumpFile($this->file, $content);`
	`107`	`+ $filesystem->dumpFile($this->file, $content, $mode);`
`107`	`108`
`108`	`109`	`if (null !== $metadata && true === $this->debug) {`
`109`		`- $filesystem->dumpFile($this->getMetaFile(), serialize($metadata));`
	`110`	`+ $filesystem->dumpFile($this->getMetaFile(), serialize($metadata), $mode);`
`110`	`111`	`}`
`111`	`112`	`}`
`112`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -434,11 +434,12 @@ private function toIterator($files)`
`434`	`434`	`/**`
`435`	`435`	`* Atomically dumps content into a file.`
`436`	`436`	`*`
`437`		`- * @param string $filename The file to be written to.`
`438`		`- * @param string $content The data to write into the file.`
`439`		`- * @throws IOException If the file cannot be written to.`
	`437`	`+ * @param string $filename The file to be written to.`
	`438`	`+ * @param string $content The data to write into the file.`
	`439`	`+ * @param integer $mode The file mode (octal).`
	`440`	`+ * @throws IOException If the file cannot be written to.`
`440`	`441`	`*/`
`441`		`- public function dumpFile($filename, $content)`
	`442`	`+ public function dumpFile($filename, $content, $mode = 0666)`
`442`	`443`	`{`
`443`	`444`	`$dir = dirname($filename);`
`444`	`445`
`@@ -455,6 +456,6 @@ public function dumpFile($filename, $content)`
`455`	`456`	`}`
`456`	`457`
`457`	`458`	`$this->rename($tmpFile, $filename);`
`458`		`- $this->chmod($filename, 0666, umask());`
	`459`	`+ $this->chmod($filename, $mode);`
`459`	`460`	`}`
`460`	`461`	`}`