Merge branch 'hotfix/23'

Close #23

CHANGELOG.md

@@ -34,6 +34,10 @@ All notable changes to this project will be documented in this file, in reverse
   tokenizer marks multiple words within attribute values in order to be
   more robust.
 
+- [#23](https://github.com/zendframework/zend-dom/pull/23) fixes an issue with
+  how descendant selectors work, ensuring spaces may be used around the `>`
+  operator.
+
 ## 2.7.0 - 2018-03-27
 
 ### Added

src/Document/Query.php

@@ -100,7 +100,7 @@ function ($matches) use ($placeholder) {
         );
 
         $paths    = ['//'];
-        $path     = preg_replace('|\s+>\s+|', '>', $path);
+        $path     = preg_replace('|\s*>\s*|', '>', $path);
         $segments = preg_split('/\s+/', $path);
         $segments = str_replace($placeholder, ' ', $segments);
 

test/Document/QueryTest.php

@@ -134,13 +134,26 @@ public function testShouldAllowMatchingOfAttributeValues()
         $this->assertEquals("//tag[@id='id']//@attribute", $test);
     }
 
+    public function descendantSelector()
+    {
+        yield 'space before' => ['child >leaf'];
+        yield 'space after' => ['child> leaf'];
+        yield 'no spaces' => ['child>leaf'];
+        yield 'with spaces' => ['child > leaf'];
+        yield 'more spaces' => ['child   >   leaf'];
+    }
+
     /**
      * @group ZF-8006
+     *
+     * @dataProvider descendantSelector
+     *
+     * @param string $path
      */
-    public function testShouldAllowWhitespaceInDescendantSelectorExpressions()
+    public function testShouldAllowWhitespaceInDescendantSelectorExpressions($path)
     {
-        $test = Query::cssToXpath('child > leaf');
-        $this->assertEquals("//child/leaf", $test);
+        $test = Query::cssToXpath($path);
+        $this->assertEquals('//child/leaf', $test);
     }
 
     /**