[CssSelector] [HashParser] Added parsing support for dotted hashes

eexit · eexit · commit f78611e43b7f · 2022-06-14T22:07:24.000+02:00
diff --git a/src/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php b/src/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php
@@ -40,7 +40,7 @@ public function parse(string $source): array
         //     1 => string 'test' (length=4)
         //     2 => string 'input' (length=5)
         //     3 => string 'ab6bd_field' (length=11)
-        if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+#([\w-]++)$/i', trim($source), $matches)) {
+        if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+#([\w.-]++)$/i', trim($source), $matches)) {
             return [
                 new SelectorNode(new HashNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
             ];
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/HashParserTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Shortcut/HashParserTest.php
@@ -36,10 +36,15 @@ public function getParseTestData()
     {
         return [
             ['#testid', 'Hash[Element[*]#testid]'],
+            ['#test.id', 'Hash[Element[*]#test.id]'],
             ['testel#testid', 'Hash[Element[testel]#testid]'],
+            ['testel#test.id', 'Hash[Element[testel]#test.id]'],
             ['testns|#testid', 'Hash[Element[testns|*]#testid]'],
+            ['testns|#test.id', 'Hash[Element[testns|*]#test.id]'],
             ['testns|*#testid', 'Hash[Element[testns|*]#testid]'],
+            ['testns|*#test.id', 'Hash[Element[testns|*]#test.id]'],
             ['testns|testel#testid', 'Hash[Element[testns|testel]#testid]'],
+            ['testns|testel#test.id', 'Hash[Element[testns|testel]#test.id]'],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,15 @@ public function getParseTestData()`
`36`	`36`	`{`
`37`	`37`	`return [`
`38`	`38`	`['#testid', 'Hash[Element[*]#testid]'],`
	`39`	`+ ['#test.id', 'Hash[Element[*]#test.id]'],`
`39`	`40`	`['testel#testid', 'Hash[Element[testel]#testid]'],`
	`41`	`+ ['testel#test.id', 'Hash[Element[testel]#test.id]'],`
`40`	`42`	`['testns\|#testid', 'Hash[Element[testns\|*]#testid]'],`
	`43`	`+ ['testns\|#test.id', 'Hash[Element[testns\|*]#test.id]'],`
`41`	`44`	`['testns\|#testid', 'Hash[Element[testns\|]#testid]'],`
	`45`	`+ ['testns\|#test.id', 'Hash[Element[testns\|]#test.id]'],`
`42`	`46`	`['testns\|testel#testid', 'Hash[Element[testns\|testel]#testid]'],`
	`47`	`+ ['testns\|testel#test.id', 'Hash[Element[testns\|testel]#test.id]'],`
`43`	`48`	`];`
`44`	`49`	`}`
`45`	`50`	`}`