[DI] Fix decorated service merge in ResolveInstanceofConditionalsPass

symfony · fabpot · Sep 17, 2017 · Sep 16, 2017 · Sep 16, 2017 · 2a30908bcd3dd6e25ee49c7db3e45bc73a6a8c3a
commit 2a30908bcd3dd6e25ee49c7db3e45bc73a6a8c3a
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -119,6 +119,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
            $abstract
                ->setArguments(array())
                ->setMethodCalls(array())
+                ->setDecoratedService(null)
                ->setTags(array())
                ->setAbstract(true);
        }

diff --git a/...ny/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/...ny/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -224,4 +224,30 @@ public function testProcessThrowsExceptionForArguments()

        (new ResolveInstanceofConditionalsPass())->process($container);
    }
+
+    public function testMergeReset()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('bar', self::class)
+            ->addArgument('a')
+            ->addMethodCall('setB')
+            ->setDecoratedService('foo')
+            ->addTag('t')
+            ->setInstanceofConditionals(array(
+                parent::class => (new ChildDefinition(''))->addTag('bar'),
+            ))
+        ;
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+
+        $abstract = $container->getDefinition('abstract.instanceof.bar');
+
+        $this->assertEmpty($abstract->getArguments());
+        $this->assertEmpty($abstract->getMethodCalls());
+        $this->assertNull($abstract->getDecoratedService());
+        $this->assertEmpty($abstract->getTags());
+        $this->assertTrue($abstract->isAbstract());
+    }
 }