Fixes

GuilhemN · GuilhemN · commit 24b29d9dc14b · 2017-07-23T14:47:55.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
@@ -16,7 +16,7 @@
  */
 final class BoundArgument implements ArgumentInterface
 {
-    private static $count = 0;
+    private static $sequence = 0;
 
     private $value;
     private $identifier;
@@ -25,7 +25,7 @@ final class BoundArgument implements ArgumentInterface
     public function __construct($value)
     {
         $this->value = $value;
-        $this->identifier = ++self::$count;
+        $this->identifier = ++self::$sequence;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
@@ -69,9 +69,7 @@ protected function processValue($value, $isRoot = false)
                 }
 
                 foreach ($parameters as $j => $p) {
-                    $typeHint = ProxyHelper::getTypeHint($r, $p, true);
-
-                    if ($typeHint === $key) {
+                    if (ProxyHelper::getTypeHint($r, $p, true) === $key) {
                         $resolvedArguments[$j] = $argument;
 
                         continue 2;
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -876,6 +876,10 @@ public function getBindings()
     /**
      * Sets bindings.
      *
+     * Bindings map $named or FQCN arguments to values that should be
+     * injected in the matching parameters (of the constructor, of methods
+     * called and of controller actions).
+     *
      * @param array $bindings
      *
      * @return $this
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -166,9 +166,7 @@ private function getServiceDefaults(\DOMDocument $xml, $file)
         }
         $defaults = array(
             'tags' => $this->getChildren($defaultsNode, 'tag'),
-            'bind' => array_map(function ($v) {
-                return new BoundArgument($v);
-            }, $this->getArgumentsAsPhp($defaultsNode, 'bind', $file)),
+            'bind' => array_map(function ($v) { return new BoundArgument($v); }, $this->getArgumentsAsPhp($defaultsNode, 'bind', $file)),
         );
 
         foreach ($defaults['tags'] as $tag) {
@@ -358,6 +356,8 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
 
         $bindings = $this->getArgumentsAsPhp($service, 'bind', $file);
         if (isset($defaults['bind'])) {
+            // deep clone, to avoid multiple process of the same instance in the
+            // passes
             $bindings = array_merge(unserialize(serialize($defaults['bind'])), $bindings);
         }
         if ($bindings) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -294,9 +294,7 @@ private function parseDefaults(array &$content, $file)
                 throw new InvalidArgumentException(sprintf('Parameter "bind" in "_defaults" must be an array in %s. Check your YAML syntax.', $file));
             }
 
-            $defaults['bind'] = array_map(function ($v) {
-                return new BoundArgument($v);
-            }, $this->resolveServices($defaults['bind'], $file));
+            $defaults['bind'] = array_map(function ($v) { return new BoundArgument($v); }, $this->resolveServices($defaults['bind'], $file));
         }
 
         return $defaults;
@@ -537,7 +535,10 @@ private function parseDefinition($id, $service, $file, array $defaults)
         }
 
         if (isset($defaults['bind']) || isset($service['bind'])) {
+            // deep clone, to avoid multiple process of the same instance in the
+            // passes
             $bindings = isset($defaults['bind']) ? unserialize(serialize($defaults['bind'])) : array();
+
             if (isset($service['bind'])) {
                 if (!is_array($service['bind'])) {
                     throw new InvalidArgumentException(sprintf('Parameter "bind" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -269,15 +269,15 @@ public function testArgumentWithNoTypeHintIsOk()
     }
 
     /**
-     * @dataProvider argumentNameProvider
+     * @dataProvider provideBindings
      */
-    public function testBindings($argumentName)
+    public function testBindings($bindingName)
     {
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service')->addArgument(array());
 
         $container->register('foo', RegisterTestController::class)
-            ->setBindings(array($argumentName => new Reference('foo')))
+            ->setBindings(array($bindingName => new Reference('foo')))
             ->addTag('controller.service_arguments');
 
         $pass = new RegisterControllerArgumentLocatorsPass();
@@ -291,7 +291,7 @@ public function testBindings($argumentName)
         $this->assertEquals($expected, $locator->getArgument(0));
     }
 
-    public function argumentNameProvider()
+    public function provideBindings()
     {
         return array(array(ControllerDummy::class), array('$bar'));
     }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`final class BoundArgument implements ArgumentInterface`
`18`	`18`	`{`
`19`		`- private static $count = 0;`
	`19`	`+ private static $sequence = 0;`
`20`	`20`
`21`	`21`	`private $value;`
`22`	`22`	`private $identifier;`
`@@ -25,7 +25,7 @@ final class BoundArgument implements ArgumentInterface`
`25`	`25`	`public function __construct($value)`
`26`	`26`	`{`
`27`	`27`	`$this->value = $value;`
`28`		`- $this->identifier = ++self::$count;`
	`28`	`+ $this->identifier = ++self::$sequence;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,7 @@ protected function processValue($value, $isRoot = false)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`foreach ($parameters as $j => $p) {`
`72`		`- $typeHint = ProxyHelper::getTypeHint($r, $p, true);`
`73`		`-`
`74`		`- if ($typeHint === $key) {`
	`72`	`+ if (ProxyHelper::getTypeHint($r, $p, true) === $key) {`
`75`	`73`	`$resolvedArguments[$j] = $argument;`
`76`	`74`
`77`	`75`	`continue 2;`
Original file line number	Diff line number	Diff line change
`@@ -876,6 +876,10 @@ public function getBindings()`
`876`	`876`	`/**`
`877`	`877`	`* Sets bindings.`
`878`	`878`	`*`
	`879`	`+ * Bindings map $named or FQCN arguments to values that should be`
	`880`	`+ * injected in the matching parameters (of the constructor, of methods`
	`881`	`+ * called and of controller actions).`
	`882`	`+ *`
`879`	`883`	`* @param array $bindings`
`880`	`884`	`*`
`881`	`885`	`* @return $this`
Original file line number	Diff line number	Diff line change
`@@ -294,9 +294,7 @@ private function parseDefaults(array &$content, $file)`
`294`	`294`	`throw new InvalidArgumentException(sprintf('Parameter "bind" in "_defaults" must be an array in %s. Check your YAML syntax.', $file));`
`295`	`295`	`}`
`296`	`296`
`297`		`- $defaults['bind'] = array_map(function ($v) {`
`298`		`- return new BoundArgument($v);`
`299`		`- }, $this->resolveServices($defaults['bind'], $file));`
	`297`	`+ $defaults['bind'] = array_map(function ($v) { return new BoundArgument($v); }, $this->resolveServices($defaults['bind'], $file));`
`300`	`298`	`}`
`301`	`299`
`302`	`300`	`return $defaults;`
`@@ -537,7 +535,10 @@ private function parseDefinition($id, $service, $file, array $defaults)`
`537`	`535`	`}`
`538`	`536`
`539`	`537`	`if (isset($defaults['bind']) \|\| isset($service['bind'])) {`
	`538`	`+ // deep clone, to avoid multiple process of the same instance in the`
	`539`	`+ // passes`
`540`	`540`	`$bindings = isset($defaults['bind']) ? unserialize(serialize($defaults['bind'])) : array();`
	`541`	`+`
`541`	`542`	`if (isset($service['bind'])) {`
`542`	`543`	`if (!is_array($service['bind'])) {`
`543`	`544`	`throw new InvalidArgumentException(sprintf('Parameter "bind" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));`
Original file line number	Diff line number	Diff line change
`@@ -269,15 +269,15 @@ public function testArgumentWithNoTypeHintIsOk()`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`/**`
`272`		`- * @dataProvider argumentNameProvider`
	`272`	`+ * @dataProvider provideBindings`
`273`	`273`	`*/`
`274`		`- public function testBindings($argumentName)`
	`274`	`+ public function testBindings($bindingName)`
`275`	`275`	`{`
`276`	`276`	`$container = new ContainerBuilder();`
`277`	`277`	`$resolver = $container->register('argument_resolver.service')->addArgument(array());`
`278`	`278`
`279`	`279`	`$container->register('foo', RegisterTestController::class)`
`280`		`- ->setBindings(array($argumentName => new Reference('foo')))`
	`280`	`+ ->setBindings(array($bindingName => new Reference('foo')))`
`281`	`281`	`->addTag('controller.service_arguments');`
`282`	`282`
`283`	`283`	`$pass = new RegisterControllerArgumentLocatorsPass();`
`@@ -291,7 +291,7 @@ public function testBindings($argumentName)`
`291`	`291`	`$this->assertEquals($expected, $locator->getArgument(0));`
`292`	`292`	`}`
`293`	`293`
`294`		`- public function argumentNameProvider()`
	`294`	`+ public function provideBindings()`
`295`	`295`	`{`
`296`	`296`	`return array(array(ControllerDummy::class), array('$bar'));`
`297`	`297`	`}`