Removed deprecations in Filesystem component

dosten · fabpot · commit 5d1e558ac233 · 2015-05-16T15:08:11.000+02:00
diff --git a/src/Symfony/Component/Filesystem/CHANGELOG.md b/src/Symfony/Component/Filesystem/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.0.0
+-----
+
+ * removed `$mode` argument from `Filesystem::dumpFile()`
+
 2.6.0
 -----
 
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -455,14 +455,12 @@ public function isAbsolutePath($file)
     /**
      * 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.
-     * @param null|int $mode     The file mode (octal). If null, file permissions are not modified
-     *                           Deprecated since version 2.3.12, to be removed in 3.0.
+     * @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.
      */
-    public function dumpFile($filename, $content, $mode = 0666)
+    public function dumpFile($filename, $content)
     {
         $dir = dirname($filename);
 
@@ -479,9 +477,6 @@ public function dumpFile($filename, $content, $mode = 0666)
         }
 
         $this->rename($tmpFile, $filename, true);
-        if (null !== $mode) {
-            $this->chmod($filename, $mode);
-        }
     }
 
     /**
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -19,7 +19,7 @@
 class FilesystemTest extends FilesystemTestCase
 {
     /**
-     * @var \Symfony\Component\Filesystem\Filesystem $filesystem
+     * @var \Symfony\Component\Filesystem\Filesystem
      */
     private $filesystem = null;
 
@@ -959,22 +959,7 @@ public function testDumpFile()
     {
         $filename = $this->workspace.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'baz.txt';
 
-        $this->filesystem->dumpFile($filename, 'bar', 0753);
-
-        $this->assertFileExists($filename);
-        $this->assertSame('bar', file_get_contents($filename));
-
-        // skip mode check on Windows
-        if ('\\' !== DIRECTORY_SEPARATOR) {
-            $this->assertFilePermissions(753, $filename);
-        }
-    }
-
-    public function testDumpFileWithNullMode()
-    {
-        $filename = $this->workspace.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'baz.txt';
-
-        $this->filesystem->dumpFile($filename, 'bar', null);
+        $this->filesystem->dumpFile($filename, 'bar');
 
         $this->assertFileExists($filename);
         $this->assertSame('bar', file_get_contents($filename));

Original file line number	Diff line number	Diff line change
`@@ -455,14 +455,12 @@ public function isAbsolutePath($file)`
`455`	`455`	`/**`
`456`	`456`	`* Atomically dumps content into a file.`
`457`	`457`	`*`
`458`		`- * @param string $filename The file to be written to.`
`459`		`- * @param string $content The data to write into the file.`
`460`		`- * @param null\|int $mode The file mode (octal). If null, file permissions are not modified`
`461`		`- * Deprecated since version 2.3.12, to be removed in 3.0.`
	`458`	`+ * @param string $filename The file to be written to.`
	`459`	`+ * @param string $content The data to write into the file.`
`462`	`460`	`*`
`463`	`461`	`* @throws IOException If the file cannot be written to.`
`464`	`462`	`*/`
`465`		`- public function dumpFile($filename, $content, $mode = 0666)`
	`463`	`+ public function dumpFile($filename, $content)`
`466`	`464`	`{`
`467`	`465`	`$dir = dirname($filename);`
`468`	`466`
`@@ -479,9 +477,6 @@ public function dumpFile($filename, $content, $mode = 0666)`
`479`	`477`	`}`
`480`	`478`
`481`	`479`	`$this->rename($tmpFile, $filename, true);`
`482`		`- if (null !== $mode) {`
`483`		`- $this->chmod($filename, $mode);`
`484`		`- }`
`485`	`480`	`}`
`486`	`481`
`487`	`482`	`/**`