Fix icon color

Author: StevenRenaux

src/Icons/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 2.30
 
 -  Ensure compatibility with PHP 8.5
+-  Fix icon color for fill and stroke attributes
 
 ## 2.29.0
 

src/Icons/src/Icon.php

@@ -131,7 +131,7 @@ public static function fromFile(string $filename): self
     }
 
     public function __construct(
-        private readonly string $innerSvg,
+        private string $innerSvg,
         private readonly array $attributes = [],
     ) {
     }
@@ -155,6 +155,14 @@ public function toHtml(): string
                 continue;
             }
 
+            if ('fill' === $name) {
+                $this->innerSvg = str_replace('fill="currentColor"', "fill=\"{$value}\"", $this->innerSvg);
+            }
+
+            if ('stroke' === $name) {
+                $this->innerSvg = str_replace('stroke="currentColor"', "stroke=\"{$value}\"", $this->innerSvg);
+            }
+
             $value = htmlspecialchars($value, \ENT_QUOTES | \ENT_SUBSTITUTE, 'UTF-8');
             $htmlAttributes .= '="'.$value.'"';
         }

src/Icons/tests/Unit/IconTest.php

@@ -124,6 +124,15 @@ public function testWithAttributes(array $attributes, array $withAttributes, arr
         $this->assertSame($expected, $icon->getAttributes());
     }
 
+    /**
+     * @dataProvider provideRenderAttributeColorModifiers
+     */
+    public function testColorModifierWithFillAttributeSet(array $attributes, string $innerSvg, string $expected)
+    {
+        $icon = new Icon($innerSvg, $attributes);
+        $this->assertStringStartsWith($expected, $icon->toHtml());
+    }
+
     public static function provideIdToName(): iterable
     {
         yield from [
@@ -290,4 +299,23 @@ public function testSerialize()
 
         $this->assertEquals($icon, unserialize(serialize($icon)));
     }
+
+    public static function provideRenderAttributeColorModifiers(): iterable
+    {
+        yield 'it_renders_with_attribute_fill_set' => [
+            ['fill' => 'red'],
+            '<path fill="currentColor" d="M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6m2-3a2 2 0 1 1-4 0 2 2 0 0 1 4 0m4 8c0 1-1 1-1 1H3s-1 0-1-1 1-4 6-4 6 3 6 4m-1-.004c-.001-.246-.154-.986-.832-1.664C11.516 10.68 10.289 10 8 10s-3.516.68-4.168 1.332c-.678.678-.83 1.418-.832 1.664z"/>',
+            '<svg fill="red"><path fill="red" d="M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6m2-3a2 2 0 1 1-4 0 2 2 0 0 1 4 0m4 8c0 1-1 1-1 1H3s-1 0-1-1 1-4 6-4 6 3 6 4m-1-.004c-.001-.246-.154-.986-.832-1.664C11.516 10.68 10.289 10 8 10s-3.516.68-4.168 1.332c-.678.678-.83 1.418-.832 1.664z"/></svg',
+        ];
+        yield 'it_renders_with_attribute_stroke_set' => [
+            ['stroke' => 'red'],
+            '<path fill="currentColor" stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M6 4v10m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v2m6-16v2m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v10m6-16v10m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v2"/>',
+            '<svg stroke="red"><path fill="currentColor" stroke="red" stroke-linecap="round" stroke-width="2" d="M6 4v10m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v2m6-16v2m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v10m6-16v10m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v2"/></svg>',
+        ];
+        yield 'it_renders_with_attribute_stroke_and_fill_set' => [
+            ['fill' => 'red', 'stroke' => 'blue'],
+            '<path fill="currentColor" stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M6 4v10m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v2m6-16v2m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v10m6-16v10m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v2"/>',
+            '<svg fill="red" stroke="blue"><path fill="red" stroke="blue" stroke-linecap="round" stroke-width="2" d="M6 4v10m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v2m6-16v2m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v10m6-16v10m0 0a2 2 0 1 0 0 4m0-4a2 2 0 1 1 0 4m0 0v2"/></svg>',
+        ];
+    }
 }