Using tagged_iterator for RuleCollections

phpstan-baseline.neon

@@ -2395,11 +2395,6 @@ parameters:
 			count: 1
 			path: src/Sulu/Bundle/AudienceTargetingBundle/Rule/ReferrerRule.php
 
-		-
-			message: "#^Method Sulu\\\\Bundle\\\\AudienceTargetingBundle\\\\Rule\\\\RuleCollection\\:\\:__construct\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Sulu/Bundle/AudienceTargetingBundle/Rule/RuleCollection.php
-
 		-
 			message: "#^Method Sulu\\\\Bundle\\\\AudienceTargetingBundle\\\\Rule\\\\RuleInterface\\:\\:evaluate\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1

src/Sulu/Bundle/AudienceTargetingBundle/DependencyInjection/Compiler/AddRulesPass.php

@@ -13,26 +13,15 @@
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
 
+/**
+ * @internal
+ *
+ * @deprecated
+ */
 class AddRulesPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $ruleCollection = $container->getDefinition('sulu_audience_targeting.rules_collection');
-        $taggedServices = $container->findTaggedServiceIds('sulu.audience_target_rule');
-
-        $ruleReferences = [];
-        foreach ($taggedServices as $id => $attributes) {
-            if (!isset($attributes[0]['alias'])) {
-                throw new \InvalidArgumentException(
-                    \sprintf('No "alias" specified for audience targeting rule with service ID: "%s"', $id)
-                );
-            }
-
-            $ruleReferences[$attributes[0]['alias']] = new Reference($id);
-        }
-
-        $ruleCollection->replaceArgument(0, $ruleReferences);
     }
 }

src/Sulu/Bundle/AudienceTargetingBundle/Resources/config/services.xml

@@ -72,7 +72,7 @@
         </service>
         <service id="sulu_audience_targeting.rules_collection"
                  class="Sulu\Bundle\AudienceTargetingBundle\Rule\RuleCollection">
-            <argument type="collection"></argument>
+            <argument type="tagged_iterator" tag="sulu.audience_target_rule" index-by="alias" />
         </service>
         <service id="sulu_audience_targeting.rules.locale"
                  class="Sulu\Bundle\AudienceTargetingBundle\Rule\LocaleRule">

src/Sulu/Bundle/AudienceTargetingBundle/Rule/RuleCollection.php

@@ -17,13 +17,16 @@
 class RuleCollection implements RuleCollectionInterface
 {
     /**
-     * @var RuleInterface[]
+     * @var array<string, RuleInterface>
      */
     private $rules;
 
-    public function __construct(array $rules)
+    /**
+     * @param iterable<RuleInterface> $rules
+     */
+    public function __construct(iterable $rules)
     {
-        $this->rules = $rules;
+        $this->rules = \iterator_to_array($rules);
     }
 
     public function getRule($name)

src/Sulu/Bundle/AudienceTargetingBundle/SuluAudienceTargetingBundle.php

@@ -11,7 +11,6 @@
 
 namespace Sulu\Bundle\AudienceTargetingBundle;
 
-use Sulu\Bundle\AudienceTargetingBundle\DependencyInjection\Compiler\AddRulesPass;
 use Sulu\Bundle\AudienceTargetingBundle\DependencyInjection\Compiler\DeviceDetectorCachePass;
 use Sulu\Bundle\AudienceTargetingBundle\Entity\TargetGroupConditionInterface;
 use Sulu\Bundle\AudienceTargetingBundle\Entity\TargetGroupInterface;
@@ -46,7 +45,6 @@ public function build(ContainerBuilder $container): void
             $container
         );
 
-        $container->addCompilerPass(new AddRulesPass());
         $container->addCompilerPass(new DeviceDetectorCachePass());
     }
 }

src/Sulu/Bundle/MarkupBundle/DependencyInjection/CompilerPass/TagCompilerPass.php

@@ -40,8 +40,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->findTaggedServiceIds(self::TAG_NAME) as $id => $tags) {
             foreach ($tags as $attributes) {
                 $type = $attributes[self::TYPE_ATTRIBUTE];
-                $namespace = \array_key_exists(self::NAMESPACE_ATTRIBUTE, $attributes)
-                    ? $attributes[self::NAMESPACE_ATTRIBUTE] : 'sulu';
+                $namespace = $attributes[self::NAMESPACE_ATTRIBUTE] ?? 'sulu';
                 $tag = $attributes[self::TAG_ATTRIBUTE];
 
                 if (!\array_key_exists($type, $references)) {