bug #49867 [DependencyInjection] Filter "container.excluded" services when using findTaggedServiceIds() (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 3b9fa3c731c8 · 2023-03-30T11:39:43.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [DependencyInjection] Filter "container.excluded" services when using `findTaggedServiceIds()` | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - As spotted by `@stof` in #49850 (comment) Commits ------- cf3d67e [DependencyInjection] Filter "container.excluded" services when using `findTaggedServiceIds()`
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1212,7 +1212,7 @@ public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false
         $this->usedTags[] = $name;
         $tags = [];
         foreach ($this->getDefinitions() as $id => $definition) {
-            if ($definition->hasTag($name)) {
+            if ($definition->hasTag($name) && !$definition->hasTag('container.excluded')) {
                 if ($throwOnAbstract && $definition->isAbstract()) {
                     throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must not be abstract.', $id, $name));
                 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -928,6 +928,11 @@ public function testfindTaggedServiceIds()
             ->addTag('bar', ['bar' => 'bar'])
             ->addTag('foo', ['foofoo' => 'foofoo'])
         ;
+        $builder
+            ->register('bar', 'Bar\FooClass')
+            ->addTag('foo')
+            ->addTag('container.excluded')
+        ;
         $this->assertEquals([
             'foo' => [
                 ['foo' => 'foo'],

Original file line number	Diff line number	Diff line change
`@@ -1212,7 +1212,7 @@ public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false`
`1212`	`1212`	`$this->usedTags[] = $name;`
`1213`	`1213`	`$tags = [];`
`1214`	`1214`	`foreach ($this->getDefinitions() as $id => $definition) {`
`1215`		`- if ($definition->hasTag($name)) {`
	`1215`	`+ if ($definition->hasTag($name) && !$definition->hasTag('container.excluded')) {`
`1216`	`1216`	`if ($throwOnAbstract && $definition->isAbstract()) {`
`1217`	`1217`	`throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must not be abstract.', $id, $name));`
`1218`	`1218`	`}`