Fix bug when using an private aliased factory service

wouterj · fabpot · commit de406c0e38ed · 2016-02-28T16:06:53.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -131,6 +131,6 @@ private function updateFactoryServiceReference($factoryService, $currentId, $new
             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
@@ -15,6 +15,8 @@
 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 @@ public function testProcess()
         $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
      */

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,6 @@ private function updateFactoryServiceReference($factoryService, $currentId, $new`
`131`	`131`	`return;`
`132`	`132`	`}`
`133`	`133`
`134`		`- return $currentId === $factoryService ? $newId : $currentId;`
	`134`	`+ return $currentId === $factoryService ? $newId : $factoryService;`
`135`	`135`	`}`
`136`	`136`	`}`