Merge branch '2.4'

* 2.4: [DomCrawler] fixed wrong merge [Filesystem] fixed a test broken after merging the 2.3 branch
symfony · Mar 26, 2014 · 58bdf84 · 58bdf84
2 parents 3baa43b + 5808287
commit 58bdf84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -224,8 +224,7 @@ public function addXmlContent($content, $charset = 'UTF-8')
         $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);

diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/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);
         }
     }