minor #17928 removed obsolete code (fabpot)

fabpot · fabpot · commit 88e6e3d10f02 · 2016-02-26T06:39:54.000+01:00
This PR was merged into the 3.0 branch. Discussion ---------- removed obsolete code | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 6f5322e removed obsolete code
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -96,7 +96,6 @@ private function updateReferences($container, $currentId, $newId)
                 $this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)
             );
 
-            $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(false), $currentId, $newId), false);
             $definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));
         }
     }
@@ -126,15 +125,6 @@ private function updateArgumentReferences(array $arguments, $currentId, $newId)
         return $arguments;
     }
 
-    private function updateFactoryServiceReference($factoryService, $currentId, $newId)
-    {
-        if (null === $factoryService) {
-            return;
-        }
-
-        return $currentId === $factoryService ? $newId : $currentId;
-    }
-
     private function updateFactoryReference($factory, $currentId, $newId)
     {
         if (null === $factory || !is_array($factory) || !$factory[0] instanceof Reference) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -23,8 +23,6 @@ public function testProcess()
         $container = new ContainerBuilder();
 
         $aDefinition = $container->register('a', '\stdClass');
-        $aDefinition->setFactoryService('b', false);
-
         $aDefinition->setFactory(array(new Reference('b'), 'createA'));
 
         $bDefinition = new Definition('\stdClass');
@@ -44,8 +42,6 @@ public function testProcess()
             '->process() replaces alias to actual.'
         );
 
-        $this->assertSame('b_alias', $aDefinition->getFactoryService(false));
-
         $resolvedFactory = $aDefinition->getFactory(false);
         $this->assertSame('b_alias', (string) $resolvedFactory[0]);
     }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ private function updateReferences($container, $currentId, $newId)`
`96`	`96`	`$this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)`
`97`	`97`	`);`
`98`	`98`
`99`		`- $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(false), $currentId, $newId), false);`
`100`	`99`	`$definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));`
`101`	`100`	`}`
`102`	`101`	`}`
`@@ -126,15 +125,6 @@ private function updateArgumentReferences(array $arguments, $currentId, $newId)`
`126`	`125`	`return $arguments;`
`127`	`126`	`}`
`128`	`127`
`129`		`- private function updateFactoryServiceReference($factoryService, $currentId, $newId)`
`130`		`- {`
`131`		`- if (null === $factoryService) {`
`132`		`- return;`
`133`		`- }`
`134`		`-`
`135`		`- return $currentId === $factoryService ? $newId : $currentId;`
`136`		`- }`
`137`		`-`
`138`	`128`	`private function updateFactoryReference($factory, $currentId, $newId)`
`139`	`129`	`{`
`140`	`130`	`if (null === $factory \|\| !is_array($factory) \|\| !$factory[0] instanceof Reference) {`