From 6eeea59ad53ced84dfb89666e598f24bdf9492fb Mon Sep 17 00:00:00 2001
From: Antoine Makdessi <amakdessi@me.com>
Date: Fri, 22 Jul 2022 10:09:16 +0200
Subject: [PATCH 1/2] Update event_dispatcher.rst

---
 components/event_dispatcher.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/event_dispatcher.rst b/components/event_dispatcher.rst
index 206fde3fc99..da33bb54750 100644
--- a/components/event_dispatcher.rst
+++ b/components/event_dispatcher.rst
@@ -291,7 +291,7 @@ order. Start by creating this custom event class and documenting it::
     use Symfony\Contracts\EventDispatcher\Event;
 
     /**
-     * The order.placed event is dispatched each time an order is created
+     * The order.placed event is dispatched each time an order is placed
      * in the system.
      */
     class OrderPlacedEvent extends Event
@@ -340,6 +340,9 @@ of the event to dispatch::
     // creates the OrderPlacedEvent and dispatches it
     $event = new OrderPlacedEvent($order);
     $dispatcher->dispatch($event, OrderPlacedEvent::NAME);
+    
+    // alternatively, you can also dispatch the event like this
+    $dispatcher->dispatch($event);
 
 Notice that the special ``OrderPlacedEvent`` object is created and passed to
 the ``dispatch()`` method. Now, any listener to the ``order.placed``
@@ -382,7 +385,9 @@ Take the following example of a subscriber that subscribes to the
                     ['onKernelResponsePre', 10],
                     ['onKernelResponsePost', -10],
                 ],
-                OrderPlacedEvent::NAME => 'onStoreOrder',
+                OrderPlacedEvent::NAME => 'onOrderPlaced',
+                // alternatively, you can also subscribe to the event like this
+                OrderPlacedEvent::class => 'onOrderPlaced',
             ];
         }
 
@@ -396,7 +401,7 @@ Take the following example of a subscriber that subscribes to the
             // ...
         }
 
-        public function onStoreOrder(OrderPlacedEvent $event)
+        public function onOrderPlaced(OrderPlacedEvent $event)
         {
             // ...
         }

From 7c8b2fe0a3a85c35166961dff2ffca98cd9d9cf9 Mon Sep 17 00:00:00 2001
From: Antoine Makdessi <amakdessi@me.com>
Date: Thu, 4 Aug 2022 07:42:15 +0200
Subject: [PATCH 2/2] Update event_dispatcher.rst

---
 components/event_dispatcher.rst | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/components/event_dispatcher.rst b/components/event_dispatcher.rst
index da33bb54750..0d4ff36fe6b 100644
--- a/components/event_dispatcher.rst
+++ b/components/event_dispatcher.rst
@@ -291,14 +291,14 @@ order. Start by creating this custom event class and documenting it::
     use Symfony\Contracts\EventDispatcher\Event;
 
     /**
-     * The order.placed event is dispatched each time an order is placed
-     * in the system.
+     * The order.placed event is dispatched each time
+     * an order is placed in the system.
      */
     class OrderPlacedEvent extends Event
     {
         public const NAME = 'order.placed';
 
-        protected $order;
+        protected Order $order;
 
         public function __construct(Order $order)
         {
@@ -328,19 +328,20 @@ Dispatch the Event
 The :method:`Symfony\\Component\\EventDispatcher\\EventDispatcher::dispatch`
 method notifies all listeners of the given event. It takes two arguments:
 the ``Event`` instance to pass to each listener of that event and the name
-of the event to dispatch::
+of the event to dispatch. Alternatively, it can takes only one argument: the
+``Event`` instance itself::
 
     use Acme\Store\Event\OrderPlacedEvent;
     use Acme\Store\Order;
 
-    // the order is somehow created or retrieved
+    // the order is somehow created
     $order = new Order();
     // ...
 
     // creates the OrderPlacedEvent and dispatches it
     $event = new OrderPlacedEvent($order);
-    $dispatcher->dispatch($event, OrderPlacedEvent::NAME);
-    
+
+    $dispatcher->dispatch($event, OrderPlacedEvent::NAME);    
     // alternatively, you can also dispatch the event like this
     $dispatcher->dispatch($event);
 
@@ -378,7 +379,7 @@ Take the following example of a subscriber that subscribes to the
 
     class StoreSubscriber implements EventSubscriberInterface
     {
-        public static function getSubscribedEvents()
+        public static function getSubscribedEvents(): array
         {
             return [
                 KernelEvents::RESPONSE => [
@@ -391,17 +392,17 @@ Take the following example of a subscriber that subscribes to the
             ];
         }
 
-        public function onKernelResponsePre(ResponseEvent $event)
+        public function onKernelResponsePre(ResponseEvent $event): void
         {
             // ...
         }
 
-        public function onKernelResponsePost(ResponseEvent $event)
+        public function onKernelResponsePost(ResponseEvent $event): void
         {
             // ...
         }
 
-        public function onOrderPlaced(OrderPlacedEvent $event)
+        public function onOrderPlaced(OrderPlacedEvent $event): void
         {
             // ...
         }