symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+6-2Lines changed: 6 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
+61-23Lines changed: 61 additions & 23 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
+61-23Lines changed: 61 additions & 23 deletions
@@ -208,8 +208,12 @@ private function resolveDefinition(ContainerBuilder $container, DefinitionDecora
         }
 
         // merge autowiring types
-        foreach ($definition->getAutowiringTypes() as $autowiringType) {
-            $def->addAutowiringType($autowiringType);
+        $def->setAutowiringTypes($definition->getAutowiringTypes());
+
+        // if the decorated service is not abstract, remove its autowiring types so the decorator
+        // will be used for autowiring services
+        if (!$definition->isAbstract()) {
+            $definition->setAutowiringTypes(array());
         }
 
         // these attributes are always taken from the child
 
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -79,28 +78,6 @@ public function testProcessDoesNotCopyAbstract()
         $this->assertFalse($def->isAbstract());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testProcessDoesNotCopyScope()
-    {
-        $container = new ContainerBuilder();
-
-        $container
-            ->register('parent')
-            ->setScope('foo')
-        ;
-
-        $container
-            ->setDefinition('child', new DefinitionDecorator('parent'))
-        ;
-
-        $this->process($container);
-
-        $def = $container->getDefinition('child');
-        $this->assertEquals(ContainerInterface::SCOPE_CONTAINER, $def->getScope());
-    }
-
     public function testProcessDoesNotCopyShared()
     {
         $container = new ContainerBuilder();
@@ -364,6 +341,67 @@ public function testProcessMergeAutowiringTypes()
         $this->assertEquals(array('Foo', 'Bar'), $def->getAutowiringTypes());
     }
 
+    public function testDecoratedServiceLoosesAutowiringTypesIfNonAbstract()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addAutowiringType('Foo')
+        ;
+
+        $container
+            ->setDefinition('child', new DefinitionDecorator('parent'))
+            ->addAutowiringType('Bar')
+        ;
+
+        $this->process($container);
+
+        $childDef = $container->getDefinition('child');
+        $this->assertEquals(array('Foo', 'Bar'), $childDef->getAutowiringTypes());
+
+        $parentDef = $container->getDefinition('parent');
+        $this->assertSame(array(), $parentDef->getAutowiringTypes());
+    }
+
+    public function testParentServiceKeepsAutowiringTypesIfAbstract()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->addAutowiringType('Foo')
+            ->setAbstract(true)
+        ;
+
+        $container
+            ->setDefinition('child', new DefinitionDecorator('parent'))
+            ->addAutowiringType('Bar')
+        ;
+
+        $this->process($container);
+
+        $childDef = $container->getDefinition('child');
+        $this->assertEquals(array('Foo', 'Bar'), $childDef->getAutowiringTypes());
+
+        $parentDef = $container->getDefinition('parent');
+        $this->assertEquals($childDef->getAutowiringTypes(), $parentDef->getAutowiringTypes());
+    }
+
+    public function testProcessResolvesAliases()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'ParentClass');
+        $container->setAlias('parent_alias', 'parent');
+        $container->setDefinition('child', new DefinitionDecorator('parent_alias'));
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertSame('ParentClass', $def->getClass());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveDefinitionTemplatesPass();
Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,12 @@ private function resolveDefinition(ContainerBuilder $container, DefinitionDecora`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`// merge autowiring types`
`211`		`- foreach ($definition->getAutowiringTypes() as $autowiringType) {`
`212`		`- $def->addAutowiringType($autowiringType);`
	`211`	`+ $def->setAutowiringTypes($definition->getAutowiringTypes());`
	`212`	`+`
	`213`	`+ // if the decorated service is not abstract, remove its autowiring types so the decorator`
	`214`	`+ // will be used for autowiring services`
	`215`	`+ if (!$definition->isAbstract()) {`
	`216`	`+ $definition->setAutowiringTypes(array());`
`213`	`217`	`}`
`214`	`218`
`215`	`219`	`// these attributes are always taken from the child`