Fix merge

nicolas-grekas · nicolas-grekas · commit 6755f874760d · 2015-12-22T11:27:42.000+01:00
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -496,7 +496,7 @@ public function testChmodChangesZeroModeOnSubdirectoriesOnRecursive()
 
         $this->filesystem->chmod($directory, 0753, 0000, true);
 
-        $this->assertEquals(753, $this->getFilePermissions($subdirectory));
+        $this->assertFilePermissions(753, $subdirectory);
     }
 
     public function testChown()

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ public function testChmodChangesZeroModeOnSubdirectoriesOnRecursive()`
`496`	`496`
`497`	`497`	`$this->filesystem->chmod($directory, 0753, 0000, true);`
`498`	`498`
`499`		`- $this->assertEquals(753, $this->getFilePermissions($subdirectory));`
	`499`	`+ $this->assertFilePermissions(753, $subdirectory);`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`public function testChown()`