merged branch matthijsvandenbos/matthijsvandenbos/ticket_7210 (PR #7211)

fabpot · fabpot · commit af28b0c3fc4f · 2013-03-06T20:37:18.000+01:00
This PR was submitted for the 2.1 branch but it was merged into the master branch instead (closes #7211). Commits ------- 41abfd8 [DomCrawler] fixed ticket 7210 Discussion ---------- [DomCrawler] fixed ticket 7210: DomCrawler is not properly extendable | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7210 | License | MIT | Doc PR | See #7210 for a description of the argument
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -25,7 +25,7 @@ class Crawler extends \SplObjectStorage
     /**
      * @var string The current URI or the base href value
      */
-    private $uri;
+    protected $uri;
 
     /**
      * Constructor.
@@ -704,7 +704,7 @@ public static function xpathLiteral($s)
         return sprintf("concat(%s)", implode($parts, ', '));
     }
 
-    private function getNode($position)
+    protected function getNode($position)
     {
         foreach ($this as $i => $node) {
             if ($i == $position) {
@@ -717,7 +717,7 @@ private function getNode($position)
         // @codeCoverageIgnoreEnd
     }
 
-    private function sibling($node, $siblingDir = 'nextSibling')
+    protected function sibling($node, $siblingDir = 'nextSibling')
     {
         $nodes = array();
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class Crawler extends \SplObjectStorage`
`25`	`25`	`/**`
`26`	`26`	`* @var string The current URI or the base href value`
`27`	`27`	`*/`
`28`		`- private $uri;`
	`28`	`+ protected $uri;`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* Constructor.`
`@@ -704,7 +704,7 @@ public static function xpathLiteral($s)`
`704`	`704`	`return sprintf("concat(%s)", implode($parts, ', '));`
`705`	`705`	`}`
`706`	`706`
`707`		`- private function getNode($position)`
	`707`	`+ protected function getNode($position)`
`708`	`708`	`{`
`709`	`709`	`foreach ($this as $i => $node) {`
`710`	`710`	`if ($i == $position) {`
`@@ -717,7 +717,7 @@ private function getNode($position)`
`717`	`717`	`// @codeCoverageIgnoreEnd`
`718`	`718`	`}`
`719`	`719`
`720`		`- private function sibling($node, $siblingDir = 'nextSibling')`
	`720`	`+ protected function sibling($node, $siblingDir = 'nextSibling')`
`721`	`721`	`{`
`722`	`722`	`$nodes = array();`
`723`	`723`