feature #14145 Removed deprecations in Filesystem component (dosten)

fabpot · fabpot · commit 5b117e6b691c · 2015-05-16T15:09:29.000+02:00
This PR was squashed before being merged into the 3.0-dev branch (closes #14145). Discussion ---------- Removed deprecations in Filesystem component | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 5d1e558 Removed deprecations in Filesystem component
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
@@ -451,14 +451,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);
 
@@ -475,13 +473,6 @@ public function dumpFile($filename, $content, $mode = 0666)
         }
 
         $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);
-        }
     }
 
     /**
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -960,35 +960,6 @@ public function testDumpFile()
         $filename = $this->workspace.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'baz.txt';
 
         $this->filesystem->dumpFile($filename, 'bar');
-
-        $this->assertFileExists($filename);
-        $this->assertSame('bar', file_get_contents($filename));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testDumpFileAndSetPermissions()
-    {
-        $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->assertFileExists($filename);
         $this->assertSame('bar', file_get_contents($filename));
 

Original file line number	Diff line number	Diff line change
`@@ -451,14 +451,12 @@ public function isAbsolutePath($file)`
`451`	`451`	`/**`
`452`	`452`	`* Atomically dumps content into a file.`
`453`	`453`	`*`
`454`		`- * @param string $filename The file to be written to.`
`455`		`- * @param string $content The data to write into the file.`
`456`		`- * @param null\|int $mode The file mode (octal). If null, file permissions are not modified`
`457`		`- * Deprecated since version 2.3.12, to be removed in 3.0.`
	`454`	`+ * @param string $filename The file to be written to.`
	`455`	`+ * @param string $content The data to write into the file.`
`458`	`456`	`*`
`459`	`457`	`* @throws IOException If the file cannot be written to.`
`460`	`458`	`*/`
`461`		`- public function dumpFile($filename, $content, $mode = 0666)`
	`459`	`+ public function dumpFile($filename, $content)`
`462`	`460`	`{`
`463`	`461`	`$dir = dirname($filename);`
`464`	`462`
`@@ -475,13 +473,6 @@ public function dumpFile($filename, $content, $mode = 0666)`
`475`	`473`	`}`
`476`	`474`
`477`	`475`	`$this->rename($tmpFile, $filename, true);`
`478`		`- if (null !== $mode) {`
`479`		`- if (func_num_args() > 2) {`
`480`		`- trigger_error('Support for modifying file permissions is deprecated since version 2.3.12 and will be removed in 3.0.', E_USER_DEPRECATED);`
`481`		`- }`
`482`		`-`
`483`		`- $this->chmod($filename, $mode);`
`484`		`- }`
`485`	`476`	`}`
`486`	`477`
`487`	`478`	`/**`