Parse escape quoted values

raxbg · Mar 28, 2024 · aa00e4c · aa00e4c
1 parent eda7c24
commit aa00e4c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/src/Value/CSSString.php b/src/Value/CSSString.php
@@ -15,6 +15,8 @@
  */
 class CSSString extends PrimitiveValue
 {
+    const PARSE_QUOTE_STRINGS = ['"', "'", '\"', "\'"];
+
     /**
      * @var string
      */
@@ -40,11 +42,12 @@ public function __construct($sString, $iLineNo = 0)
     public static function parse(ParserState $oParserState)
     {
         $sBegin = $oParserState->peek();
+        if ($sBegin === '\\') {
+            $sBegin = $oParserState->peek(2);
+        }
         $sQuote = null;
-        if ($sBegin === "'") {
-            $sQuote = "'";
-        } elseif ($sBegin === '"') {
-            $sQuote = '"';
+        if (in_array($sBegin, self::PARSE_QUOTE_STRINGS)) {
+            $sQuote = $sBegin;
         }
         if ($sQuote !== null) {
             $oParserState->consume($sQuote);

diff --git a/src/Value/Value.php b/src/Value/Value.php
@@ -14,6 +14,9 @@
  */
 abstract class Value implements Renderable
 {
+    const PARSE_TERMINATE_STRINGS = ['}',';','!',')', '\\'];
+    const PARSE_QUOTE_STRINGS = ['"', "'", '\"', "\'"];
+
     /**
      * @var int
      */
@@ -41,12 +44,7 @@ public static function parseValue(ParserState $oParserState, array $aListDelimit
         $aStack = [];
         $oParserState->consumeWhiteSpace();
         //Build a list of delimiters and parsed values
-        while (
-            !($oParserState->comes('}') || $oParserState->comes(';') || $oParserState->comes('!')
-                || $oParserState->comes(')')
-                || $oParserState->comes('\\')
-                || $oParserState->isEnd())
-        ) {
+        while (self::continueParsing($oParserState)) {
             if (count($aStack) > 0) {
                 $bFoundDelimiter = false;
                 foreach ($aListDelimiters as $sDelimiter) {
@@ -154,7 +152,10 @@ public static function parsePrimitiveValue(ParserState $oParserState)
             $oValue = Size::parse($oParserState);
         } elseif ($oParserState->comes('#') || $oParserState->comes('rgb', true) || $oParserState->comes('hsl', true)) {
             $oValue = Color::parse($oParserState);
-        } elseif ($oParserState->comes("'") || $oParserState->comes('"')) {
+        } elseif (
+            in_array($oParserState->peek(), self::PARSE_QUOTE_STRINGS) 
+            || in_array($oParserState->peek(2), self::PARSE_QUOTE_STRINGS)
+        ) {
             $oValue = CSSString::parse($oParserState);
         } elseif ($oParserState->comes("progid:") && $oParserState->getSettings()->bLenientParsing) {
             $oValue = self::parseMicrosoftFilter($oParserState);
@@ -209,4 +210,22 @@ public function getLineNo()
     {
         return $this->iLineNo;
     }
+
+    /**
+     * @return bool
+     *
+     * @throws UnexpectedEOFException
+     * @throws UnexpectedTokenException
+     */
+    private static function continueParsing(ParserState $oParserState)
+    {
+        if ($oParserState->isEnd()) {
+            return false;
+        }
+        $sPeekOne = $oParserState->peek();
+        if ($sPeekOne === '\\') {
+            return in_array($oParserState->peek(2), self::PARSE_QUOTE_STRINGS);
+        }
+        return !in_array($sPeekOne, self::PARSE_TERMINATE_STRINGS);
+    }
 }