[CssSelector] Fixed Issue for XPathExprOr: missing prefix in string conversion

pscheit · pscheit · commit 63e2a993ebeb · 2011-11-28T22:00:26.000+01:00
diff --git a/src/Symfony/Component/CssSelector/XPathExprOr.php b/src/Symfony/Component/CssSelector/XPathExprOr.php
@@ -42,7 +42,7 @@ public function __construct($items, $prefix = null)
      */
     public function __toString()
     {
-        $prefix = $this->prefix;
+        $prefix = $this->getPrefix();
 
         $tmp = array();
         foreach ($this->items as $i) {
diff --git a/tests/Symfony/Tests/Component/CssSelector/Node/OrNodeTest.php b/tests/Symfony/Tests/Component/CssSelector/Node/OrNodeTest.php
@@ -26,4 +26,18 @@ public function testToXpath()
 
         $this->assertEquals("h1 | h2 | h3", (string) $or->toXpath(), '->toXpath() returns the xpath representation of the node');
     }
+    
+    public function testIssueMissingPrefix()
+    {
+        // h1, h2, h3
+        $element1 = new ElementNode('*', 'h1');
+        $element2 = new ElementNode('*', 'h2');
+        $element3 = new ElementNode('*', 'h3');
+        $or = new OrNode(array($element1, $element2, $element3));
+        
+        $xPath = $or->toXPath();
+        $xPath->addPrefix('descendant-or-self::');
+
+        $this->assertEquals("descendant-or-self::h1 | descendant-or-self::h2 | descendant-or-self::h3", (string) $xPath);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct($items, $prefix = null)`
`42`	`42`	`*/`
`43`	`43`	`public function __toString()`
`44`	`44`	`{`
`45`		`- $prefix = $this->prefix;`
	`45`	`+ $prefix = $this->getPrefix();`
`46`	`46`
`47`	`47`	`$tmp = array();`
`48`	`48`	`foreach ($this->items as $i) {`