Merge branch '2.4'

fabpot · fabpot · commit 58bdf842b7f0 · 2014-03-26T13:01:00.000+01:00
* 2.4:
  [DomCrawler] fixed wrong merge
  [Filesystem] fixed a test broken after merging the 2.3 branch
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);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,7 @@ public function addXmlContent($content, $charset = 'UTF-8')`
`224`	`224`	`$dom->validateOnParse = true;`
`225`	`225`
`226`	`226`	`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);`
`229`	`228`	`}`
`230`	`229`
`231`	`230`	`libxml_use_internal_errors($internalErrors);`
Original file line number	Diff line number	Diff line change
`@@ -890,7 +890,7 @@ public function testDumpFileWithNullMode()`
`890`	`890`
`891`	`891`	`// skip mode check on Windows`
`892`	`892`	`if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {`
`893`		`- $this->assertEquals(600, $this->getFilePermissions($filename));`
	`893`	`+ $this->assertFilePermissions(600, $filename);`
`894`	`894`	`}`
`895`	`895`	`}`
`896`	`896`