Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit 20d4c5842a92 · 2016-02-24T19:55:13.000+01:00
* 2.7:
  [DependencyInjection] fix tests
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -96,7 +96,7 @@ private function updateReferences($container, $currentId, $newId)
                 $this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)
             );
 
-            $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(), $currentId, $newId));
+            $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(false), $currentId, $newId), false);
             $definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -23,8 +23,7 @@ public function testProcess()
         $container = new ContainerBuilder();
 
         $aDefinition = $container->register('a', '\stdClass');
-        $aDefinition->setFactoryService('b');
-        $aDefinition->setFactoryMethod('createA');
+        $aDefinition->setFactoryService('b', false);
 
         $aDefinition->setFactory(array(new Reference('b'), 'createA'));
 
@@ -45,9 +44,9 @@ public function testProcess()
             '->process() replaces alias to actual.'
         );
 
-        $this->assertSame('b_alias', $aDefinition->getFactoryService());
+        $this->assertSame('b_alias', $aDefinition->getFactoryService(false));
 
-        $resolvedFactory = $aDefinition->getFactory();
+        $resolvedFactory = $aDefinition->getFactory(false);
         $this->assertSame('b_alias', (string) $resolvedFactory[0]);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ 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(), $currentId, $newId));`
	`99`	`+ $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(false), $currentId, $newId), false);`
`100`	`100`	`$definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));`
`101`	`101`	`}`
`102`	`102`	`}`