bug #17867 [DependencyInjection] replace alias in factory services (xabbuh)

fabpot · fabpot · commit 4b33fd3d453d · 2016-02-23T19:17:24.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [DependencyInjection] replace alias in factory services | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17864 | License | MIT | Doc PR | Commits ------- 56f8798 replace alias in factory services
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->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(), $currentId, $newId));
         }
     }
 
@@ -122,4 +124,13 @@ private function updateArgumentReferences(array $arguments, $currentId, $newId)
 
         return $arguments;
     }
+
+    private function updateFactoryServiceReference($factoryService, $currentId, $newId)
+    {
+        if (null === $factoryService) {
+            return;
+        }
+
+        return $currentId === $factoryService ? $newId : $currentId;
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -21,7 +21,9 @@ public function testProcess()
     {
         $container = new ContainerBuilder();
 
-        $container->register('a', '\stdClass');
+        $aDefinition = $container->register('a', '\stdClass');
+        $aDefinition->setFactoryService('b');
+        $aDefinition->setFactoryMethod('createA');
 
         $bDefinition = new Definition('\stdClass');
         $bDefinition->setPublic(false);
@@ -39,6 +41,7 @@ public function testProcess()
             $container->has('b_alias') && !$container->hasAlias('b_alias'),
             '->process() replaces alias to actual.'
         );
+        $this->assertSame('b_alias', $aDefinition->getFactoryService());
     }
 
     /**

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->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(), $currentId, $newId));`
`98`	`100`	`}`
`99`	`101`	`}`
`100`	`102`
`@@ -122,4 +124,13 @@ private function updateArgumentReferences(array $arguments, $currentId, $newId)`
`122`	`124`
`123`	`125`	`return $arguments;`
`124`	`126`	`}`
	`127`	`+`
	`128`	`+ private function updateFactoryServiceReference($factoryService, $currentId, $newId)`
	`129`	`+ {`
	`130`	`+ if (null === $factoryService) {`
	`131`	`+ return;`
	`132`	`+ }`
	`133`	`+`
	`134`	`+ return $currentId === $factoryService ? $newId : $currentId;`
	`135`	`+ }`
`125`	`136`	`}`