Merge branch '3.4' into 4.1

* 3.4:
  Wrapped some long lines
  Fix and improve JSON login docs
  [Serializer] Updated the list of loaded encoders

Author: javiereguiluz

security/json_login_setup.rst

@@ -80,6 +80,12 @@ path:
              */
             public function login(Request $request)
             {
+                $user = $this->getUser();
+
+                return $this->json(array(
+                    'username' => $user->getUsername(),
+                    'roles' => $user->getRoles(),
+                ));
             }
         }
 
@@ -117,11 +123,11 @@ path:
 
         return $routes;
 
-Don't let this empty controller confuse you. When you submit a ``POST`` request
-to the ``/login`` URL with the following JSON document as the body, the security
-system intercepts the requests. It takes care of authenticating the user with
-the submitted username and password or triggers an error in case the authentication
-process fails:
+When you submit a ``POST`` request to the ``/login`` URL with the following JSON
+document as the body, the security system intercepts the requests.
+It takes care of authenticating the user with the submitted username and password
+or triggers an error in case the authentication process fails.
+If the authentication is successful, the controller defined earlier will be executed.
 
 .. code-block:: json
 

serializer.rst

@@ -52,6 +52,8 @@ Encoders supporting the following formats are enabled:
 
 * JSON: :class:`Symfony\\Component\\Serializer\\Encoder\\JsonEncoder`
 * XML: :class:`Symfony\\Component\\Serializer\\Encoder\\XmlEncoder`
+* CSV: :class:`Symfony\\Component\\Serializer\\Encoder\\CsvEncoder`
+* YAML: :class:`Symfony\\Component\\Serializer\\Encoder\\YamlEncoder`
 
 As well as the following normalizers: