Merge branch '4.2'

* 4.2:
  Update serializer.rst
  use correct code block for examples
  Fix little layout problem

Author: javiereguiluz

components/serializer.rst

@@ -938,17 +938,23 @@ The ``setCircularReferenceLimit()`` method of this normalizer sets the number
 of times it will serialize the same object before considering it a circular
 reference. Its default value is ``1``.
 
+.. deprecated:: 4.2
+
+    The :method:`Symfony\\Component\\Serializer\\Normalizer\\AbstractNormalizer::setCircularReferenceHandler`
+    method is deprecated since Symfony 4.2. Use the ``circular_reference_handler``
+    key of the context instead.
+
 Instead of throwing an exception, circular references can also be handled
 by custom callables. This is especially useful when serializing entities
 having unique identifiers::
 
     $encoder = new JsonEncoder();
-    $normalizer = new ObjectNormalizer();
-
-    // all callback parameters are optional (you can omit the ones you don't use)
-    $normalizer->setCircularReferenceHandler(function ($object, string $format = null, array $context = []) {
-        return $object->getName();
-    });
+    $defaultContext = [
+        AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => function ($object, $format, $context) {
+            return $object->getName();
+        },
+    ];
+    $normalizer = new ObjectNormalizer(null, null, null, null, null, null, $defaultContext);
 
     $serializer = new Serializer([$normalizer], [$encoder]);
     var_dump($serializer->serialize($org, 'json'));

form/form_customization.rst

@@ -30,7 +30,7 @@ The next step is to use the :ref:`form_start() <reference-forms-twig-start>`,
 :ref:`form_row() <reference-forms-twig-row>` Twig functions to render the
 different form parts so you can customize them adding HTML elements and attributes:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     {{ form_start(form) }}
         <div class="my-custom-class-for-errors">

form/form_themes.rst

@@ -122,7 +122,7 @@ A form can also be customized by applying several themes. To do this, pass the
 path of all the Twig templates as an array using the ``with`` keyword (their
 order is important, because each theme overrides all the previous ones):
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {# apply multiple form themes but only to the form of this template #}
     {% form_theme form with [

security.rst

@@ -963,7 +963,7 @@ Frequently Asked Questions
     To see if this is an issue, check your log file (``var/log/dev.log``) for
     the log message:
 
-    > Cannot refresh token because user has changed.
+**Cannot refresh token because user has changed**
 
     If you see this, there are two possible causes. First, there may be a problem
     loading your User from the session. See :ref:`user_session_refresh`. Second,