Merge branch '6.0' into 6.1

* 6.0:
  [DependencyInjection] Fix "proxy" tag: resolve its parameters and pass it to child definitions
  Complete negatable options

Author: fabpot

Compiler/ResolveChildDefinitionsPass.php

@@ -188,6 +188,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;
     }
 }

Compiler/ResolveParameterPlaceHoldersPass.php

@@ -84,6 +84,11 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             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);

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();

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();