refactor CacheIconRegistry simply decorate IconRegistryInterface

Author: kbond

src/Icons/config/services.php

@@ -22,7 +22,7 @@
     $container->services()
         ->set('.ux_icons.cache_icon_registry', CacheIconRegistry::class)
             ->args([
-                iterator([service('.ux_icons.local_svg_icon_registry')]),
+                service('.ux_icons.local_svg_icon_registry'),
                 service('cache.system'),
             ])
             ->tag('kernel.cache_warmer')

src/Icons/src/Registry/CacheIconRegistry.php

@@ -24,41 +24,18 @@
  */
 final class CacheIconRegistry implements IconRegistryInterface, CacheWarmerInterface
 {
-    /**
-     * @param IconRegistryInterface[] $registries
-     */
-    public function __construct(private \Traversable $registries, private CacheInterface $cache)
+    public function __construct(private IconRegistryInterface $inner, private CacheInterface $cache)
     {
     }
 
-    public function get(string $name, bool $refresh = false): Icon
+    public function get(string $name): Icon
     {
-        if (!Icon::isValidName($name)) {
-            throw new IconNotFoundException(sprintf('The icon name "%s" is not valid.', $name));
-        }
-
-        return $this->cache->get(
-            sprintf('ux-icon-%s', Icon::nameToId($name)),
-            function () use ($name) {
-                foreach ($this->registries as $registry) {
-                    try {
-                        return $registry->get($name);
-                    } catch (IconNotFoundException) {
-                        // ignore
-                    }
-                }
-
-                throw new IconNotFoundException(sprintf('The icon "%s" does not exist.', $name));
-            },
-            beta: $refresh ? \INF : null,
-        );
+        return $this->fetchIcon($name);
     }
 
     public function getIterator(): \Traversable
     {
-        foreach ($this->registries as $registry) {
-            yield from $registry;
-        }
+        yield from $this->inner;
     }
 
     public function isOptional(): bool
@@ -69,9 +46,22 @@ public function isOptional(): bool
     public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         foreach ($this as $name) {
-            $this->get($name, refresh: true);
+            $this->fetchIcon($name, refresh: true);
         }
 
         return [];
     }
+
+    private function fetchIcon(string $name, bool $refresh = false): Icon
+    {
+        if (!Icon::isValidName($name)) {
+            throw new IconNotFoundException(sprintf('The icon name "%s" is not valid.', $name));
+        }
+
+        return $this->cache->get(
+            sprintf('ux-icon-%s', Icon::nameToId($name)),
+            fn () => $this->inner->get($name),
+            beta: $refresh ? \INF : null,
+        );
+    }
 }