Merge branch 'rowhel95-rowhel95-patch-1'

matthiasmullie · Mar 24, 2022 · acaee1b · acaee1b
2 parents dfae066 + 6fbbb74
commit acaee1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/CSS.php b/src/CSS.php
@@ -740,7 +740,7 @@ protected function extractCustomProperties()
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
         $this->registerPattern(
-            '/(?<=^|[;}])(--[^:;{}"\'\s]+)\s*:([^;{}]+)/m',
+            '/(?<=^|[;}])\s*(--[^:;{}"\'\s]+)\s*:([^;{}]+)/m',
             function ($match) use ($minifier) {
                 $placeholder = '--custom-'. count($minifier->extracted) . ':0';
                 $minifier->extracted[$placeholder] = $match[1] .':'. trim($match[2]);

diff --git a/tests/css/CSSTest.php b/tests/css/CSSTest.php
@@ -832,6 +832,17 @@ public function dataProvider()
             ':root{--some-var:0px}.some-class{margin-left:calc(20px + var(--some-var))}',
         );
 
+        // https://github.com/matthiasmullie/minify/issues/378
+        $tests[] = array(
+            ':root {
+  --some-var: 0px;
+}
+p {
+margin-left: calc(20px + var(--some-var));
+}',
+            ':root{--some-var:0px}p{margin-left:calc(20px + var(--some-var))}'
+        );
+
         return $tests;
     }