bug #46448 [DependencyInjection] Fix "proxy" tag: resolve its parameters and pass it to child definitions (nicolas-grekas)

fabpot · fabpot · commit dffd4e517481 · 2022-05-27T08:32:26.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection] Fix "proxy" tag: resolve its parameters and pass it to child definitions | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Forgotten in #27697 "proxy" tags are special: they must follow like the "lazy" attribute of definitions. Commits ------- 4cc3b3d [DependencyInjection] Fix "proxy" tag: resolve its parameters and pass it to child definitions
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
@@ -118,6 +118,31 @@ public function testProcessDoesNotCopyTags()
         $this->assertEquals([], $def->getTags());
     }
 
+    public function testProcessCopiesTagsProxy()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addTag('proxy', ['a' => 'b'])
+        ;
+
+        $container
+            ->setDefinition('child1', new ChildDefinition('parent'))
+        ;
+        $container
+            ->setDefinition('child2', (new ChildDefinition('parent'))->addTag('proxy', ['c' => 'd']))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child1');
+        $this->assertSame(['proxy' => [['a' => 'b']]], $def->getTags());
+
+        $def = $container->getDefinition('child2');
+        $this->assertSame(['proxy' => [['c' => 'd']]], $def->getTags());
+    }
+
     public function testProcessDoesNotCopyDecoratedService()
     {
         $container = new ContainerBuilder();
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);`