[DomCrawler] Deprecated using /_root/ in XPath expressions

nicolas-grekas · nicolas-grekas · commit 197d671fc513 · 2015-10-04T15:43:12.000+02:00
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -1036,6 +1036,8 @@ private function relativize($xpath)
 
             // BC for Symfony 2.4 and lower were elements were adding in a fake _root parent
             if (0 === strpos($expression, '/_root/')) {
+                @trigger_error('XPath expressions referencing the fake root node are deprecated since version 2.8 and will be unsupported in 3.0. Please use "./" instead of "/_root/".', E_USER_DEPRECATED);
+
                 $expression = './'.substr($expression, 7);
             } elseif (0 === strpos($expression, 'self::*/')) {
                 $expression = './'.substr($expression, 8);
@@ -1196,6 +1198,6 @@ private function triggerDeprecation($methodName, $useTrace = false)
             return;
         }
 
-        @trigger_error('The '.$methodName.' method is deprecated as of 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.$methodName.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
     }
 }
diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -446,7 +446,6 @@ public function testFilterXpathComplexQueries()
 
         $this->assertCount(0, $crawler->filterXPath('/input'));
         $this->assertCount(0, $crawler->filterXPath('/body'));
-        $this->assertCount(1, $crawler->filterXPath('/_root/body'));
         $this->assertCount(1, $crawler->filterXPath('./body'));
         $this->assertCount(1, $crawler->filterXPath('.//body'));
         $this->assertCount(5, $crawler->filterXPath('.//input'));
@@ -538,11 +537,20 @@ public function testFilterXPathWithFakeRoot()
     {
         $crawler = $this->createTestCrawler();
         $this->assertCount(0, $crawler->filterXPath('.'), '->filterXPath() returns an empty result if the XPath references the fake root node');
-        $this->assertCount(0, $crawler->filterXPath('/_root'), '->filterXPath() returns an empty result if the XPath references the fake root node');
         $this->assertCount(0, $crawler->filterXPath('self::*'), '->filterXPath() returns an empty result if the XPath references the fake root node');
         $this->assertCount(0, $crawler->filterXPath('self::_root'), '->filterXPath() returns an empty result if the XPath references the fake root node');
     }
 
+    /** @group legacy */
+    public function testLegacyFilterXPathWithFakeRoot()
+    {
+        $crawler = $this->createTestCrawler();
+        $this->assertCount(0, $crawler->filterXPath('/_root'), '->filterXPath() returns an empty result if the XPath references the fake root node');
+
+        $crawler = $this->createTestCrawler()->filterXPath('//body');
+        $this->assertCount(1, $crawler->filterXPath('/_root/body'));
+    }
+
     public function testFilterXPathWithAncestorAxis()
     {
         $crawler = $this->createTestCrawler()->filterXPath('//form');

Original file line number	Diff line number	Diff line change
`@@ -1036,6 +1036,8 @@ private function relativize($xpath)`
`1036`	`1036`
`1037`	`1037`	`// BC for Symfony 2.4 and lower were elements were adding in a fake _root parent`
`1038`	`1038`	`if (0 === strpos($expression, '/_root/')) {`
	`1039`	`+ @trigger_error('XPath expressions referencing the fake root node are deprecated since version 2.8 and will be unsupported in 3.0. Please use "./" instead of "/_root/".', E_USER_DEPRECATED);`
	`1040`	`+`
`1039`	`1041`	`$expression = './'.substr($expression, 7);`
`1040`	`1042`	`} elseif (0 === strpos($expression, 'self::*/')) {`
`1041`	`1043`	`$expression = './'.substr($expression, 8);`
`@@ -1196,6 +1198,6 @@ private function triggerDeprecation($methodName, $useTrace = false)`
`1196`	`1198`	`return;`
`1197`	`1199`	`}`
`1198`	`1200`
`1199`		`- @trigger_error('The '.$methodName.' method is deprecated as of 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`1201`	`+ @trigger_error('The '.$methodName.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);`
`1200`	`1202`	`}`
`1201`	`1203`	`}`