bug #16797 [Filesystem] Recursivly widen non-executable directories (Slamdunk)

fabpot · fabpot · commit 0c2f1d94dea7 · 2015-12-18T18:05:30.000+01:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16797). Discussion ---------- [Filesystem] Recursivly widen non-executable directories | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | none The `\FilesystemIterator` throws an `UnexpectedValueException` if the directory is non-executable. Commits ------- fb75651 [Filesystem] Recursivly widen non-executable directories
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -177,12 +177,12 @@ public function remove($files)
     public function chmod($files, $mode, $umask = 0000, $recursive = false)
     {
         foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chmod(new \FilesystemIterator($file), $mode, $umask, true);
-            }
             if (true !== @chmod($file, $mode & ~$umask)) {
                 throw new IOException(sprintf('Failed to chmod file %s', $file));
             }
+            if ($recursive && is_dir($file) && !is_link($file)) {
+                $this->chmod(new \FilesystemIterator($file), $mode, $umask, true);
+            }
         }
     }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -479,6 +479,22 @@ public function testChmodChangesModeOfTraversableFileObject()
         $this->assertEquals(753, $this->getFilePermissions($directory));
     }
 
+    public function testChmodChangesZeroModeOnSubdirectoriesOnRecursive()
+    {
+        $this->markAsSkippedIfChmodIsMissing();
+
+        $directory = $this->workspace.DIRECTORY_SEPARATOR.'directory';
+        $subdirectory = $directory.DIRECTORY_SEPARATOR.'subdirectory';
+
+        mkdir($directory);
+        mkdir($subdirectory);
+        chmod($subdirectory, 0000);
+
+        $this->filesystem->chmod($directory, 0753, 0000, true);
+
+        $this->assertFilePermissions(753, $subdirectory);
+    }
+
     public function testChown()
     {
         $this->markAsSkippedIfPosixIsMissing();

Original file line number	Diff line number	Diff line change
`@@ -177,12 +177,12 @@ public function remove($files)`
`177`	`177`	`public function chmod($files, $mode, $umask = 0000, $recursive = false)`
`178`	`178`	`{`
`179`	`179`	`foreach ($this->toIterator($files) as $file) {`
`180`		`- if ($recursive && is_dir($file) && !is_link($file)) {`
`181`		`- $this->chmod(new \FilesystemIterator($file), $mode, $umask, true);`
`182`		`- }`
`183`	`180`	`if (true !== @chmod($file, $mode & ~$umask)) {`
`184`	`181`	`throw new IOException(sprintf('Failed to chmod file %s', $file));`
`185`	`182`	`}`
	`183`	`+ if ($recursive && is_dir($file) && !is_link($file)) {`
	`184`	`+ $this->chmod(new \FilesystemIterator($file), $mode, $umask, true);`
	`185`	`+ }`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`