refactor: Leverage the tagged iterator parameter (#1328)

theofidry · web-flow · commit a1101609a2d7 · 2025-12-09T12:44:34.000Z
diff --git a/src/Bridge/Symfony/NelmioAliceBundle.php b/src/Bridge/Symfony/NelmioAliceBundle.php
@@ -15,7 +15,6 @@
 
 use Nelmio\Alice\Bridge\Symfony\DependencyInjection\Compiler\CheckBundleDependenciesPass;
 use Nelmio\Alice\Bridge\Symfony\DependencyInjection\Compiler\RegisterFakerProvidersPass;
-use Nelmio\Alice\Bridge\Symfony\DependencyInjection\Compiler\RegisterTagServicesPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -27,59 +26,5 @@ public function build(ContainerBuilder $container): void
 
         $container->addCompilerPass(new CheckBundleDependenciesPass());
         $container->addCompilerPass(new RegisterFakerProvidersPass());
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.file_parser.registry',
-                'nelmio_alice.file_parser',
-            ),
-        );
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.fixture_builder.denormalizer.flag_parser.registry',
-                'nelmio_alice.fixture_builder.denormalizer.chainable_flag_parser',
-            ),
-        );
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.fixture_builder.denormalizer.fixture.registry_denormalizer',
-                'nelmio_alice.fixture_builder.denormalizer.chainable_fixture_denormalizer',
-            ),
-        );
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.fixture_builder.denormalizer.fixture.specs.calls.simple_denormalizer',
-                'nelmio_alice.fixture_builder.denormalizer.chainable_method_flag_handler',
-            ),
-        );
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.fixture_builder.expression_language.parser.token_parser.registry',
-                'nelmio_alice.fixture_builder.expression_language.chainable_token_parser',
-            ),
-        );
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.generator.instantiator.registry',
-                'nelmio_alice.generator.instantiator.chainable_instantiator',
-            ),
-        );
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.generator.caller.registry',
-                'nelmio_alice.generator.caller.chainable_call_processor',
-            ),
-        );
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.generator.resolver.parameter.registry',
-                'nelmio_alice.generator.resolver.parameter.chainable_resolver',
-            ),
-        );
-        $container->addCompilerPass(
-            new RegisterTagServicesPass(
-                'nelmio_alice.generator.resolver.value.registry',
-                'nelmio_alice.generator.resolver.value.chainable_resolver',
-            ),
-        );
     }
 }
diff --git a/src/Bridge/Symfony/Resources/config/fixture_builder/denormalizer/fixture.php b/src/Bridge/Symfony/Resources/config/fixture_builder/denormalizer/fixture.php
@@ -65,24 +65,24 @@
         )
         ->args([
             service('nelmio_alice.fixture_builder.denormalizer.fixture.registry_denormalizer'),
-            // Injected via a compiler pass
         ]);
 
-    // Chainables
     $services
         ->set(
             'nelmio_alice.fixture_builder.denormalizer.fixture.registry_denormalizer',
             FixtureDenormalizerRegistry::class,
         )
         ->args([
             service('nelmio_alice.fixture_builder.denormalizer.flag_parser'),
+            tagged_iterator('nelmio_alice.fixture_builder.denormalizer.chainable_fixture_denormalizer'),
         ]);
 
     $services->set(
         'nelmio_alice.fixture_builder.denormalizer.fixture.chainable.null_list',
         NullListNameDenormalizer::class,
     );
 
+    // Chainables
     $services
         ->set(
             'nelmio_alice.fixture_builder.denormalizer.fixture.chainable.temporary_list',
@@ -261,6 +261,7 @@
         )
         ->args([
             service('nelmio_alice.fixture_builder.denormalizer.fixture.specs.calls.function_denormalizer'),
+            tagged_iterator('nelmio_alice.fixture_builder.denormalizer.chainable_method_flag_handler'),
         ]);
 
     $services
diff --git a/src/Bridge/Symfony/Resources/config/fixture_builder/denormalizer/flag_parser.php b/src/Bridge/Symfony/Resources/config/fixture_builder/denormalizer/flag_parser.php
@@ -38,11 +38,14 @@
             service('nelmio_alice.fixture_builder.denormalizer.flag_parser.registry'),
         ]);
 
-    $services->set(
-        'nelmio_alice.fixture_builder.denormalizer.flag_parser.registry',
-        FlagParserRegistry::class,
-        // Arguments injected via a compiler pass
-    );
+    $services
+        ->set(
+            'nelmio_alice.fixture_builder.denormalizer.flag_parser.registry',
+            FlagParserRegistry::class,
+        )
+        ->args([
+            tagged_iterator('nelmio_alice.fixture_builder.denormalizer.chainable_flag_parser'),
+        ]);
 
     // Chainables
     $services
diff --git a/src/Bridge/Symfony/Resources/config/fixture_builder/expression_language/token_parser.php b/src/Bridge/Symfony/Resources/config/fixture_builder/expression_language/token_parser.php
@@ -42,11 +42,14 @@
         'nelmio_alice.fixture_builder.expression_language.parser.token_parser.registry',
     );
 
-    $services->set(
-        'nelmio_alice.fixture_builder.expression_language.parser.token_parser.registry',
-        TokenParserRegistry::class,
-        // Arguments injected via compiler pass
-    );
+    $services
+        ->set(
+            'nelmio_alice.fixture_builder.expression_language.parser.token_parser.registry',
+            TokenParserRegistry::class,
+        )
+        ->args([
+            tagged_iterator('nelmio_alice.fixture_builder.expression_language.chainable_token_parser'),
+        ]);
 
     $services->set(
         'nelmio_alice.fixture_builder.expression_language.parser.token_parser.chainable.argument_escaper',
diff --git a/src/Bridge/Symfony/Resources/config/generator/caller.php b/src/Bridge/Symfony/Resources/config/generator/caller.php
@@ -39,11 +39,14 @@
             service('nelmio_alice.generator.named_arguments_resolver'),
         ]);
 
-    $services->set(
-        'nelmio_alice.generator.caller.registry',
-        CallProcessorRegistry::class,
-        // Injected via a compiler pass
-    );
+    $services
+        ->set(
+            'nelmio_alice.generator.caller.registry',
+            CallProcessorRegistry::class,
+        )
+        ->args([
+            tagged_iterator('nelmio_alice.generator.caller.chainable_call_processor'),
+        ]);
 
     // Chainables
     $services
diff --git a/src/Bridge/Symfony/Resources/config/generator/instantiator.php b/src/Bridge/Symfony/Resources/config/generator/instantiator.php
@@ -47,11 +47,14 @@
             service('nelmio_alice.generator.instantiator.registry'),
         ]);
 
-    $services->set(
-        'nelmio_alice.generator.instantiator.registry',
-        InstantiatorRegistry::class,
-        // Injected via a compiler pass
-    );
+    $services
+        ->set(
+            'nelmio_alice.generator.instantiator.registry',
+            InstantiatorRegistry::class,
+        )
+        ->args([
+            tagged_iterator('nelmio_alice.generator.instantiator.chainable_instantiator'),
+        ]);
 
     // Chainables
     $services
diff --git a/src/Bridge/Symfony/Resources/config/generator/resolver/parameter.php b/src/Bridge/Symfony/Resources/config/generator/resolver/parameter.php
@@ -47,11 +47,14 @@
             service('nelmio_alice.generator.resolver.parameter.registry'),
         ]);
 
-    $services->set(
-        'nelmio_alice.generator.resolver.parameter.registry',
-        ParameterResolverRegistry::class,
-        // Arguments injected via a compiler pass
-    );
+    $services
+        ->set(
+            'nelmio_alice.generator.resolver.parameter.registry',
+            ParameterResolverRegistry::class,
+        )
+        ->args([
+            tagged_iterator('nelmio_alice.generator.resolver.parameter.chainable_resolver'),
+        ]);
 
     // Chainables
     $services
diff --git a/src/Bridge/Symfony/Resources/config/generator/resolver/value.php b/src/Bridge/Symfony/Resources/config/generator/resolver/value.php
@@ -42,11 +42,14 @@
         'nelmio_alice.generator.resolver.value.registry',
     );
 
-    $services->set(
-        'nelmio_alice.generator.resolver.value.registry',
-        ValueResolverRegistry::class,
-        // Injected via a compiler pass
-    );
+    $services
+        ->set(
+            'nelmio_alice.generator.resolver.value.registry',
+            ValueResolverRegistry::class,
+        )
+        ->args([
+            tagged_iterator('nelmio_alice.generator.resolver.value.chainable_resolver'),
+        ]);
 
     $services->set(
         'nelmio_alice.generator.resolver.value.unique_values_pool',
diff --git a/src/Bridge/Symfony/Resources/config/parser.php b/src/Bridge/Symfony/Resources/config/parser.php
@@ -56,11 +56,14 @@
             service('nelmio_alice.file_locator'),
         ]);
 
-    $services->set(
-        'nelmio_alice.file_parser.registry',
-        ParserRegistry::class,
-        // Injected via compiler pass
-    );
+    $services
+        ->set(
+            'nelmio_alice.file_parser.registry',
+            ParserRegistry::class,
+        )
+        ->args([
+            tagged_iterator('nelmio_alice.file_parser'),
+        ]);
 
     // Chainables
     $services
diff --git a/src/FixtureBuilder/Denormalizer/Fixture/FixtureDenormalizerRegistry.php b/src/FixtureBuilder/Denormalizer/Fixture/FixtureDenormalizerRegistry.php
@@ -31,9 +31,9 @@ final class FixtureDenormalizerRegistry implements FixtureDenormalizerInterface
     private $denormalizers = [];
 
     /**
-     * @param ChainableFixtureDenormalizerInterface[] $denormalizers
+     * @param iterable<ChainableFixtureDenormalizerInterface> $denormalizers
      */
-    public function __construct(FlagParserInterface $flagParser, array $denormalizers)
+    public function __construct(FlagParserInterface $flagParser, iterable $denormalizers)
     {
         foreach ($denormalizers as $index => $denormalizer) {
             if (false === $denormalizer instanceof ChainableFixtureDenormalizerInterface) {
diff --git a/src/FixtureBuilder/Denormalizer/Fixture/SpecificationBagDenormalizer/Calls/CallsWithFlagsDenormalizer.php b/src/FixtureBuilder/Denormalizer/Fixture/SpecificationBagDenormalizer/Calls/CallsWithFlagsDenormalizer.php
@@ -35,9 +35,9 @@ final class CallsWithFlagsDenormalizer implements CallsDenormalizerInterface
     private $methodFlagHandlers;
 
     /**
-     * @param MethodFlagHandler[] $methodFlagHandlers
+     * @param iterable<MethodFlagHandler> $methodFlagHandlers
      */
-    public function __construct(CallsDenormalizerInterface $callsDenormalizer, array $methodFlagHandlers)
+    public function __construct(CallsDenormalizerInterface $callsDenormalizer, iterable $methodFlagHandlers)
     {
         $this->callsDenormalizer = $callsDenormalizer;
         $this->methodFlagHandlers = (static fn (MethodFlagHandler ...$handlers) => $handlers)(...$methodFlagHandlers);
diff --git a/src/FixtureBuilder/Denormalizer/FlagParser/FlagParserRegistry.php b/src/FixtureBuilder/Denormalizer/FlagParser/FlagParserRegistry.php
@@ -31,9 +31,9 @@ final class FlagParserRegistry implements FlagParserInterface
     private $parsers;
 
     /**
-     * @param ChainableFlagParserInterface[] $parsers
+     * @param iterable<ChainableFlagParserInterface> $parsers
      */
-    public function __construct(array $parsers)
+    public function __construct(iterable $parsers)
     {
         $this->parsers = (
             static fn (ChainableFlagParserInterface ...$parsers) => $parsers
diff --git a/src/FixtureBuilder/ExpressionLanguage/Parser/TokenParser/TokenParserRegistry.php b/src/FixtureBuilder/ExpressionLanguage/Parser/TokenParser/TokenParserRegistry.php
@@ -34,9 +34,9 @@ final class TokenParserRegistry implements TokenParserInterface, ParserAwareInte
     private $parsers;
 
     /**
-     * @param ChainableTokenParserInterface[] $parsers
+     * @param iterable<ChainableTokenParserInterface> $parsers
      */
-    public function __construct(array $parsers)
+    public function __construct(iterable $parsers)
     {
         $this->parsers = (
             static fn (ChainableTokenParserInterface ...$parsers) => $parsers
diff --git a/src/Generator/Caller/CallProcessorRegistry.php b/src/Generator/Caller/CallProcessorRegistry.php
@@ -29,7 +29,10 @@ final class CallProcessorRegistry implements CallProcessorInterface
      */
     private $processors = [];
 
-    public function __construct(array $processors)
+    /**
+     * @param iterable<ChainableCallProcessorInterface> $processors
+     */
+    public function __construct(iterable $processors)
     {
         $processors = (static fn (ChainableCallProcessorInterface ...$processors) => $processors)(...$processors);
 
diff --git a/src/Generator/Instantiator/InstantiatorRegistry.php b/src/Generator/Instantiator/InstantiatorRegistry.php
@@ -32,9 +32,9 @@ final class InstantiatorRegistry implements InstantiatorInterface, ValueResolver
     private $instantiators;
 
     /**
-     * @param ChainableInstantiatorInterface[] $instantiators
+     * @param iterable<ChainableInstantiatorInterface> $instantiators
      */
-    public function __construct(array $instantiators)
+    public function __construct(iterable $instantiators)
     {
         $this->instantiators = (
             static fn (ChainableInstantiatorInterface ...$instantiators) => $instantiators
diff --git a/src/Generator/Resolver/Parameter/ParameterResolverRegistry.php b/src/Generator/Resolver/Parameter/ParameterResolverRegistry.php
@@ -33,21 +33,25 @@ final class ParameterResolverRegistry implements ParameterResolverInterface
     private $resolvers;
 
     /**
-     * @param ChainableParameterResolverInterface[] $resolvers
+     * @param iterable<ChainableParameterResolverInterface> $resolvers
      */
-    public function __construct(array $resolvers)
+    public function __construct(iterable $resolvers)
     {
+        $indexedResolvers = [];
+
         foreach ($resolvers as $index => $resolver) {
             if (false === $resolver instanceof ChainableParameterResolverInterface) {
                 throw TypeErrorFactory::createForInvalidChainableParameterResolver($resolver);
             }
 
             if ($resolver instanceof ParameterResolverAwareInterface) {
-                $resolvers[$index] = $resolver->withResolver($this);
+                $indexedResolvers[$index] = $resolver->withResolver($this);
+            } else {
+                $indexedResolvers[$index] = $resolver;
             }
         }
 
-        $this->resolvers = $resolvers;
+        $this->resolvers = $indexedResolvers;
     }
 
     public function resolve(
diff --git a/src/Generator/Resolver/Value/ValueResolverRegistry.php b/src/Generator/Resolver/Value/ValueResolverRegistry.php
@@ -36,9 +36,9 @@ final class ValueResolverRegistry implements ValueResolverInterface, ObjectGener
     private $resolvers;
 
     /**
-     * @param ChainableValueResolverInterface[] $resolvers
+     * @param iterable<ChainableValueResolverInterface> $resolvers
      */
-    public function __construct(array $resolvers, ?ObjectGeneratorInterface $generator = null)
+    public function __construct(iterable $resolvers, ?ObjectGeneratorInterface $generator = null)
     {
         $this->resolvers = (
             function (?ObjectGeneratorInterface $generator = null, ChainableValueResolverInterface ...$resolvers) {
diff --git a/src/Parser/ParserRegistry.php b/src/Parser/ParserRegistry.php
@@ -27,9 +27,9 @@ final class ParserRegistry implements ParserInterface
     private $parsers;
 
     /**
-     * @param ChainableParserInterface[] $parsers
+     * @param iterable<ChainableParserInterface> $parsers
      */
-    public function __construct(array $parsers)
+    public function __construct(iterable $parsers)
     {
         $this->parsers = (static fn (ChainableParserInterface ...$parsers) => $parsers)(...$parsers);
     }
