Merge branch '2.7' into 2.8

* 2.7:
  fixed CS
  [BrowserKit] Corrected HTTP_HOST logic #15398
  resolve aliases in factories
  resolve aliases in factory services
  Remove invalid CSS white-space value
  Fix FileSystem tests on Windows
  [Form] ArrayChoiceList can now deal with a null in choices

Author: xabbuh

Compiler/ResolveReferencesToAliasesPass.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -42,6 +43,11 @@ public function process(ContainerBuilder $container)
             $definition->setArguments($this->processArguments($definition->getArguments()));
             $definition->setMethodCalls($this->processArguments($definition->getMethodCalls()));
             $definition->setProperties($this->processArguments($definition->getProperties()));
+            $definition->setFactory($this->processFactory($definition->getFactory()));
+
+            if (null !== $factoryService = $definition->getFactoryService(false)) {
+                $definition->setFactoryService($this->processFactoryService($factoryService));
+            }
         }
 
         foreach ($container->getAliases() as $id => $alias) {
@@ -76,6 +82,30 @@ private function processArguments(array $arguments)
         return $arguments;
     }
 
+    private function processFactoryService($factoryService)
+    {
+        if (null === $factoryService) {
+            return;
+        }
+
+        return $this->getDefinitionId($factoryService);
+    }
+
+    private function processFactory($factory)
+    {
+        if (null === $factory || !is_array($factory) || !$factory[0] instanceof Reference) {
+            return $factory;
+        }
+
+        $defId = $this->getDefinitionId($id = (string) $factory[0]);
+
+        if ($defId !== $id) {
+            $factory[0] = new Reference($defId, $factory[0]->getInvalidBehavior(), $factory[0]->isStrict(false));
+        }
+
+        return $factory;
+    }
+
     /**
      * Resolves an alias into a definition id.
      *

Tests/Compiler/ResolveReferencesToAliasesPassTest.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Compiler\ResolveReferencesToAliasesPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -59,6 +61,45 @@ public function testAliasCircularReference()
         $this->process($container);
     }
 
+    public function testResolveFactory()
+    {
+        $container = new ContainerBuilder();
+        $container->register('factory', 'Factory');
+        $container->setAlias('factory_alias', new Alias('factory'));
+        $foo = new Definition();
+        $foo->setFactory(array(new Reference('factory_alias'), 'createFoo'));
+        $container->setDefinition('foo', $foo);
+        $bar = new Definition();
+        $bar->setFactory(array('Factory', 'createFoo'));
+        $container->setDefinition('bar', $bar);
+
+        $this->process($container);
+
+        $resolvedFooFactory = $container->getDefinition('foo')->getFactory();
+        $resolvedBarFactory = $container->getDefinition('bar')->getFactory();
+
+        $this->assertSame('factory', (string) $resolvedFooFactory[0]);
+        $this->assertSame('Factory', (string) $resolvedBarFactory[0]);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testResolveFactoryService()
+    {
+        $container = new ContainerBuilder();
+        $container->register('factory', 'Factory');
+        $container->setAlias('factory_alias', new Alias('factory'));
+        $foo = new Definition();
+        $foo->setFactoryService('factory_alias');
+        $foo->setFactoryMethod('createFoo');
+        $container->setDefinition('foo', $foo);
+
+        $this->process($container);
+
+        $this->assertSame('factory', $foo->getFactoryService());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveReferencesToAliasesPass();