[DI] Fix tracking of bound arguments when using autoconfiguration

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php

@@ -90,9 +90,11 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
         }
 
         if ($parent) {
+            $bindings = $definition->getBindings();
             $abstract = $container->setDefinition('abstract.instanceof.'.$id, $definition);
 
             // cast Definition to ChildDefinition
+            $definition->setBindings(array());
             $definition = serialize($definition);
             $definition = substr_replace($definition, '53', 2, 2);
             $definition = substr_replace($definition, 'Child', 44, 0);
@@ -117,6 +119,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
 
             // reset fields with "merge" behavior
             $abstract
+                ->setBindings($bindings)
                 ->setArguments(array())
                 ->setMethodCalls(array())
                 ->setTags(array())

src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php

@@ -38,6 +38,8 @@ final protected function setParent($parent)
             $this->definition->setParent($parent);
         } elseif ($this->definition->isAutoconfigured()) {
             throw new InvalidArgumentException(sprintf('The service "%s" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.', $this->id));
+        } elseif ($this->definition->getBindings()) {
+            throw new InvalidArgumentException(sprintf('The service "%s" cannot have a "parent" and also "bind" arguments.', $this->id));
         } else {
             // cast Definition to ChildDefinition
             $definition = serialize($this->definition);

src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php

@@ -14,7 +14,6 @@
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -54,11 +53,13 @@ public function process(ContainerBuilder $container)
             $def->setPublic(true);
             $class = $def->getClass();
             $autowire = $def->isAutowired();
+            $bindings = $def->getBindings();
 
             // resolve service class, taking parent definitions into account
-            while (!$class && $def instanceof ChildDefinition) {
+            while ($def instanceof ChildDefinition) {
                 $def = $container->findDefinition($def->getParent());
-                $class = $def->getClass();
+                $class = $class ?: $def->getClass();
+                $bindings = $def->getBindings();
             }
             $class = $parameterBag->resolveValue($class);
 
@@ -111,9 +112,6 @@ public function process(ContainerBuilder $container)
                 }
             }
 
-            // not validated, they are later in ResolveBindingsPass
-            $bindings = $def->getBindings();
-
             foreach ($methods as list($r, $parameters)) {
                 /** @var \ReflectionMethod $r */