Merge branch 'upstream_master' into fix/expression-parsing

Author: raxbg

.github/workflows/ci.yml

@@ -53,9 +53,13 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
+          ini-values: error_reporting=E_ALL
           tools: composer:v2
           coverage: "${{ matrix.coverage }}"
 
+      - name: Show the Composer configuration
+        run: composer config --global --list
+
       - name: Cache dependencies installed with composer
         uses: actions/cache@v3
         with:
@@ -108,6 +112,9 @@ jobs:
           tools: "composer:v2, phive"
           coverage: none
 
+      - name: Show the Composer configuration
+        run: composer config --global --list
+
       - name: Cache dependencies installed with composer
         uses: actions/cache@v3
         with:

.phive/phars.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.9.4" installed="3.9.4" location="./.phive/php-cs-fixer.phar" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.13.2" installed="3.13.2" location="./.phive/php-cs-fixer.phar" copy="false"/>
   <phar name="phpcbf" version="^3.7.1" installed="3.7.1" location="./.phive/phpcbf.phar" copy="false"/>
   <phar name="phpcs" version="^3.7.1" installed="3.7.1" location="./.phive/phpcs.phar" copy="false"/>
-  <phar name="phpstan" version="^1.8.1" installed="1.8.1" location="./.phive/phpstan.phar" copy="false"/>
+  <phar name="phpstan" version="^1.9.14" installed="1.9.14" location="./.phive/phpstan.phar" copy="false"/>
 </phive>

README.md

@@ -157,7 +157,7 @@ $cssDocument = $parser->parse();
 foreach($cssDocument->getAllRuleSets() as $oRuleSet) {
     // Note that the added dash will make this remove all rules starting with
     // `font-` (like `font-size`, `font-weight`, etc.) as well as a potential
-    // `font-rule`.
+    // `font` rule.
     $oRuleSet->removeRule('font-'); 
     $oRuleSet->removeRule('cursor');
 }

src/Property/Import.php

@@ -134,4 +134,12 @@ public function setComments(array $aComments)
     {
         $this->aComments = $aComments;
     }
+
+    /**
+     * @return string
+     */
+    public function getMediaQuery()
+    {
+        return $this->sMediaQuery;
+    }
 }

src/Value/Size.php

@@ -77,9 +77,16 @@ public static function parse(ParserState $oParserState, $bIsColorComponent = fal
         if ($oParserState->comes('-')) {
             $sSize .= $oParserState->consume('-');
         }
-        while (is_numeric($oParserState->peek()) || $oParserState->comes('.')) {
+        while (is_numeric($oParserState->peek()) || $oParserState->comes('.') || $oParserState->comes('e', true)) {
             if ($oParserState->comes('.')) {
                 $sSize .= $oParserState->consume('.');
+            } elseif ($oParserState->comes('e', true)) {
+                $sLookahead = $oParserState->peek(1, 1);
+                if (is_numeric($sLookahead) || $sLookahead === '+' || $sLookahead === '-') {
+                    $sSize .= $oParserState->consume(2);
+                } else {
+                    break; // Reached the unit part of the number like "em" or "ex"
+                }
             } else {
                 $sSize .= $oParserState->consume(1);
             }

tests/ParserTest.php

@@ -1229,6 +1229,21 @@ public function largeSizeValuesInFile()
         self::assertSame($sExpected, $oDoc->render());
     }
 
+    /**
+     * @test
+     */
+    public function scientificNotationSizeValuesInFile()
+    {
+        $oDoc = $this->parsedStructureForFile(
+            'scientific-notation-numbers',
+            Settings::create()->withMultibyteSupport(false)
+        );
+        $sExpected = ''
+            . 'body {background-color: rgba(62,174,151,3041820656523200167936);'
+            . 'z-index: .030418206565232;font-size: 1em;top: 192.3478px;}';
+        self::assertSame($sExpected, $oDoc->render());
+    }
+
     /**
      * @test
      */

tests/fixtures/scientific-notation-numbers.css

@@ -0,0 +1,6 @@
+body {
+  background-color: rgba(62,174,151,3.0418206565232E+21);
+  z-index: 3.0418206565232E-2;
+  font-size: 1em;
+  top: 1.923478e2px;
+}