Permalink
Browse files

Merge branch '2.4'

* 2.4:
  [DomCrawler] fixed wrong merge
  [Filesystem] fixed a test broken after merging the 2.3 branch
  • Loading branch information...
2 parents bc73765 + b717952 commit fe66eed49c7bbfc312978ef0f86e490127a345b2 @fabpot fabpot committed Mar 26, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 Tests/FilesystemTest.php
@@ -890,7 +890,7 @@ public function testDumpFileWithNullMode()
// skip mode check on Windows
if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
- $this->assertEquals(600, $this->getFilePermissions($filename));
+ $this->assertFilePermissions(600, $filename);
}
}

0 comments on commit fe66eed

Please sign in to comment.