Merge branch '2.4'

* 2.4: (35 commits)
  Update validators.ro.xlf
  add non-standard port to HTTP_HOST
  fixed attribute "source-language" for translations
  [Process] clarify idle timeout
  [Security] fix DI for SimpleFormAuthenticationListener
  Update PluralizationRules.php
  Update validators.pt_BR.xlf
  Translated remaining items (57-72)
  Updated Vietnamese translation
  allow null value in fragment handler
  added missing dot in translation
  updated Arabic translations
  Update validators.id.xlf
  [Validator] Translate validator messages into Brazilian Portuguese
  Added more Swedish validator translations
  Update validators.ca.xlf
  fixed typos in Welsh translation
  Added missing Croatian translations
  [Form] fixed allow render 0 and 0.0 numeric input values
  Fixed validators.nl.xlf
  ...

Conflicts:
	src/Symfony/Bridge/Twig/composer.json

Author: fabpot

DependencyInjection/Security/Factory/FormLoginFactory.php

@@ -75,12 +75,10 @@ protected function createListener($container, $id, $config, $userProvider)
     {
         $listenerId = parent::createListener($container, $id, $config, $userProvider);
 
-        if (isset($config['csrf_provider'])) {
-            $container
-                ->getDefinition($listenerId)
-                ->addArgument(new Reference($config['csrf_provider']))
-            ;
-        }
+        $container
+            ->getDefinition($listenerId)
+            ->addArgument(isset($config['csrf_provider']) ? new Reference($config['csrf_provider']) : null)
+        ;
 
         return $listenerId;
     }

DependencyInjection/Security/Factory/SimpleFormFactory.php

@@ -63,18 +63,14 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
     protected function createListener($container, $id, $config, $userProvider)
     {
         $listenerId = parent::createListener($container, $id, $config, $userProvider);
-        $listener = $container->getDefinition($listenerId);
-
-        if (!isset($config['csrf_token_generator'])) {
-            $listener->addArgument(null);
-        }
 
         $simpleAuthHandlerId = 'security.authentication.simple_success_failure_handler.'.$id;
         $simpleAuthHandler = $container->setDefinition($simpleAuthHandlerId, new DefinitionDecorator('security.authentication.simple_success_failure_handler'));
         $simpleAuthHandler->replaceArgument(0, new Reference($config['authenticator']));
         $simpleAuthHandler->replaceArgument(1, new Reference($this->getSuccessHandlerId($id)));
         $simpleAuthHandler->replaceArgument(2, new Reference($this->getFailureHandlerId($id)));
 
+        $listener = $container->getDefinition($listenerId);
         $listener->replaceArgument(5, new Reference($simpleAuthHandlerId));
         $listener->replaceArgument(6, new Reference($simpleAuthHandlerId));
         $listener->addArgument(new Reference($config['authenticator']));