diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DomCrawler] Deprecated using /_root/ in XPath expressions

Browse Source
This commit is contained in:
Nicolas Grekas 2015-10-04 15:43:12 +02:00
parent c9e938cfea
commit 6042e86de4
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Symfony/Component/DomCrawler/Crawler.php
View File

@ -1036,6 +1036,8 @@ class Crawler extends \SplObjectStorage
// BC for Symfony 2.4 and lower were elements were adding in a fake _root parent // BC for Symfony 2.4 and lower were elements were adding in a fake _root parent
if (0 === strpos($expression, '/_root/')) { 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); $expression = './'.substr($expression, 7);
} elseif (0 === strpos($expression, 'self::*/')) { } elseif (0 === strpos($expression, 'self::*/')) {
$expression = './'.substr($expression, 8); $expression = './'.substr($expression, 8);
@ -1182,20 +1184,20 @@ class Crawler extends \SplObjectStorage
private function triggerDeprecation($methodName, $useTrace = false) private function triggerDeprecation($methodName, $useTrace = false)
{ {
$traces = array();
$caller = array();
if ($useTrace || defined('HHVM_VERSION')) { if ($useTrace || defined('HHVM_VERSION')) {
$traces = debug_backtrace(); if (PHP_VERSION_ID >= 50400) {
$caller = $traces[2]; $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
} else {
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
}
// The SplObjectStorage class performs calls to its own methods. These
// method calls must not lead to triggered deprecation notices.
if (isset($trace[2]['class']) && 'SplObjectStorage' === $trace[2]['class']) {
return;
}
} }
// The SplObjectStorage class performs calls to its own methods. These @trigger_error('The '.$methodName.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
// method calls must not lead to triggered deprecation notices.
if (isset($caller['class']) && 'SplObjectStorage' === $caller['class']) {
return;
}
@trigger_error('The '.$methodName.' method is deprecated as of 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
} }
} }

12
src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
View File

@ -446,7 +446,6 @@ EOF
$this->assertCount(0, $crawler->filterXPath('/input')); $this->assertCount(0, $crawler->filterXPath('/input'));
$this->assertCount(0, $crawler->filterXPath('/body')); $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(1, $crawler->filterXPath('.//body')); $this->assertCount(1, $crawler->filterXPath('.//body'));
$this->assertCount(5, $crawler->filterXPath('.//input')); $this->assertCount(5, $crawler->filterXPath('.//input'));
@ -538,11 +537,20 @@ EOF
{ {
$crawler = $this->createTestCrawler(); $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('.'), '->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::*'), '->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'); $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() public function testFilterXPathWithAncestorAxis()
{ {
$crawler = $this->createTestCrawler()->filterXPath('//form'); $crawler = $this->createTestCrawler()->filterXPath('//form');