symfony
diff --git a/Collapse file
‎src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+14Lines changed: 14 additions & 0 deletions b/Collapse file
‎src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+14Lines changed: 14 additions & 0 deletions
diff --git a/Collapse file
‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
+7Lines changed: 7 additions & 0 deletions b/Collapse file
‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
+7Lines changed: 7 additions & 0 deletions
@@ -97,6 +97,7 @@ private function updateReferences($container, $currentId, $newId)
             );
 
             $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(), $currentId, $newId));
+            $definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));
         }
     }
 
@@ -133,4 +134,17 @@ private function updateFactoryServiceReference($factoryService, $currentId, $new
 
         return $currentId === $factoryService ? $newId : $currentId;
     }
+
+    private function updateFactoryReference($factory, $currentId, $newId)
+    {
+        if (null === $factory || !is_array($factory) || !$factory[0] instanceof Reference) {
+            return $factory;
+        }
+
+        if ($currentId === (string) $factory[0]) {
+            $factory[0] = new Reference($newId, $factory[0]->getInvalidBehavior());
+        }
+
+        return $factory;
+    }
 }
@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
 
 class ReplaceAliasByActualDefinitionPassTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,6 +26,8 @@ public function testProcess()
         $aDefinition->setFactoryService('b');
         $aDefinition->setFactoryMethod('createA');
 
+        $aDefinition->setFactory(array(new Reference('b'), 'createA'));
+
         $bDefinition = new Definition('\stdClass');
         $bDefinition->setPublic(false);
         $container->setDefinition('b', $bDefinition);
@@ -41,7 +44,11 @@ public function testProcess()
             $container->has('b_alias') && !$container->hasAlias('b_alias'),
             '->process() replaces alias to actual.'
         );
+
         $this->assertSame('b_alias', $aDefinition->getFactoryService());
+
+        $resolvedFactory = $aDefinition->getFactory();
+        $this->assertSame('b_alias', (string) $resolvedFactory[0]);
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ private function updateReferences($container, $currentId, $newId)`
`97`	`97`	`);`
`98`	`98`
`99`	`99`	`$definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(), $currentId, $newId));`
	`100`	`+ $definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));`
`100`	`101`	`}`
`101`	`102`	`}`
`102`	`103`
`@@ -133,4 +134,17 @@ private function updateFactoryServiceReference($factoryService, $currentId, $new`
`133`	`134`
`134`	`135`	`return $currentId === $factoryService ? $newId : $currentId;`
`135`	`136`	`}`
	`137`	`+`
	`138`	`+ private function updateFactoryReference($factory, $currentId, $newId)`
	`139`	`+ {`
	`140`	`+ if (null === $factory \|\| !is_array($factory) \|\| !$factory[0] instanceof Reference) {`
	`141`	`+ return $factory;`
	`142`	`+ }`
	`143`	`+`
	`144`	`+ if ($currentId === (string) $factory[0]) {`
	`145`	`+ $factory[0] = new Reference($newId, $factory[0]->getInvalidBehavior());`
	`146`	`+ }`
	`147`	`+`
	`148`	`+ return $factory;`
	`149`	`+ }`
`136`	`150`	`}`