Merge branch '2.3' into 2.7

* 2.3:
  [Form] NumberToLocalizedStringTransformer should return floats when possible
  [DependencyInjection] Enabled alias for service_container

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

Author: nicolas-grekas

Compiler/ReplaceAliasByActualDefinitionPass.php

@@ -42,6 +42,10 @@ public function process(ContainerBuilder $container)
         foreach ($container->getAliases() as $id => $alias) {
             $aliasId = (string) $alias;
 
+            if ('service_container' === $aliasId) {
+                continue;
+            }
+
             try {
                 $definition = $container->getDefinition($aliasId);
             } catch (InvalidArgumentException $e) {

Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

@@ -36,6 +36,8 @@ public function testProcess()
         $container->setAlias('a_alias', 'a');
         $container->setAlias('b_alias', 'b');
 
+        $container->setAlias('container', 'service_container');
+
         $this->process($container);
 
         $this->assertTrue($container->has('a'), '->process() does nothing to public definitions.');
@@ -47,6 +49,7 @@ public function testProcess()
         );
 
         $this->assertSame('b_alias', $aDefinition->getFactoryService(false));
+        $this->assertTrue($container->has('container'));
 
         $resolvedFactory = $aDefinition->getFactory(false);
         $this->assertSame('b_alias', (string) $resolvedFactory[0]);