diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.4'

Browse Source 
* 2.4:
  [DomCrawler] fixed wrong merge
  [Filesystem] fixed a test broken after merging the 2.3 branch
This commit is contained in:
Fabien Potencier 2014-03-26 13:01:00 +01:00
commit 58bdf842b7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/DomCrawler/Crawler.php
View File

@ -224,8 +224,7 @@ class Crawler extends \SplObjectStorage
$dom->validateOnParse = true;
if ('' !== trim($content)) {
// remove the default namespace to make XPath expressions simpler
@$dom->loadXML(str_replace('xmlns', 'ns', $content), LIBXML_NONET);
@$dom->loadXML($content, LIBXML_NONET);
}
libxml_use_internal_errors($internalErrors);

2
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
View File

@ -890,7 +890,7 @@ class FilesystemTest extends FilesystemTestCase
// skip mode check on Windows
if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
$this->assertEquals(600, $this->getFilePermissions($filename));
$this->assertFilePermissions(600, $filename);
}
}