Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 58bdf84

Browse filesBrowse files
committed
Merge branch '2.4'
* 2.4: [DomCrawler] fixed wrong merge [Filesystem] fixed a test broken after merging the 2.3 branch
2 parents 3baa43b + 5808287 commit 58bdf84
Copy full SHA for 58bdf84

File tree

Expand file treeCollapse file tree

2 files changed

+2
-3
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+2
-3
lines changed
Open diff view settings
Collapse file

‎src/Symfony/Component/DomCrawler/Crawler.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Crawler.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ public function addXmlContent($content, $charset = 'UTF-8')
224224
$dom->validateOnParse = true;
225225

226226
if ('' !== trim($content)) {
227-
// remove the default namespace to make XPath expressions simpler
228-
@$dom->loadXML(str_replace('xmlns', 'ns', $content), LIBXML_NONET);
227+
@$dom->loadXML($content, LIBXML_NONET);
229228
}
230229

231230
libxml_use_internal_errors($internalErrors);
Collapse file

‎src/Symfony/Component/Filesystem/Tests/FilesystemTest.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ public function testDumpFileWithNullMode()
890890

891891
// skip mode check on Windows
892892
if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
893-
$this->assertEquals(600, $this->getFilePermissions($filename));
893+
$this->assertFilePermissions(600, $filename);
894894
}
895895
}
896896

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.