Merge branch '3.1' into 3.2

* 3.1: (31 commits)
  fixed CS
  fixed CS
  fixed CS fixer config
  fixed typo
  Revert "fixed typo"
  fixed typo
  fixed CS
  Avoid setting request attributes from signature arguments in AnnotationClassLoader
  [DependencyInjection] Add some missing typehints in YamlFileLoader
  [DependencyInjection] minor: Fix a DocBlock
  [HttpKernel] Give higher priority to adding request formats
  [PropertyInfo] Don't try to access a property thru a static method
  [PropertyInfo] Exclude static methods form properties guessing
  [FrameworkBundle] Fix third level headers for MarkdownDescriptor
  [Ldap] Using Ldap stored username instead of form submitted one
  [Ldap] load users with the good username case
  [DoctrineBridge] Fixed invalid unique value as composite key
  [Doctrine Bridge] fix UniqueEntityValidator for composite object primary keys
  [TwigBundle] do not lose already set method calls
  #20411 fix Yaml parsing for very long quoted strings
  ...

Author: fabpot

Tests/Encoder/JsonDecodeTest.php

@@ -61,7 +61,7 @@ public function decodeProvider()
      */
     public function testDecodeWithException($value)
     {
-        $this->decode->decode($value,  JsonEncoder::FORMAT);
+        $this->decode->decode($value, JsonEncoder::FORMAT);
     }
 
     public function decodeProviderException()

Tests/Encoder/JsonEncodeTest.php

@@ -54,6 +54,6 @@ public function encodeProvider()
      */
     public function testEncodeWithError()
     {
-        $this->encode->encode("\xB1\x31",  JsonEncoder::FORMAT);
+        $this->encode->encode("\xB1\x31", JsonEncoder::FORMAT);
     }
 }