bug #28052 [HttpKernel] Fix merging bindings for controllers' locators (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 1b9baa48bd59 · 2018-07-25T10:23:09.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] Fix merging bindings for controllers' locators | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28041 | License | MIT | Doc PR | - Commits ------- 94b620e [HttpKernel] Fix merging bindings for controllers' locators
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -60,7 +60,7 @@ public function process(ContainerBuilder $container)
             while ($def instanceof ChildDefinition) {
                 $def = $container->findDefinition($def->getParent());
                 $class = $class ?: $def->getClass();
-                $bindings = $def->getBindings();
+                $bindings += $def->getBindings();
             }
             $class = $parameterBag->resolveValue($class);
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -326,6 +327,29 @@ public function testDoNotBindScalarValueToControllerArgument()
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
         $this->assertEmpty($locator);
     }
+
+    public function testBindingsOnChildDefinitions()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+
+        $container->register('parent', ArgumentWithoutTypeController::class);
+
+        $container->setDefinition('child', (new ChildDefinition('parent'))
+            ->setBindings(array('$someArg' => new Reference('parent')))
+            ->addTag('controller.service_arguments')
+        );
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertInstanceOf(ServiceClosureArgument::class, $locator['child:fooAction']);
+
+        $locator = $container->getDefinition((string) $locator['child:fooAction']->getValues()[0])->getArgument(0);
+        $this->assertInstanceOf(ServiceClosureArgument::class, $locator['someArg']);
+        $this->assertEquals(new Reference('parent'), $locator['someArg']->getValues()[0]);
+    }
 }
 
 class RegisterTestController
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -29,7 +29,7 @@
         "symfony/config": "~2.8|~3.0|~4.0",
         "symfony/console": "~2.8|~3.0|~4.0",
         "symfony/css-selector": "~2.8|~3.0|~4.0",
-        "symfony/dependency-injection": "^3.4.5|^4.0.5",
+        "symfony/dependency-injection": "^3.4.10|^4.0.10",
         "symfony/dom-crawler": "~2.8|~3.0|~4.0",
         "symfony/expression-language": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
@@ -46,7 +46,7 @@
     },
     "conflict": {
         "symfony/config": "<2.8",
-        "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4",
+        "symfony/dependency-injection": "<3.4.10|<4.0.10,>=4",
         "symfony/var-dumper": "<3.3",
         "twig/twig": "<1.34|<2.4,>=2"
     },

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function process(ContainerBuilder $container)`
`60`	`60`	`while ($def instanceof ChildDefinition) {`
`61`	`61`	`$def = $container->findDefinition($def->getParent());`
`62`	`62`	`$class = $class ?: $def->getClass();`
`63`		`- $bindings = $def->getBindings();`
	`63`	`+ $bindings += $def->getBindings();`
`64`	`64`	`}`
`65`	`65`	`$class = $parameterBag->resolveValue($class);`
`66`	`66`