[BUGFIX] Allow comma in quoted string in selector (#1323)

Split by commas during parsing, not after.

Author: JakeQZ

CHANGELOG.md

@@ -55,6 +55,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
 
+- Parse quoted attribute selector value containing comma (#1323)
 - Allow comma in selectors (e.g. `:not(html, body)`) (#1293)
 - Set line number when `RuleSet::addRule()` called with only column number set
   (#1265)

src/RuleSet/DeclarationBlock.php

@@ -57,13 +57,18 @@ public static function parse(ParserState $oParserState, $oList = null)
         $aComments = [];
         $oResult = new DeclarationBlock($oParserState->currentLine());
         try {
+            $selectors = [];
             $selectorParts = [];
             $stringWrapperCharacter = null;
-            static $stopCharacters = ['{', '}', '\'', '"'];
+            $consumedNextCharacter = false;
+            static $stopCharacters = ['{', '}', '\'', '"', ','];
             do {
-                $selectorParts[] = $oParserState->consume(1)
-                    . $oParserState->consumeUntil($stopCharacters, false, false, $aComments);
+                if (!$consumedNextCharacter) {
+                    $selectorParts[] = $oParserState->consume(1);
+                }
+                $selectorParts[] = $oParserState->consumeUntil($stopCharacters, false, false, $aComments);
                 $nextCharacter = $oParserState->peek();
+                $consumedNextCharacter = false;
                 switch ($nextCharacter) {
                     case '\'':
                         // The fallthrough is intentional.
@@ -76,11 +81,20 @@ public static function parse(ParserState $oParserState, $oList = null)
                             }
                         }
                         break;
+                    case ',':
+                        if (!\is_string($stringWrapperCharacter)) {
+                            $selectors[] = \implode('', $selectorParts);
+                            $selectorParts = [];
+                            $oParserState->consume(1);
+                            $consumedNextCharacter = true;
+                        }
+                        break;
                 }
             } while (!\in_array($nextCharacter, ['{', '}'], true) || \is_string($stringWrapperCharacter));
-            $oResult->setSelectors(\implode('', $selectorParts), $oList);
+            $selectors[] = \implode('', $selectorParts); // add final or only selector
+            $oResult->setSelectors($selectors, $oList);
             if ($oParserState->comes('{')) {
-                $oParserState->consume(1);
+                $oPparserState->consume(1);
             }
         } catch (UnexpectedTokenException $e) {
             if ($oParserState->getSettings()->bLenientParsing) {

tests/Unit/RuleSet/DeclarationBlockTest.php

@@ -59,8 +59,8 @@ public static function provideSelector(): array
             'type & pseudo-class' => ['a:hover'],
             '`not`' => [':not(#your-mug)'],
             'pseudo-element' => ['::before'],
-            'attribute with `"`' => ['[alt="{}()[]\\"\'"]'],
-            'attribute with `\'`' => ['[alt=\'{}()[]"\\\'\']'],
+            'attribute with `"`' => ['[alt="{}()[]\\"\',"]'],
+            'attribute with `\'`' => ['[alt=\'{}()[]"\\\',\']'],
         ];
     }