Fixing a bug where instanceof was not copied into the new Definition after resolving children

weaverryan · weaverryan · commit 62029090d35b · 2017-04-06T10:56:10.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -172,6 +172,7 @@ private function doResolveDefinition(ChildDefinition $definition)
         $def->setAbstract($definition->isAbstract());
         $def->setShared($definition->isShared());
         $def->setTags($definition->getTags());
+        $def->setInstanceofConditionals($definition->getInstanceofConditionals());
 
         // append parent tags when inheriting is enabled
         if ($definition->getInheritTags()) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
@@ -364,6 +364,28 @@ public function testProcessResolvesAliases()
         $this->assertSame('ParentClass', $def->getClass());
     }
 
+    public function testProcessInstanceofConditionals()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setInstanceofConditionals(array('Foo' => (new ChildDefinition(''))->setLazy(true)))
+        ;
+
+        $conditionals = array('stdClass' => (new ChildDefinition(''))->setAutowired(true), 'Bar' => (new ChildDefinition(''))->setShared(false));
+        $container
+            ->setDefinition('child', new ChildDefinition('parent'))
+            ->setInstanceofConditionals($conditionals)
+        ;
+
+        $this->process($container);
+
+        $childDef = $container->getDefinition('child');
+        // instanceof taken directly from child, parent ignored
+        $this->assertSame($conditionals, $childDef->getInstanceofConditionals());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveDefinitionTemplatesPass();
