Remove AddPreloadUrlsGeneratorPass and refactor related classes

Removed AddPreloadUrlsGeneratorPass as it is no longer needed. Updated PreloadUrlsGeneratorInterface by adding getAlias() method. Made appropriate changes in the PreloadUrlsGeneratorManager class to use this new method. This simplifies the usage and configuration of PreloadUrlsGenerator services. Removed unused compiler pass registration from SpomkyLabsPwaBundle class.

phpstan-baseline.neon

@@ -36,17 +36,17 @@ parameters:
 			path: src/CachingStrategy/FontCache.php
 
 		-
-			message: "#^Only iterables can be unpacked, mixed given in argument \\#1\\.$#"
+			message: "#^Foreach overwrites \\$generator with its value variable\\.$#"
 			count: 1
-			path: src/CachingStrategy/ResourceCaches.php
+			path: src/CachingStrategy/PreloadUrlsGeneratorManager.php
 
 		-
-			message: "#^Parameter \\#1 \\$preloadUrl of method SpomkyLabs\\\\PwaBundle\\\\CachingStrategy\\\\WorkboxCacheStrategy\\:\\:withPreloadUrl\\(\\) expects string, mixed given\\.$#"
+			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\CachingStrategy\\\\ResourceCaches\\:\\:prepareMatchCallback\\(\\) is unused\\.$#"
 			count: 1
 			path: src/CachingStrategy/ResourceCaches.php
 
 		-
-			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, mixed given\\.$#"
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 1
 			path: src/CachingStrategy/ResourceCaches.php
 

src/CachingStrategy/PreloadUrlsGeneratorInterface.php

@@ -8,6 +8,8 @@
 
 interface PreloadUrlsGeneratorInterface
 {
+    public function getAlias(): string;
+
     /**
      * @return iterable<Url|string>
      */

src/CachingStrategy/PreloadUrlsGeneratorManager.php

@@ -5,6 +5,7 @@
 namespace SpomkyLabs\PwaBundle\CachingStrategy;
 
 use InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use function array_key_exists;
 
 final class PreloadUrlsGeneratorManager
@@ -14,9 +15,22 @@ final class PreloadUrlsGeneratorManager
      */
     private array $generators = [];
 
-    public function add(string $alias, PreloadUrlsGeneratorInterface $generator): void
+    /**
+     * @param PreloadUrlsGeneratorInterface[] $generators
+     */
+    public function __construct(
+        #[TaggedIterator('spomky_labs_pwa.preload_urls_generator')]
+        iterable $generators
+    ) {
+        $this->add(...$generators);
+    }
+
+    public function add(PreloadUrlsGeneratorInterface $generator, PreloadUrlsGeneratorInterface ...$generators): void
     {
-        $this->generators[$alias] = $generator;
+        $this->generators[$generator->getAlias()] = $generator;
+        foreach ($generators as $generator) {
+            $this->generators[$generator->getAlias()] = $generator;
+        }
     }
 
     public function get(string $alias): PreloadUrlsGeneratorInterface

src/CachingStrategy/ResourceCaches.php

@@ -56,7 +56,7 @@ public function getCacheStrategies(): array
                 JsonEncode::OPTIONS => $this->jsonOptions,
             ]);
             $urls = json_decode($routes, true, 512, JSON_THROW_ON_ERROR);
-
+            dd($urls);
             $cacheName = $resourceCache->cacheName ?? sprintf('page-cache-%d', $id);
 
             $plugins = [

src/Resources/config/services.php

@@ -26,6 +26,7 @@
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Panther\Client;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
@@ -127,4 +128,7 @@
     $container->load('SpomkyLabs\\PwaBundle\\MatchCallbackHandler\\', '../../MatchCallbackHandler/*');
 
     $container->set(PreloadUrlsGeneratorManager::class);
+    $container->instanceof(UrlGeneratorInterface::class)
+        ->tag('spomky_labs_pwa.preload_urls_generator')
+    ;
 };

src/SpomkyLabsPwaBundle.php

@@ -4,7 +4,6 @@
 
 namespace SpomkyLabs\PwaBundle;
 
-use SpomkyLabs\PwaBundle\DependencyInjection\Compiler\AddPreloadUrlsGeneratorPass;
 use SpomkyLabs\PwaBundle\ImageProcessor\ImageProcessorInterface;
 use SpomkyLabs\PwaBundle\Subscriber\PwaDevServerSubscriber;
 use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
@@ -58,11 +57,6 @@ public function prependExtension(ContainerConfigurator $container, ContainerBuil
         $this->setAssetMapperPath($builder);
     }
 
-    public function build(ContainerBuilder $container): void
-    {
-        $container->addCompilerPass(new AddPreloadUrlsGeneratorPass());
-    }
-
     private function setAssetMapperPath(ContainerBuilder $builder): void
     {
         $builder->prependExtensionConfig('framework', [

tests/DummyUrlsGenerator.php

@@ -5,17 +5,21 @@
 namespace SpomkyLabs\PwaBundle\Tests;
 
 use SpomkyLabs\PwaBundle\CachingStrategy\PreloadUrlsGeneratorInterface;
+use SpomkyLabs\PwaBundle\Dto\Url;
 
 /**
  * @internal
  */
 class DummyUrlsGenerator implements PreloadUrlsGeneratorInterface
 {
+    public function getAlias(): string
+    {
+        return 'dummy';
+    }
+
     public function generateUrls(): iterable
     {
         yield '/dummy/1';
-        yield '/dummy/2';
-        yield '/dummy/3';
-        yield '/dummy/4';
+        yield Url::create('/dummy/2');
     }
 }

tests/config.php

@@ -22,9 +22,7 @@
     ;
     $container->services()
         ->set(DummyUrlsGenerator::class)
-        ->tag('spomky_labs_pwa.preload_urls_generator', [
-            'alias' => 'dummy',
-        ])
+        ->tag('spomky_labs_pwa.preload_urls_generator')
     ;
 
     $container->extension('framework', [