Merge branch '7.0' into 7.1

* 7.0: List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench) Fix bad merge List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
symfony · Jan 23, 2024 · 5bb99ba · 5bb99ba
2 parents 9f85f14 + 834c28d
commit 5bb99ba
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Debug/TraceableEventDispatcher.php b/Debug/TraceableEventDispatcher.php
@@ -76,7 +76,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber): void
         $this->dispatcher->removeSubscriber($subscriber);
     }
 
-    public function getListeners(string $eventName = null): array
+    public function getListeners(?string $eventName = null): array
     {
         return $this->dispatcher->getListeners($eventName);
     }
@@ -96,12 +96,12 @@ public function getListenerPriority(string $eventName, callable|array $listener)
         return $this->dispatcher->getListenerPriority($eventName, $listener);
     }
 
-    public function hasListeners(string $eventName = null): bool
+    public function hasListeners(?string $eventName = null): bool
     {
         return $this->dispatcher->hasListeners($eventName);
     }
 
-    public function dispatch(object $event, string $eventName = null): object
+    public function dispatch(object $event, ?string $eventName = null): object
     {
         $eventName ??= $event::class;
 
@@ -136,7 +136,7 @@ public function dispatch(object $event, string $eventName = null): object
         return $event;
     }
 
-    public function getCalledListeners(Request $request = null): array
+    public function getCalledListeners(?Request $request = null): array
     {
         if (null === $this->callStack) {
             return [];
@@ -154,7 +154,7 @@ public function getCalledListeners(Request $request = null): array
         return $called;
     }
 
-    public function getNotCalledListeners(Request $request = null): array
+    public function getNotCalledListeners(?Request $request = null): array
     {
         try {
             $allListeners = $this->dispatcher instanceof EventDispatcher ? $this->getListenersWithPriority() : $this->getListenersWithoutPriority();
@@ -196,7 +196,7 @@ public function getNotCalledListeners(Request $request = null): array
         return $notCalled;
     }
 
-    public function getOrphanedEvents(Request $request = null): array
+    public function getOrphanedEvents(?Request $request = null): array
     {
         if ($request) {
             return $this->orphanedEvents[spl_object_hash($request)] ?? [];

diff --git a/EventDispatcher.php b/EventDispatcher.php
@@ -42,7 +42,7 @@ public function __construct()
         }
     }
 
-    public function dispatch(object $event, string $eventName = null): object
+    public function dispatch(object $event, ?string $eventName = null): object
     {
         $eventName ??= $event::class;
 
@@ -59,7 +59,7 @@ public function dispatch(object $event, string $eventName = null): object
         return $event;
     }
 
-    public function getListeners(string $eventName = null): array
+    public function getListeners(?string $eventName = null): array
     {
         if (null !== $eventName) {
             if (empty($this->listeners[$eventName])) {
@@ -108,7 +108,7 @@ public function getListenerPriority(string $eventName, callable|array $listener)
         return null;
     }
 
-    public function hasListeners(string $eventName = null): bool
+    public function hasListeners(?string $eventName = null): bool
     {
         if (null !== $eventName) {
             return !empty($this->listeners[$eventName]);

diff --git a/EventDispatcherInterface.php b/EventDispatcherInterface.php
@@ -50,7 +50,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber): void;
      *
      * @return array<callable[]|callable>
      */
-    public function getListeners(string $eventName = null): array;
+    public function getListeners(?string $eventName = null): array;
 
     /**
      * Gets the listener priority for a specific event.
@@ -62,5 +62,5 @@ public function getListenerPriority(string $eventName, callable $listener): ?int
     /**
      * Checks whether an event has any registered listeners.
      */
-    public function hasListeners(string $eventName = null): bool;
+    public function hasListeners(?string $eventName = null): bool;
 }
diff --git a/ImmutableEventDispatcher.php b/ImmutableEventDispatcher.php
@@ -23,7 +23,7 @@ public function __construct(
     ) {
     }
 
-    public function dispatch(object $event, string $eventName = null): object
+    public function dispatch(object $event, ?string $eventName = null): object
     {
         return $this->dispatcher->dispatch($event, $eventName);
     }
@@ -48,7 +48,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber): never
         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
     }
 
-    public function getListeners(string $eventName = null): array
+    public function getListeners(?string $eventName = null): array
     {
         return $this->dispatcher->getListeners($eventName);
     }
@@ -58,7 +58,7 @@ public function getListenerPriority(string $eventName, callable|array $listener)
         return $this->dispatcher->getListenerPriority($eventName, $listener);
     }
 
-    public function hasListeners(string $eventName = null): bool
+    public function hasListeners(?string $eventName = null): bool
     {
         return $this->dispatcher->hasListeners($eventName);
     }