Merge branch '2.4'
* 2.4: [DomCrawler] fixed wrong merge [Filesystem] fixed a test broken after merging the 2.3 branch
This commit is contained in:
commit
58bdf842b7
@ -224,8 +224,7 @@ class Crawler extends \SplObjectStorage
|
|||||||
$dom->validateOnParse = true;
|
$dom->validateOnParse = true;
|
||||||
|
|
||||||
if ('' !== trim($content)) {
|
if ('' !== trim($content)) {
|
||||||
// remove the default namespace to make XPath expressions simpler
|
@$dom->loadXML($content, LIBXML_NONET);
|
||||||
@$dom->loadXML(str_replace('xmlns', 'ns', $content), LIBXML_NONET);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
libxml_use_internal_errors($internalErrors);
|
libxml_use_internal_errors($internalErrors);
|
||||||
|
@ -890,7 +890,7 @@ class FilesystemTest extends FilesystemTestCase
|
|||||||
|
|
||||||
// skip mode check on Windows
|
// skip mode check on Windows
|
||||||
if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
|
if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
|
||||||
$this->assertEquals(600, $this->getFilePermissions($filename));
|
$this->assertFilePermissions(600, $filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user