Merge branch '4.4' into 5.1

* 4.4:
  Correct English word order
  Update the Snippet with the UserUpgraderInterface
  replace ExceptionListener by EventListener
  add caution for datetime object
  Replace overriding twig.paths by twig.default_path

Author: javiereguiluz

configuration/override_dir_structure.rst

@@ -98,8 +98,9 @@ Override the Templates Directory
 --------------------------------
 
 If your templates are not stored in the default ``templates/`` directory, use
-the :ref:`twig.paths <config-twig-paths>` configuration option to define your
-own templates directory (or directories):
+the :ref:`twig.default_path <config-twig-default-path>` configuration
+option to define your own templates directory (use :ref:`twig.paths <config-twig-paths>`
+for multiple directories):
 
 .. configuration-block::
 
@@ -108,7 +109,7 @@ own templates directory (or directories):
         # config/packages/twig.yaml
         twig:
             # ...
-            paths: ["%kernel.project_dir%/resources/views"]
+            default_path: "%kernel.project_dir%//resources/views"
 
     .. code-block:: xml
 
@@ -123,7 +124,7 @@ own templates directory (or directories):
                 https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
             <twig:config>
-                <twig:path>%kernel.project_dir%/resources/views</twig:path>
+                <twig:default-path>%kernel.project_dir%/resources/views</twig:default-path>
             </twig:config>
 
         </container>
@@ -132,9 +133,7 @@ own templates directory (or directories):
 
         // config/packages/twig.php
         $container->loadFromExtension('twig', [
-            'paths' => [
-                '%kernel.project_dir%/resources/views',
-            ],
+            'default_path' => '%kernel.project_dir%/resources/views',
         ]);
 
 Override the Translations Directory

mercure.rst

@@ -448,7 +448,7 @@ And here is the controller::
     To use the cookie authentication method, the Symfony app and the Hub
     must be served from the same domain (can be different sub-domains).
 
-Generating Programmatically The JWT Used to Publish
+Programmatically Generating The JWT Used to Publish
 ---------------------------------------------------
 
 Instead of directly storing a JWT in the configuration,

reference/events.rst

@@ -251,7 +251,7 @@ sent as response::
 
 .. note::
 
-    The TwigBundle registers an :class:`Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener`
+    The TwigBundle registers an :class:`Symfony\\Component\\HttpKernel\\EventListener\\ErrorListener`
     that forwards the ``Request`` to a given controller defined by the
     ``exception_listener.controller`` parameter.
 

security/user_provider.rst

@@ -360,10 +360,11 @@ command will generate a nice skeleton to get you started::
 
     use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
     use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+    use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
     use Symfony\Component\Security\Core\User\UserInterface;
     use Symfony\Component\Security\Core\User\UserProviderInterface;
 
-    class UserProvider implements UserProviderInterface
+    class UserProvider implements UserProviderInterface, PasswordUpgraderInterface
     {
         /**
          * Symfony calls this method if you use features like switch_user
@@ -416,6 +417,16 @@ command will generate a nice skeleton to get you started::
         {
             return User::class === $class || is_subclass_of($class, User::class);
         }
+        
+        /**
+         * Upgrades the encoded password of a user, typically for using a better hash algorithm.
+         */
+        public function upgradePassword(UserInterface $user, string $newEncodedPassword): void
+        {
+            // TODO: when encoded passwords are in use, this method should:
+            // 1. persist the new password in the user storage
+            // 2. update the $user object with $user->setPassword($newEncodedPassword);
+        }
     }
 
 Most of the work is already done! Read the comments in the code and update the

serializer.rst

@@ -79,6 +79,12 @@ Custom normalizers and/or encoders can also be loaded by tagging them as
 :ref:`serializer.encoder <reference-dic-tags-serializer-encoder>`. It's also
 possible to set the priority of the tag in order to decide the matching order.
 
+.. caution::
+
+    Always make sure to load the ``DateTimeNormalizer`` when serializing the
+    ``DateTime`` or ``DateTimeImmutable`` classes to avoid excessive memory
+    usage and exposing internal details.
+
 Here is an example on how to load the
 :class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`, a
 faster alternative to the `ObjectNormalizer` when data objects always use