Merge branch '2.5'

* 2.5:
  Remove aligned '=>' and '='
  Break infinite loop while resolving aliases
  [Security][listener] change priority of switchuser
  Improved the phpdoc for security token classes
  bumped Symfony version to 2.5.7
  updated VERSION for 2.5.6
  updated CHANGELOG for 2.5.6
  bumped Symfony version to 2.3.22
  updated VERSION for 2.3.21
  update CONTRIBUTORS for 2.3.21
  updated CHANGELOG for 2.3.21

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
	src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
	src/Symfony/Component/Form/Extension/Core/Type/DateType.php
	src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
	src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Core/SecurityContextInterface.php
	src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
	src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
	src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
	src/Symfony/Component/Serializer/Serializer.php
	src/Symfony/Component/Validator/Constraints/File.php

Author: fabpot

Encoder/JsonDecode.php

@@ -95,9 +95,9 @@ public function decode($data, $format, array $context = array())
     {
         $context = $this->resolveContext($context);
 
-        $associative    = $context['json_decode_associative'];
+        $associative = $context['json_decode_associative'];
         $recursionDepth = $context['json_decode_recursion_depth'];
-        $options        = $context['json_decode_options'];
+        $options = $context['json_decode_options'];
 
         if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
             $decodedData = json_decode($data, $associative, $recursionDepth, $options);

Serializer.php

@@ -47,11 +47,11 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz
     /**
      * @var array
      */
-    protected $normalizers       = array();
+    protected $normalizers = array();
     /**
      * @var array
      */
-    protected $normalizerCache   = array();
+    protected $normalizerCache = array();
     /**
      * @var array
      */