Remove chain service ID logic from tests and CallableServiceLocatorPass, and simplify constructor and tag handling.

Author: yceruto

src/CallableInvokerBundle.php

@@ -18,13 +18,11 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new CallableServiceLocatorPass(
             serviceId: 'callable_invoker.decorator_groups',
             tagName: 'callable_invoker.decorator',
-            excludeServiceIds: ['callable_invoker.decorator'],
         ));
 
         $container->addCompilerPass(new CallableServiceLocatorPass(
             serviceId: 'callable_invoker.value_resolver_groups',
             tagName: 'callable_invoker.value_resolver',
-            excludeServiceIds: ['callable_invoker.value_resolver'],
         ));
     }
 

src/DependecyInjection/Compiler/CallableServiceLocatorPass.php

@@ -13,13 +13,9 @@
 
 final readonly class CallableServiceLocatorPass implements CompilerPassInterface
 {
-    /**
-     * @param list<string> $excludeServiceIds
-     */
     public function __construct(
         private string $serviceId,
         private string $tagName,
-        private array $excludeServiceIds = [],
     ) {
     }
 
@@ -44,10 +40,6 @@ private function resolveGroups(ContainerBuilder $container): array
         $ungrouped = [];
 
         foreach ($container->findTaggedServiceIds($this->tagName) as $id => $tags) {
-            if ($this->serviceId === $id || \in_array($id, $this->excludeServiceIds, true)) {
-                continue;
-            }
-
             $ref = new Reference($id);
             $hasExplicitGroup = false;
             /** @var int|null $maxPriority */

tests/Unit/DependencyInjection/Compiler/AbstractGroupingPassTest.php

@@ -14,8 +14,6 @@
 
 abstract class AbstractGroupingPassTest extends TestCase
 {
-    abstract protected function getChainServiceId(): string;
-
     abstract protected function getLocatorServiceId(): string;
 
     abstract protected function getLocatorClass(): string;
@@ -263,7 +261,6 @@ private function getPass(): CompilerPassInterface
         return new CallableServiceLocatorPass(
             $this->getLocatorServiceId(),
             $this->getTagName(),
-            [$this->getChainServiceId()],
         );
     }
 }

tests/Unit/DependencyInjection/Compiler/FunctionDecoratorPassTest.php

@@ -7,11 +7,6 @@
 
 final class FunctionDecoratorPassTest extends AbstractGroupingPassTest
 {
-    protected function getChainServiceId(): string
-    {
-        return 'callable_invoker.decorator_chain';
-    }
-
     protected function getLocatorServiceId(): string
     {
         return 'callable_invoker.decorator_groups';

tests/Unit/DependencyInjection/Compiler/ParameterValueResolverPassTest.php

@@ -7,11 +7,6 @@
 
 final class ParameterValueResolverPassTest extends AbstractGroupingPassTest
 {
-    protected function getChainServiceId(): string
-    {
-        return 'callable_invoker.value_resolver_chain';
-    }
-
     protected function getLocatorServiceId(): string
     {
         return 'callable_invoker.value_resolver_groups';