[DependencyInjection] replace alias in factories

xabbuh · xabbuh · commit b43b79bd71a8 · 2016-02-22T18:00:41.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -95,6 +95,8 @@ private function updateReferences($container, $currentId, $newId)
             $definition->setProperties(
                 $this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)
             );
+
+            $definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));
         }
     }
 
@@ -122,4 +124,17 @@ private function updateArgumentReferences(array $arguments, $currentId, $newId)
 
         return $arguments;
     }
+
+    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;
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -14,14 +14,16 @@
 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
 {
     public function testProcess()
     {
         $container = new ContainerBuilder();
 
-        $container->register('a', '\stdClass');
+        $aDefinition = $container->register('a', '\stdClass');
+        $aDefinition->setFactory(array(new Reference('b'), 'createA'));
 
         $bDefinition = new Definition('\stdClass');
         $bDefinition->setPublic(false);
@@ -39,6 +41,9 @@ public function testProcess()
             $container->has('b_alias') && !$container->hasAlias('b_alias'),
             '->process() replaces alias to actual.'
         );
+
+        $resolvedFactory = $aDefinition->getFactory();
+        $this->assertSame('b_alias', (string) $resolvedFactory[0]);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ private function updateReferences($container, $currentId, $newId)`
`95`	`95`	`$definition->setProperties(`
`96`	`96`	`$this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)`
`97`	`97`	`);`
	`98`	`+`
	`99`	`+ $definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));`
`98`	`100`	`}`
`99`	`101`	`}`
`100`	`102`
`@@ -122,4 +124,17 @@ private function updateArgumentReferences(array $arguments, $currentId, $newId)`
`122`	`124`
`123`	`125`	`return $arguments;`
`124`	`126`	`}`
	`127`	`+`
	`128`	`+ private function updateFactoryReference($factory, $currentId, $newId)`
	`129`	`+ {`
	`130`	`+ if (null === $factory \|\| !is_array($factory) \|\| !$factory[0] instanceof Reference) {`
	`131`	`+ return $factory;`
	`132`	`+ }`
	`133`	`+`
	`134`	`+ if ($currentId === (string) $factory[0]) {`
	`135`	`+ $factory[0] = new Reference($newId, $factory[0]->getInvalidBehavior());`
	`136`	`+ }`
	`137`	`+`
	`138`	`+ return $factory;`
	`139`	`+ }`
`125`	`140`	`}`