feature #37793 Revert "[DependencyInjection] Resolve parameters in tag arguments" (rpkamp)

fabpot · fabpot · commit a06e564607f3 · 2020-08-10T19:54:09.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- Revert "[DependencyInjection] Resolve parameters in tag arguments" | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | #35337 | License | MIT | Doc PR | N/A Revert of earlier PR, see discussion #37243 Commits ------- 9731451 Revert "[DependencyInjection] Resolve parameters in tag arguments"
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -6,7 +6,6 @@ CHANGELOG
 
  * added `param()` and `abstract_arg()` in the PHP-DSL
  * deprecated `Definition::setPrivate()` and `Alias::setPrivate()`, use `setPublic()` instead
- * added support for parameters in service tag arguments
 
 5.1.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1250,7 +1250,7 @@ public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false
                 if ($throwOnAbstract && $definition->isAbstract()) {
                     throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must not be abstract.', $id, $name));
                 }
-                $tags[$id] = $this->parameterBag->resolveValue($definition->getTag($name));
+                $tags[$id] = $definition->getTag($name);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -911,22 +911,6 @@ public function testfindTaggedServiceIds()
         $this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
     }
 
-    public function testResolveTagAttributtes()
-    {
-        $builder = new ContainerBuilder();
-        $builder->getParameterBag()->add(['foo_argument' => 'foo']);
-
-        $builder
-            ->register('foo', 'Bar\FooClass')
-            ->addTag('foo', ['foo' => '%foo_argument%'])
-        ;
-        $this->assertEquals($builder->findTaggedServiceIds('foo'), [
-            'foo' => [
-                ['foo' => 'foo'],
-            ],
-        ], '->findTaggedServiceIds() replaces parameters in tag attributes');
-    }
-
     public function testFindUnusedTags()
     {
         $builder = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -1250,7 +1250,7 @@ public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false`
`1250`	`1250`	`if ($throwOnAbstract && $definition->isAbstract()) {`
`1251`	`1251`	`throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must not be abstract.', $id, $name));`
`1252`	`1252`	`}`
`1253`		`- $tags[$id] = $this->parameterBag->resolveValue($definition->getTag($name));`
	`1253`	`+ $tags[$id] = $definition->getTag($name);`
`1254`	`1254`	`}`
`1255`	`1255`	`}`
`1256`	`1256`