Merge branch '3.4' into 4.2

* 3.4:
  Backport #11984 to 3.4 branch
  add $context argument to supportsNormalization()
  [Security] Better explain what happens when multiple roles are passed

Author: javiereguiluz

frontend/encore/simple-example.rst

@@ -322,7 +322,7 @@ Compiling Only a CSS File
 .. caution::
 
     Using ``addStyleEntry()`` is supported, but not recommended. A better option
-    is to use follow the pattern above: use ``addEntry()`` to point to a JavaScript
+    is to follow the pattern above: use ``addEntry()`` to point to a JavaScript
     file, then require the CSS needed from inside of that.
 
 If you want to only compile a CSS file, that's possible via ``addStyleEntry()``:

reference/twig_reference.rst

@@ -175,7 +175,8 @@ is_granted
 
 Returns ``true`` if the current user has the given role. If several roles are
 passed in an array, ``true`` is returned if the user has at least one of
-them.
+them or all of them, depending on the
+:ref:`Access Decision Manager strategy <security-access-control-enforcement-options>`.
 
 Optionally, an object can be passed to be used by the voter. More information
 can be found in :ref:`security-template`.

serializer/custom_normalizer.rst

@@ -47,7 +47,7 @@ to customize the normalized data. To do that, leverage the ``ObjectNormalizer``:
             return $data;
         }
 
-        public function supportsNormalization($data, $format = null)
+        public function supportsNormalization($data, $format = null, array $context = [])
         {
             return $data instanceof Topic;
         }