bug symfony#24234 [DI] Fix decorated service merge in ResolveInstanceofConditionalsPass (dunglas)

fabpot · fabpot · commit 857ae7a4f6dd · 2017-09-17T08:02:32.000-07:00
This PR was merged into the 3.3 branch. Discussion ---------- [DI] Fix decorated service merge in ResolveInstanceofConditionalsPass | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | api-platform/api-platform#414, symfony#24229 | License | MIT | Doc PR | n/a Follows symfony#24229. It's [the patch](symfony#24229 (comment)) proposed by @nicolas-grekas + a test. Commits ------- 2a30908 [DI] Fix decorated service merge in ResolveInstanceofConditionalsPass
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/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/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());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition`
`119`	`119`	`$abstract`
`120`	`120`	`->setArguments(array())`
`121`	`121`	`->setMethodCalls(array())`
	`122`	`+ ->setDecoratedService(null)`
`122`	`123`	`->setTags(array())`
`123`	`124`	`->setAbstract(true);`
`124`	`125`	`}`