Merge branch '2.7' into 2.8

* 2.7:
  Validate XLIFF translation files
  [DependencyInjection] replace alias in factories
  replace alias in factory services

Author: fabpot

Compiler/ReplaceAliasByActualDefinitionPass.php

@@ -95,6 +95,9 @@ private function updateReferences($container, $currentId, $newId)
             $definition->setProperties(
                 $this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)
             );
+
+            $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(), $currentId, $newId));
+            $definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));
         }
     }
 
@@ -122,4 +125,26 @@ 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) {
+            return $factory;
+        }
+
+        if ($currentId === (string) $factory[0]) {
+            $factory[0] = new Reference($newId, $factory[0]->getInvalidBehavior());
+        }
+
+        return $factory;
+    }
 }

Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

@@ -14,14 +14,19 @@
 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->setFactoryService('b');
+        $aDefinition->setFactoryMethod('createA');
+
+        $aDefinition->setFactory(array(new Reference('b'), 'createA'));
 
         $bDefinition = new Definition('\stdClass');
         $bDefinition->setPublic(false);
@@ -39,6 +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]);
     }
 
     /**