[DependencyInjection] Fixed the priority of service decoration on service with parent

hason · hason · commit d1ad43c174af · 2016-05-03T11:49:32.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -174,7 +174,7 @@ private function resolveDefinition(ContainerBuilder $container, DefinitionDecora
             if (null === $decoratedService) {
                 $def->setDecoratedService($decoratedService);
             } else {
-                $def->setDecoratedService($decoratedService[0], $decoratedService[1]);
+                $def->setDecoratedService($decoratedService[0], $decoratedService[1], $decoratedService[2]);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
@@ -276,10 +276,12 @@ public function testSetDecoratedServiceOnServiceHasParent()
         $container->register('parent', 'stdClass');
 
         $container->setDefinition('child1', new DefinitionDecorator('parent'))
-            ->setDecoratedService('foo', 'foo_inner')
+            ->setDecoratedService('foo', 'foo_inner', 5)
         ;
 
-        $this->assertEquals(array('foo', 'foo_inner', 0), $container->getDefinition('child1')->getDecoratedService());
+        $this->process($container);
+
+        $this->assertEquals(array('foo', 'foo_inner', 5), $container->getDefinition('child1')->getDecoratedService());
     }
 
     public function testDecoratedServiceCopiesDeprecatedStatusFromParent()

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private function resolveDefinition(ContainerBuilder $container, DefinitionDecora`
`174`	`174`	`if (null === $decoratedService) {`
`175`	`175`	`$def->setDecoratedService($decoratedService);`
`176`	`176`	`} else {`
`177`		`- $def->setDecoratedService($decoratedService[0], $decoratedService[1]);`
	`177`	`+ $def->setDecoratedService($decoratedService[0], $decoratedService[1], $decoratedService[2]);`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -276,10 +276,12 @@ public function testSetDecoratedServiceOnServiceHasParent()`
`276`	`276`	`$container->register('parent', 'stdClass');`
`277`	`277`
`278`	`278`	`$container->setDefinition('child1', new DefinitionDecorator('parent'))`
`279`		`- ->setDecoratedService('foo', 'foo_inner')`
	`279`	`+ ->setDecoratedService('foo', 'foo_inner', 5)`
`280`	`280`	`;`
`281`	`281`
`282`		`- $this->assertEquals(array('foo', 'foo_inner', 0), $container->getDefinition('child1')->getDecoratedService());`
	`282`	`+ $this->process($container);`
	`283`	`+`
	`284`	`+ $this->assertEquals(array('foo', 'foo_inner', 5), $container->getDefinition('child1')->getDecoratedService());`
`283`	`285`	`}`
`284`	`286`
`285`	`287`	`public function testDecoratedServiceCopiesDeprecatedStatusFromParent()`