Merge branch '4.2' into 4.3

* 4.2:
  Fixed Swiftmailer PHP configuration
  Backport #11984 to 3.4 branch
  add $context argument to supportsNormalization()
  [Security] Better explain what happens when multiple roles are passed
  [Security] Fixed a minor RST syntax issue

Author: javiereguiluz

reference/configuration/swiftmailer.rst

@@ -388,7 +388,7 @@ alternatives based on the :ref:`service binding <services-binding>` feature:
             ->setPublic(true)
             ->setBindings([
                 // this injects the second mailer when this service type-hints constructor arguments with \Swift_Mailer
-                \Swift_Mailer => '@swiftmailer.mailer.second_mailer',
+                \Swift_Mailer::class => '@swiftmailer.mailer.second_mailer',
                 // this injects the second mailer when this service has a constructor argument called $specialMailer
                 '$specialMailer' => '@swiftmailer.mailer.second_mailer',
             ])

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`.

security.rst

@@ -959,7 +959,6 @@ Frequently Asked Questions
     the log message:
 
 **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,
     if certain user information was changed in the database since the last page

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;
         }