Merge branch '2.3' into 2.7

* 2.3:
  fixed CS
  [BrowserKit] Corrected HTTP_HOST logic #15398
  resolve aliases in factory services
  Remove invalid CSS white-space value
  Fix FileSystem tests on Windows

Author: xabbuh

Compiler/ResolveReferencesToAliasesPass.php

@@ -44,6 +44,10 @@ public function process(ContainerBuilder $container)
             $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) {
@@ -78,6 +82,15 @@ 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) {

Tests/Compiler/ResolveReferencesToAliasesPassTest.php

@@ -82,6 +82,24 @@ public function testResolveFactory()
         $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();