[CssSelector] fixed CssSelector::toXPath() when the CSS selector is a…

…n empty string
symfony · Mar 11, 2012 · a827375 · a827375
1 parent 1b9b428
commit a827375
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/Symfony/Component/CssSelector/CssSelector.php b/src/Symfony/Component/CssSelector/CssSelector.php
@@ -45,6 +45,10 @@ class CssSelector
     static public function toXPath($cssExpr, $prefix = 'descendant-or-self::')
     {
         if (is_string($cssExpr)) {
+            if (!$cssExpr) {
+                return $prefix.'*';
+            }
+
             if (preg_match('#^\w+\s*$#u', $cssExpr, $match)) {
                 return $prefix.trim($match[0]);
             }

diff --git a/tests/Symfony/Tests/Component/CssSelector/CssSelectorTest.php b/tests/Symfony/Tests/Component/CssSelector/CssSelectorTest.php
@@ -17,6 +17,7 @@ class CssSelectorTest extends \PHPUnit_Framework_TestCase
 {
     public function testCsstoXPath()
     {
+        $this->assertEquals('descendant-or-self::*', CssSelector::toXPath(''));
         $this->assertEquals('descendant-or-self::h1', CssSelector::toXPath('h1'));
         $this->assertEquals("descendant-or-self::h1[@id = 'foo']", CssSelector::toXPath('h1#foo'));
         $this->assertEquals("descendant-or-self::h1[contains(concat(' ', normalize-space(@class), ' '), ' foo ')]", CssSelector::toXPath('h1.foo'));