Merge branch '4.3' into 4.4

* 4.3:
  Fixed Swiftmailer PHP configuration
  Backport symfony#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
  [Routing] Be consistent in custom route loader doc
  [Encore] Fix typo

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

routing/custom_route_loader.rst

@@ -139,8 +139,8 @@ extend or implement any special class, but the called method must return a
 
 .. versionadded:: 4.3
 
-    The support of the ``__invoke()`` method to create invokable route loader
-    services was introduced in Symfony 4.3.
+    The support of the ``__invoke()`` method to create invokable service route
+    loaders was introduced in Symfony 4.3.
 
 Creating a custom Loader
 ------------------------

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