Fixes

symfony · GuilhemN · Mar 27, 2017 · May 5, 2017 · May 5, 2017 · Jun 17, 2017
commit 24b29d9dc14b51b745cf29587b9a97c54d4fc1ea
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/...onent/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/...onent/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 change
@@ -876,6 +876,10 @@ public function getBindings()
         /**
          * Sets bindings.
          *
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            nicolas-grekas
  

      

      

      


        Jul 17, 2017


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Maybe add some explanations, eg:

Bindings map $named arguments or type-hints to values that should be injected in the matching parameters of the constructor and of setters.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            GuilhemN
  

      

      

      


        Jul 23, 2017


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I adapted a bit your proposal to:
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).

Ok for you?
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+         * 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
-          Expand Down