Merge branch '6.2' into 6.3

* 6.2:
  Renamed the attribute to AsDoctrineListener
  Minor tweak
  updated the casted interface name as per the implemented interface
  [EventDispatcher] Add example of ``#[AsEventListener]`` on methods
  Add documentation about doctrine's AsEventListener

Author: javiereguiluz

.doctor-rst.yaml

@@ -81,6 +81,7 @@ whitelist:
         - '#. The most important config file is ``app/config/services.yml``, which now is'
         - 'The bin/console Command'
         - '.. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection'
+        - '.. versionadded:: 2.7.2' # Doctrine
         - '.. versionadded:: 1.9.0' # Encore
         - '.. versionadded:: 1.11' # Messenger (Middleware / DoctrineBundle)
         - '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst

doctrine/events.rst

@@ -164,6 +164,23 @@ listener in the Symfony application by creating a new service for it and
 
 .. configuration-block::
 
+    .. code-block:: attribute
+
+        // src/App/EventListener/SearchIndexer.php
+        namespace App\EventListener;
+
+        use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
+        use Doctrine\ORM\Event\LifecycleEventArgs;
+
+        #[AsDoctrineListener('postPersist'/*, 500, 'default'*/)]
+        class SearchIndexer
+        {
+            public function postPersist(LifecycleEventArgs $event): void
+            {
+                // ...
+            }
+        }
+
     .. code-block:: yaml
 
         # config/services.yaml
@@ -234,6 +251,11 @@ listener in the Symfony application by creating a new service for it and
             ;
         };
 
+.. versionadded:: 2.7.2
+
+    The :class:`Doctrine\\Bundle\\DoctrineBundle\\Attribute\\AsDoctrineListener`
+    attribute was introduced in DoctrineBundle 2.7.2.
+
 .. tip::
 
     Symfony loads (and instantiates) Doctrine listeners only when the related

event_dispatcher.rst

@@ -191,6 +191,39 @@ You can add multiple ``#[AsEventListener()]`` attributes to configure different
         }
     }
 
+:class:`Symfony\\Component\\EventDispatcher\\Attribute\\AsEventListener`
+can also be applied to methods directly::
+
+    namespace App\EventListener;
+
+    use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
+
+    final class MyMultiListener
+    {
+        #[AsEventListener()]
+        public function onCustomEvent(CustomEvent $event): void
+        {
+            // ...
+        }
+
+        #[AsEventListener(event: 'foo', priority: 42)]
+        public function onFoo(): void
+        {
+            // ...
+        }
+
+        #[AsEventListener(event: 'bar')]
+        public function onBarEvent(): void
+        {
+            // ...
+        }
+    }
+
+.. note::
+
+    Note that the attribute doesn't require its ``event`` parameter to be set
+    if the method already type-hints the expected event.
+
 .. _events-subscriber:
 
 Creating an Event Subscriber

security/passwords.rst

@@ -464,13 +464,14 @@ storing the newly created password hash::
     namespace App\Repository;
 
     // ...
+    use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
     use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
 
     class UserRepository extends EntityRepository implements PasswordUpgraderInterface
     {
         // ...
 
-        public function upgradePassword(UserInterface $user, string $newHashedPassword): void
+        public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void
         {
             // set the new hashed password on the User object
             $user->setPassword($newHashedPassword);