[DependencyInjection] Option to accept excluded tags in findTaggedServiceIds

Author: GromNaN

src/Symfony/Component/DependencyInjection/CHANGELOG.md

@@ -6,6 +6,7 @@ CHANGELOG
 
  * Make `#[AsTaggedItem]` repeatable
  * Support `@>` as a shorthand for `!service_closure` in yaml files
+ * Add `ContainerBuilder::findTaggedServiceIds()` 3rd argument to return excluded services
 
 7.2
 ---

src/Symfony/Component/DependencyInjection/ContainerBuilder.php

@@ -1333,14 +1333,21 @@ private function doResolveServices(mixed $value, array &$inlineServices = [], bo
      *         }
      *     }
      *
+     * @param bool $notExcluded Whether to include or exclude services with the "container.excluded" tag
+     *
      * @return array<string, array> An array of tags with the tagged service as key, holding a list of attribute arrays
      */
-    public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false): array
+    public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false /*, bool $notExcluded = true */): array
     {
+        $notExcluded = \func_num_args() > 2 ? func_get_arg(2) : true;
+        if (!\is_bool($notExcluded)) {
+            throw new \TypeError(\sprintf('Argument 3 passed to %s() must be of the type bool, %s given.', __METHOD__, get_debug_type($notExcluded)));
+        }
+
         $this->usedTags[] = $name;
         $tags = [];
         foreach ($this->getDefinitions() as $id => $definition) {
-            if ($definition->hasTag($name) && !$definition->hasTag('container.excluded')) {
+            if ($definition->hasTag($name) && (!$notExcluded || !$definition->hasTag('container.excluded'))) {
                 if ($throwOnAbstract && $definition->isAbstract()) {
                     throw new InvalidArgumentException(\sprintf('The service "%s" tagged "%s" must not be abstract.', $id, $name));
                 }

src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

@@ -1067,6 +1067,7 @@ public function testfindTaggedServiceIds()
         $builder = new ContainerBuilder();
         $builder
             ->register('foo', 'Bar\FooClass')
+            ->setAbstract(true)
             ->addTag('foo', ['foo' => 'foo'])
             ->addTag('bar', ['bar' => 'bar'])
             ->addTag('foo', ['foofoo' => 'foofoo'])
@@ -1083,6 +1084,17 @@ public function testfindTaggedServiceIds()
             ],
         ], $builder->findTaggedServiceIds('foo'), '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
         $this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
+        $this->assertEquals([
+            'foo' => [
+                ['foo' => 'foo'],
+                ['foofoo' => 'foofoo'],
+            ],
+            'bar' => [[]],
+        ], $builder->findTaggedServiceIds('foo', false, false), '->findTaggedServiceIds() car include excluded services');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The service "foo" tagged "foo" must not be abstract.');
+        $builder->findTaggedServiceIds('foo', true);
     }
 
     public function testFindUnusedTags()