Handle nested pseudo-classes with expression correctly

Imangazaliev · Feb 9, 2021 · 2465282 · 2465282 · lokanaft · Feb 9, 2021
1 parent cf9200b
commit 2465282
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/DiDom/Query.php b/src/DiDom/Query.php
@@ -466,11 +466,11 @@ public static function getSegments($selector)
         $classes = '(?P<classes>\.[\w|\-|\.]+)*';
         $attrs = '(?P<attrs>(?:\[.+?\])*)?';
         $name = '(?P<pseudo>[\w\-]+)';
-        $expr = '(?:\((?P<expr>[^\)]+)\))';
-        $pseudo = '(?::'.$name.$expr.'?)?';
+        $expr = '(?:\((?P<expr>.+)\))';
+        $pseudo = '(?::' . $name . $expr . '?)?';
         $rel = '\s*(?P<rel>>)?';
 
-        $regexp = '/'.$tag.$id.$classes.$attrs.$pseudo.$rel.'/is';
+        $regexp = '/' . $tag . $id . $classes . $attrs . $pseudo . $rel . '/is';
 
         if (preg_match($regexp, $selector, $segments)) {
             if ($segments[0] === '') {

diff --git a/tests/QueryTest.php b/tests/QueryTest.php
@@ -291,6 +291,8 @@ public function compileCssTests()
 
         $compiled = array_merge($compiled, [
             ['a[title="foo, bar::baz"]', '//a[@title="foo, bar::baz"]'],
+            // nested pseudo-class with expression
+            [':not(:contains(foo))', '//*[not(self::*[contains(text(), "foo")])]'],
         ]);
 
         return $compiled;