bug #24600 [HttpKernel] Don't bind scalar values to controller method arguments (yceruto)

fabpot · fabpot · commit 0ff4480e2817 · 2017-10-18T07:28:24.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] Don't bind scalar values to controller method arguments | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24555 (comment) | License | MIT | Doc PR | - See linked issue. Let's suppose we have this configuration: ```yaml services: _defaults: # ... bind: $foo: '%foobar%' ``` `$foo` was successfully bound to any controller constructor, but in another controller I have this edit action (nothing to do with the intention of bind such a parameter, but it has the same name): ```php /** * @route("/{foo}/edit") */ public function editAction(string $foo) {} ``` triggering: > Type error: Argument 1 passed to Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument::__construct() must be an instance of Symfony\Component\DependencyInjection\Reference, string given, called in /home/yceruto/github/symfony/symfony-demo/vendor/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php on line 81 or after #24582: > Invalid service locator definition: only services can be referenced, "string" found for key "foo". Inject parameter values using constructors instead. Commits ------- a1df9af don't bind scalar values to controller method arguments
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -135,6 +135,11 @@ public function process(ContainerBuilder $container)
                         $binding = $bindings[$bindingName];
 
                         list($bindingValue, $bindingId) = $binding->getValues();
+
+                        if (!$bindingValue instanceof Reference) {
+                            continue;
+                        }
+
                         $binding->setValues(array($bindingValue, $bindingId, true));
                         $args[$p->name] = $bindingValue;
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -310,6 +310,22 @@ public function provideBindings()
     {
         return array(array(ControllerDummy::class), array('$bar'));
     }
+
+    public function testDoNotBindScalarValueToControllerArgument()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+
+        $container->register('foo', ArgumentWithoutTypeController::class)
+            ->setBindings(array('$someArg' => '%foo%'))
+            ->addTag('controller.service_arguments');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertEmpty($locator);
+    }
 }
 
 class RegisterTestController
