ColorRepresentation: Support new color syntaxes

Author: jnvsor

build/kint.phar

@@ -57,7 +57,7 @@ public function parseComplete(&$var, AbstractValue $v, int $trigger): AbstractVa
 
         $trimmed = \strtolower(\trim($var));
 
-        if (!isset(ColorRepresentation::$color_map[$trimmed]) && !\preg_match('/^(?:(?:rgb|hsl)[^\\)]{6,}\\)|#[0-9a-fA-F]{3,8})$/', $trimmed)) {
+        if (!isset(ColorRepresentation::$color_map[$trimmed]) && !\preg_match('/^(?:(?:rgb|hsl)a?[^\\)]{6,}\\)|#[0-9a-f]{3,8})$/', $trimmed)) {
             return $v;
         }
 

src/Parser/ColorPlugin.php

@@ -397,6 +397,9 @@ protected function setValuesFromHex(string $hex): int
     /** @psalm-return self::COLOR_* */
     protected function setValuesFromFunction(string $value): int
     {
+        // We're not even going to attempt to support other color functions or
+        // angle values. If that's ever going to be a thing we'll depend on a
+        // color library and use php scopes for the phar file.
         if (!\preg_match('/^((?:rgb|hsl)a?)\\s*\\(([0-9\\.%,\\s\\/\\-]+)\\)$/i', $value, $match)) {
             throw new InvalidArgumentException('Couldn\'t parse color function string');
         }
@@ -419,15 +422,30 @@ protected function setValuesFromFunction(string $value): int
                 throw new InvalidArgumentException('Color functions must be one of rgb/rgba/hsl/hsla'); // @codeCoverageIgnore
         }
 
-        /** @psalm-var string $params */
-        $params = \preg_replace('/[,\\s\\/]+/', ',', \trim($match[2]));
-        $params = \explode(',', $params);
-        $params = \array_map('trim', $params);
+        \preg_match('/^\\s*([^,\\s\\/]+)([,\\s]+)((?1))((?2))((?1))(?:([,\\s\\/]+)((?1)))?\\s*$/', $match[2], $match);
+
+        if (!$match ||
+            \trim($match[2]) !== \trim($match[4]) ||
+            (isset($match[6]) && (
+                ('' === \trim($match[2]) && '/' !== \trim($match[6])) ||
+                ('' !== \trim($match[2]) && \trim($match[2]) !== \trim($match[6]))
+            ))
+        ) {
+            throw new InvalidArgumentException('Couldn\'t parse color function string');
+        }
 
-        if (\count($params) < 3 || \count($params) > 4) {
-            throw new InvalidArgumentException('Color functions must have 3 or 4 arguments');
+        $params = [
+            $match[1],
+            $match[3],
+            $match[5],
+        ];
+
+        if (isset($match[7])) {
+            $params[] = $match[7];
         }
 
+        $params = \array_map('trim', $params);
+
         foreach ($params as $i => &$color) {
             if (false !== \strpos($color, '%')) {
                 $color = (float) \str_replace('%', '', $color);

src/Value/Representation/ColorRepresentation.php

@@ -126,6 +126,14 @@ public function colorProvider()
                 0.5,
                 ColorRepresentation::COLOR_RGB,
             ],
+            'rgb alpha truncated' => [
+                'rgb(123, 45, 67, .5)',
+                123,
+                45,
+                67,
+                0.5,
+                ColorRepresentation::COLOR_RGB,
+            ],
             'rgb alpha percent' => [
                 'rgb(50%, 60%, 70%, 50%)',
                 128,
@@ -135,7 +143,7 @@ public function colorProvider()
                 ColorRepresentation::COLOR_RGB,
             ],
             'rgb alpha whitespace' => [
-                ' rgb ( 123 45 67 / 0.5 ) ',
+                ' rgb ( 123 , 45 , 67 , 0.5 ) ',
                 123,
                 45,
                 67,
@@ -166,6 +174,70 @@ public function colorProvider()
                 1.0,
                 ColorRepresentation::COLOR_RGBA,
             ],
+            'new rbg' => [
+                'rgb(123 45 67)',
+                123,
+                45,
+                67,
+                1.0,
+                ColorRepresentation::COLOR_RGB,
+            ],
+            'new rgb alpha' => [
+                'rgb(123 45 67 / 0.5)',
+                123,
+                45,
+                67,
+                0.5,
+                ColorRepresentation::COLOR_RGB,
+            ],
+            'new rgb alpha truncated' => [
+                'rgb(123 45 67 / .5)',
+                123,
+                45,
+                67,
+                0.5,
+                ColorRepresentation::COLOR_RGB,
+            ],
+            'new rgb alpha percent' => [
+                'rgb(50% 60% 70% / 50%)',
+                128,
+                153,
+                179,
+                0.5,
+                ColorRepresentation::COLOR_RGB,
+            ],
+            'new rgb alpha whitespace' => [
+                ' rgb ( 123 45 67 / 0.5 ) ',
+                123,
+                45,
+                67,
+                0.5,
+                ColorRepresentation::COLOR_RGB,
+            ],
+            'new rgb uppercase' => [
+                'RGB(1 2 3)',
+                1,
+                2,
+                3,
+                1.0,
+                ColorRepresentation::COLOR_RGB,
+            ],
+            'new rgba' => [
+                'rgba(123 45 67 / 0.5)',
+                123,
+                45,
+                67,
+                0.5,
+                ColorRepresentation::COLOR_RGBA,
+            ],
+            'new rgba without alpha' => [
+                'rgba(123 45 67)',
+                123,
+                45,
+                67,
+                1.0,
+                ColorRepresentation::COLOR_RGBA,
+            ],
             'hsl' => [
                 'hsl(120, 100%, 50%)',
                 0,
@@ -270,6 +342,8 @@ public function badColorProvider()
             'invalid hsl range' => ['hsl(0, 120%, 120%)'],
             'invalid hsl alpha range' => ['hsl(0, 0%, 0%, 2)'],
             'invalid name' => ['thatcolorbehindyoureyelids'],
+            'invalid new without /' => ['rgba(1 2 3 4%)'],
+            'invalid new mix' => ['rgb(1, 2 3)'],
         ];
     }