[DependencyInjection] Fix "proxy" tag: resolve its parameters and pass it to child definitions

nicolas-grekas · nicolas-grekas · commit b197ca1c015e · 2022-05-24T17:06:10.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -187,6 +187,12 @@ private function doResolveDefinition(ChildDefinition $definition): Definition
         // and it's not legal on an instanceof
         $def->setAutoconfigured($definition->isAutoconfigured());
 
+        if (!$def->hasTag('proxy')) {
+            foreach ($parentDef->getTag('proxy') as $v) {
+                $def->addTag('proxy', $v);
+            }
+        }
+
         return $def;
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -85,6 +85,11 @@ protected function processValue($value, $isRoot = false)
             if (isset($changes['file'])) {
                 $value->setFile($this->bag->resolveValue($value->getFile()));
             }
+            $tags = $value->getTags();
+            if (isset($tags['proxy'])) {
+                $tags['proxy'] = $this->bag->resolveValue($tags['proxy']);
+                $value->setTags($tags);
+            }
         }
 
         $value = parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -99,13 +99,14 @@ public function testProcessDoesNotCopyShared()
         $this->assertTrue($def->isShared());
     }
 
-    public function testProcessDoesNotCopyTags()
+    public function testProcessDoesNotCopyTagsButProxy()
     {
         $container = new ContainerBuilder();
 
         $container
             ->register('parent')
             ->addTag('foo')
+            ->addTag('proxy')
         ;
 
         $container
@@ -115,7 +116,7 @@ public function testProcessDoesNotCopyTags()
         $this->process($container);
 
         $def = $container->getDefinition('child');
-        $this->assertEquals([], $def->getTags());
+        $this->assertSame(['proxy' => [[]]], $def->getTags());
     }
 
     public function testProcessDoesNotCopyDecoratedService()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -97,6 +97,20 @@ public function testParameterNotFoundExceptionsIsNotThrown()
         $this->assertCount(1, $definition->getErrors());
     }
 
+    public function testOnlyProxyTagIsResolved()
+    {
+        $containerBuilder = new ContainerBuilder();
+        $containerBuilder->setParameter('a_param', 'here_you_go');
+        $definition = $containerBuilder->register('def');
+        $definition->addTag('foo', ['bar' => '%a_param%']);
+        $definition->addTag('proxy', ['interface' => '%a_param%']);
+
+        $pass = new ResolveParameterPlaceHoldersPass(true, false);
+        $pass->process($containerBuilder);
+
+        $this->assertSame(['foo' => [['bar' => '%a_param%']], 'proxy' => [['interface' => 'here_you_go']]], $definition->getTags());
+    }
+
     private function createContainerBuilder(): ContainerBuilder
     {
         $containerBuilder = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,12 @@ private function doResolveDefinition(ChildDefinition $definition): Definition`
`187`	`187`	`// and it's not legal on an instanceof`
`188`	`188`	`$def->setAutoconfigured($definition->isAutoconfigured());`
`189`	`189`
	`190`	`+ if (!$def->hasTag('proxy')) {`
	`191`	`+ foreach ($parentDef->getTag('proxy') as $v) {`
	`192`	`+ $def->addTag('proxy', $v);`
	`193`	`+ }`
	`194`	`+ }`
	`195`	`+`
`190`	`196`	`return $def;`
`191`	`197`	`}`
`192`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,11 @@ protected function processValue($value, $isRoot = false)`
`85`	`85`	`if (isset($changes['file'])) {`
`86`	`86`	`$value->setFile($this->bag->resolveValue($value->getFile()));`
`87`	`87`	`}`
	`88`	`+ $tags = $value->getTags();`
	`89`	`+ if (isset($tags['proxy'])) {`
	`90`	`+ $tags['proxy'] = $this->bag->resolveValue($tags['proxy']);`
	`91`	`+ $value->setTags($tags);`
	`92`	`+ }`
`88`	`93`	`}`
`89`	`94`
`90`	`95`	`$value = parent::processValue($value, $isRoot);`
Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,14 @@ public function testProcessDoesNotCopyShared()`
`99`	`99`	`$this->assertTrue($def->isShared());`
`100`	`100`	`}`
`101`	`101`
`102`		`- public function testProcessDoesNotCopyTags()`
	`102`	`+ public function testProcessDoesNotCopyTagsButProxy()`
`103`	`103`	`{`
`104`	`104`	`$container = new ContainerBuilder();`
`105`	`105`
`106`	`106`	`$container`
`107`	`107`	`->register('parent')`
`108`	`108`	`->addTag('foo')`
	`109`	`+ ->addTag('proxy')`
`109`	`110`	`;`
`110`	`111`
`111`	`112`	`$container`
`@@ -115,7 +116,7 @@ public function testProcessDoesNotCopyTags()`
`115`	`116`	`$this->process($container);`
`116`	`117`
`117`	`118`	`$def = $container->getDefinition('child');`
`118`		`- $this->assertEquals([], $def->getTags());`
	`119`	`+ $this->assertSame(['proxy' => [[]]], $def->getTags());`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`public function testProcessDoesNotCopyDecoratedService()`