Adding support to bind scalar values to controller arguments

weaverryan · weaverryan · commit 2c7198cdd03e · 2018-03-23T11:48:06.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -838,7 +838,7 @@ public function setAutowired($autowired)
     /**
      * Gets bindings.
      *
-     * @return array
+     * @return array|BoundArgument[]
      */
     public function getBindings()
     {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -136,14 +136,17 @@ public function process(ContainerBuilder $container)
                         $binding = $bindings[$bindingName];
 
                         list($bindingValue, $bindingId) = $binding->getValues();
+                        $binding->setValues(array($bindingValue, $bindingId, true));
 
                         if (!$bindingValue instanceof Reference) {
-                            continue;
+                            $args[$p->name] = new Reference('value.'.$container->hash($bindingValue));
+                            $container->register((string) $args[$p->name], 'mixed')
+                                ->setFactory('current')
+                                ->addArgument(array($bindingValue));
+                        } else {
+                            $args[$p->name] = $bindingValue;
                         }
 
-                        $binding->setValues(array($bindingValue, $bindingId, true));
-                        $args[$p->name] = $bindingValue;
-
                         continue;
                     } elseif (!$type || !$autowire) {
                         continue;
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -311,7 +311,7 @@ public function provideBindings()
         return array(array(ControllerDummy::class), array('$bar'));
     }
 
-    public function testDoNotBindScalarValueToControllerArgument()
+    public function testBindScalarValueToControllerArgument()
     {
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service')->addArgument(array());
@@ -320,11 +320,24 @@ public function testDoNotBindScalarValueToControllerArgument()
             ->setBindings(array('$someArg' => '%foo%'))
             ->addTag('controller.service_arguments');
 
+        $container->setParameter('foo', 'foo_val');
+
         $pass = new RegisterControllerArgumentLocatorsPass();
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $this->assertEmpty($locator);
+
+        $locator = $container->getDefinition((string) $locator['foo::fooAction']->getValues()[0]);
+
+        // assert the locator has a someArg key
+        $arguments = $locator->getArgument(0);
+        $this->assertArrayHasKey('someArg', $arguments);
+        $this->assertInstanceOf(ServiceClosureArgument::class, $arguments['someArg']);
+        // get the Reference that someArg points to
+        $reference = $arguments['someArg']->getValues()[0];
+        // make sure this service *does* exist and returns the correct value
+        $this->assertTrue($container->has((string) $reference));
+        $this->assertSame('foo_val', $container->get((string) $reference));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -838,7 +838,7 @@ public function setAutowired($autowired)`
`838`	`838`	`/**`
`839`	`839`	`* Gets bindings.`
`840`	`840`	`*`
`841`		`- * @return array`
	`841`	`+ * @return array\|BoundArgument[]`
`842`	`842`	`*/`
`843`	`843`	`public function getBindings()`
`844`	`844`	`{`