Merge branch 'patched-2024' into improvement/speed

Author: raxbg

composer.json

@@ -30,7 +30,7 @@
         "codacy/coverage": "^1.4.3",
         "php-parallel-lint/php-parallel-lint": "^1.4.0",
         "phpstan/extension-installer": "^1.4.1",
-        "phpstan/phpstan": "^1.11.7",
+        "phpstan/phpstan": "^1.11.6",
         "phpstan/phpstan-phpunit": "^1.4.0",
         "phpunit/phpunit": "^8.5.38",
         "rector/rector": "^1.2.0"

config/php-cs-fixer.php

@@ -41,6 +41,9 @@
 
             // function notation
             'native_function_invocation' => ['include' => ['@all']],
+            'nullable_type_declaration' => [
+                'syntax' => 'question_mark',
+            ],
             'nullable_type_declaration_for_default_null_value' => true,
 
             // import
@@ -51,7 +54,6 @@
             'combine_consecutive_unsets' => true,
             'dir_constant' => true,
             'is_null' => true,
-            'nullable_type_declaration' => true,
 
             // namespace notation
             'no_leading_namespace_whitespace' => true,

src/Value/CSSString.php

@@ -15,8 +15,6 @@
  */
 class CSSString extends PrimitiveValue
 {
-    const PARSE_QUOTE_STRINGS = ['"', "'", '\"', "\'"];
-
     /**
      * @var string
      */
@@ -40,12 +38,11 @@ public function __construct($sString, $iLineNo = 0)
     public static function parse(ParserState $oParserState): CSSString
     {
         $sBegin = $oParserState->peek();
-        if ($sBegin === '\\') {
-            $sBegin = $oParserState->peek(2);
-        }
         $sQuote = null;
-        if (in_array($sBegin, self::PARSE_QUOTE_STRINGS)) {
-            $sQuote = $sBegin;
+        if ($sBegin === "'") {
+            $sQuote = "'";
+        } elseif ($sBegin === '"') {
+            $sQuote = '"';
         }
         if ($sQuote !== null) {
             $oParserState->consume($sQuote);

src/Value/Value.php

@@ -14,9 +14,6 @@
  */
 abstract class Value implements Renderable
 {
-    const PARSE_TERMINATE_STRINGS = ['}',';','!',')', '\\'];
-    const PARSE_QUOTE_STRINGS = ['"', "'", '\"', "\'"];
-
     /**
      * @var int
      */
@@ -44,8 +41,13 @@ public static function parseValue(ParserState $oParserState, array $aListDelimit
         $aStack = [];
         $oParserState->consumeWhiteSpace();
         //Build a list of delimiters and parsed values
-        while (self::continueParsing($oParserState)) {
-            if (count($aStack) > 0) {
+        while (
+            !($oParserState->comes('}') || $oParserState->comes(';') || $oParserState->comes('!')
+                || $oParserState->comes(')')
+                || $oParserState->comes('\\')
+                || $oParserState->isEnd())
+        ) {
+            if (\count($aStack) > 0) {
                 $bFoundDelimiter = false;
                 foreach ($aListDelimiters as $sDelimiter) {
                     if ($oParserState->comes($sDelimiter)) {
@@ -154,10 +156,7 @@ 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 (
-            in_array($oParserState->peek(), self::PARSE_QUOTE_STRINGS)
-            || in_array($oParserState->peek(2), self::PARSE_QUOTE_STRINGS)
-        ) {
+        } elseif ($oParserState->comes("'") || $oParserState->comes('"')) {
             $oValue = CSSString::parse($oParserState);
         } elseif ($oParserState->comes('progid:') && $oParserState->getSettings()->bLenientParsing) {
             $oValue = self::parseMicrosoftFilter($oParserState);
@@ -219,22 +218,4 @@ 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);
-    }
 }

tests/ParserTest.php

@@ -1315,34 +1315,6 @@ public function infiniteLoopInFile(): void
         self::assertSame($sExpected, $oDoc->render());
     }
 
-    public function parseForEscapedQuotes(): void
-    {
-        $preParseCss = sprintf(
-            "%s%s%s%s%s%s%s",
-            '.fonts-first {font-family: Roboto, "Fira Mono", \"Liberation Serif\";}',
-            PHP_EOL,
-            ".font-second {font-family: Roboto, 'Fira Mono', \'Liberation Serif\';}",
-            PHP_EOL,
-            '.bgpic-first {background-image: url(\"pic.webp\");}',
-            PHP_EOL,
-            ".bgpic-second {background-image: url(\'pic.webp\');}"
-        );
-        $expectedCss = sprintf(
-            "%s%s%s%s%s%s%s",
-            '.fonts-first {font-family: Roboto,"Fira Mono","Liberation Serif";}',
-            PHP_EOL,
-            '.font-second {font-family: Roboto,"Fira Mono","Liberation Serif";}',
-            PHP_EOL,
-            '.bgpic-first {background-image: url("pic.webp");}',
-            PHP_EOL,
-            '.bgpic-second {background-image: url("pic.webp");}'
-        );
-        $parser = new Parser($preParseCss);
-        $document = $parser->parse();
-        $postParseCss = $document->render();
-        self::assertEquals($expectedCss, $postParseCss);
-    }
-
     public function escapedSpecialCaseTokens(): void
     {
         $oDoc = $this->parsedStructureForFile('escaped-tokens');