From de406c0e38eda8fb685f5a57673ede1ef720c00c Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Sat, 27 Feb 2016 01:01:27 +0100
Subject: [PATCH] Fix bug when using an private aliased factory service

---
 .../ReplaceAliasByActualDefinitionPass.php    |  2 +-
 ...ReplaceAliasByActualDefinitionPassTest.php | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
index fef070bcff..e1c6f2ec63 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -131,6 +131,6 @@ class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface
             return;
         }
 
-        return $currentId === $factoryService ? $newId : $currentId;
+        return $currentId === $factoryService ? $newId : $factoryService;
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
index ac1609f5d7..1381369ce5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -15,6 +15,8 @@ use Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitio
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
+require_once __DIR__.'/../Fixtures/includes/foo.php';
+
 class ReplaceAliasByActualDefinitionPassTest extends \PHPUnit_Framework_TestCase
 {
     public function testProcess()
@@ -44,6 +46,26 @@ class ReplaceAliasByActualDefinitionPassTest extends \PHPUnit_Framework_TestCase
         $this->assertSame('b_alias', $aDefinition->getFactoryService());
     }
 
+    /**
+     * @group legacy
+     */
+    public function testPrivateAliasesInFactory()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('a', 'FooClass');
+        $container->register('b', 'FooClass')
+            ->setFactoryService('a')
+            ->setFactoryMethod('getInstance');
+
+        $container->register('c', 'stdClass')->setPublic(false);
+        $container->setAlias('c_alias', 'c');
+
+        $this->process($container);
+
+        $this->assertInstanceOf('FooClass', $container->get('b'));
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */