Merge 00a36de into 6ff0f94

zendframework · Apr 6, 2018 · 4a433c0 · 4a433c0
2 parents 6ff0f94 + 00a36de
commit 4a433c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Document/Query.php b/src/Document/Query.php
@@ -88,7 +88,7 @@ public static function cssToXpath($path)
 
         // Arbitrary attribute value contains whitespace
         $path = preg_replace_callback(
-            '/\[\S+["\'](.+)["\']\]/',
+            '/\[\S+?["\'](.+?)["\']\]/',
             function ($matches) {
                 return str_replace($matches[1], preg_replace('/\s+/', '\s', $matches[1]), $matches[0]);
             },

diff --git a/test/Document/QueryTest.php b/test/Document/QueryTest.php
@@ -172,4 +172,10 @@ public function testCanTransformWithAttributeAndDot()
         $test = Query::cssToXpath('a[@href="http://example.com"]');
         $this->assertEquals("//a[@href='http://example.com']", $test);
     }
+
+    public function testTransformNestedAttributeSelectors()
+    {
+        $test = Query::cssToXpath('select[name="foo"] option[selected="selected"]');
+        $this->assertEquals("//select[@name='foo']//option[@selected='selected']", $test);
+    }
 }