From 5b30cb7371fafecad9c5fc6dbabfb2e64300f67f Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Wed, 27 Jan 2016 12:37:34 +0100
Subject: [PATCH] [DependencyInjection] fix merge

Remove code from bugfix that deals with features removed in Symfony 3.0.
---
 .../ResolveReferencesToAliasesPass.php         | 15 +--------------
 .../ResolveReferencesToAliasesPassTest.php     | 18 ------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index bd294e4ffc..0ec3a945b9 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -44,10 +44,6 @@ class ResolveReferencesToAliasesPass implements CompilerPassInterface
             $definition->setMethodCalls($this->processArguments($definition->getMethodCalls()));
             $definition->setProperties($this->processArguments($definition->getProperties()));
             $definition->setFactory($this->processFactory($definition->getFactory()));
-
-            if (null !== $factoryService = $definition->getFactoryService(false)) {
-                $definition->setFactoryService($this->processFactoryService($factoryService));
-            }
         }
 
         foreach ($container->getAliases() as $id => $alias) {
@@ -82,15 +78,6 @@ class ResolveReferencesToAliasesPass implements CompilerPassInterface
         return $arguments;
     }
 
-    private function processFactoryService($factoryService)
-    {
-        if (null === $factoryService) {
-            return;
-        }
-
-        return $this->getDefinitionId($factoryService);
-    }
-
     private function processFactory($factory)
     {
         if (null === $factory || !is_array($factory) || !$factory[0] instanceof Reference) {
@@ -100,7 +87,7 @@ class ResolveReferencesToAliasesPass implements CompilerPassInterface
         $defId = $this->getDefinitionId($id = (string) $factory[0]);
 
         if ($defId !== $id) {
-            $factory[0] = new Reference($defId, $factory[0]->getInvalidBehavior(), $factory[0]->isStrict(false));
+            $factory[0] = new Reference($defId, $factory[0]->getInvalidBehavior());
         }
 
         return $factory;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
index 651ca85a5b..0fe83960b7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveReferencesToAliasesPassTest.php
@@ -82,24 +82,6 @@ class ResolveReferencesToAliasesPassTest extends \PHPUnit_Framework_TestCase
         $this->assertSame('Factory', (string) $resolvedBarFactory[0]);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testResolveFactoryService()
-    {
-        $container = new ContainerBuilder();
-        $container->register('factory', 'Factory');
-        $container->setAlias('factory_alias', new Alias('factory'));
-        $foo = new Definition();
-        $foo->setFactoryService('factory_alias');
-        $foo->setFactoryMethod('createFoo');
-        $container->setDefinition('foo', $foo);
-
-        $this->process($container);
-
-        $this->assertSame('factory', $foo->getFactoryService());
-    }
-
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveReferencesToAliasesPass();