Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 834c28d533dd · 2024-01-23T16:02:46.000+01:00
* 6.4:
  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
diff --git a/Debug/TraceableEventDispatcher.php b/Debug/TraceableEventDispatcher.php
@@ -43,7 +43,7 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
     private ?RequestStack $requestStack;
     private string $currentRequestHash = '';
 
-    public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null, RequestStack $requestStack = null)
+    public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, ?LoggerInterface $logger = null, ?RequestStack $requestStack = null)
     {
         $this->dispatcher = $dispatcher;
         $this->stopwatch = $stopwatch;
@@ -81,7 +81,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);
     }
@@ -101,12 +101,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;
 
@@ -141,7 +141,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 [];
@@ -159,7 +159,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();
@@ -201,7 +201,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/Debug/WrappedListener.php b/Debug/WrappedListener.php
@@ -34,7 +34,7 @@ final class WrappedListener
     private ?int $priority = null;
     private static bool $hasClassStub;
 
-    public function __construct(callable|array $listener, ?string $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null, int $priority = null)
+    public function __construct(callable|array $listener, ?string $name, Stopwatch $stopwatch, ?EventDispatcherInterface $dispatcher = null, ?int $priority = null)
     {
         $this->listener = $listener;
         $this->optimizedListener = $listener instanceof \Closure ? $listener : (\is_callable($listener) ? $listener(...) : null);
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
@@ -25,7 +25,7 @@ public function __construct(EventDispatcherInterface $dispatcher)
         $this->dispatcher = $dispatcher;
     }
 
-    public function dispatch(object $event, string $eventName = null): object
+    public function dispatch(object $event, ?string $eventName = null): object
     {
         return $this->dispatcher->dispatch($event, $eventName);
     }
@@ -50,7 +50,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);
     }
@@ -60,7 +60,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);
     }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa`
`43`	`43`	`private ?RequestStack $requestStack;`
`44`	`44`	`private string $currentRequestHash = '';`
`45`	`45`
`46`		`- public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null, RequestStack $requestStack = null)`
	`46`	`+ public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, ?LoggerInterface $logger = null, ?RequestStack $requestStack = null)`
`47`	`47`	`{`
`48`	`48`	`$this->dispatcher = $dispatcher;`
`49`	`49`	`$this->stopwatch = $stopwatch;`
`@@ -81,7 +81,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber): void`
`81`	`81`	`$this->dispatcher->removeSubscriber($subscriber);`
`82`	`82`	`}`
`83`	`83`
`84`		`- public function getListeners(string $eventName = null): array`
	`84`	`+ public function getListeners(?string $eventName = null): array`
`85`	`85`	`{`
`86`	`86`	`return $this->dispatcher->getListeners($eventName);`
`87`	`87`	`}`
`@@ -101,12 +101,12 @@ public function getListenerPriority(string $eventName, callable\|array $listener)`
`101`	`101`	`return $this->dispatcher->getListenerPriority($eventName, $listener);`
`102`	`102`	`}`
`103`	`103`
`104`		`- public function hasListeners(string $eventName = null): bool`
	`104`	`+ public function hasListeners(?string $eventName = null): bool`
`105`	`105`	`{`
`106`	`106`	`return $this->dispatcher->hasListeners($eventName);`
`107`	`107`	`}`
`108`	`108`
`109`		`- public function dispatch(object $event, string $eventName = null): object`
	`109`	`+ public function dispatch(object $event, ?string $eventName = null): object`
`110`	`110`	`{`
`111`	`111`	`$eventName ??= $event::class;`
`112`	`112`
`@@ -141,7 +141,7 @@ public function dispatch(object $event, string $eventName = null): object`
`141`	`141`	`return $event;`
`142`	`142`	`}`
`143`	`143`
`144`		`- public function getCalledListeners(Request $request = null): array`
	`144`	`+ public function getCalledListeners(?Request $request = null): array`
`145`	`145`	`{`
`146`	`146`	`if (null === $this->callStack) {`
`147`	`147`	`return [];`
`@@ -159,7 +159,7 @@ public function getCalledListeners(Request $request = null): array`
`159`	`159`	`return $called;`
`160`	`160`	`}`
`161`	`161`
`162`		`- public function getNotCalledListeners(Request $request = null): array`
	`162`	`+ public function getNotCalledListeners(?Request $request = null): array`
`163`	`163`	`{`
`164`	`164`	`try {`
`165`	`165`	`$allListeners = $this->dispatcher instanceof EventDispatcher ? $this->getListenersWithPriority() : $this->getListenersWithoutPriority();`
`@@ -201,7 +201,7 @@ public function getNotCalledListeners(Request $request = null): array`
`201`	`201`	`return $notCalled;`
`202`	`202`	`}`
`203`	`203`
`204`		`- public function getOrphanedEvents(Request $request = null): array`
	`204`	`+ public function getOrphanedEvents(?Request $request = null): array`
`205`	`205`	`{`
`206`	`206`	`if ($request) {`
`207`	`207`	`return $this->orphanedEvents[spl_object_hash($request)] ?? [];`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ final class WrappedListener`
`34`	`34`	`private ?int $priority = null;`
`35`	`35`	`private static bool $hasClassStub;`
`36`	`36`
`37`		`- public function __construct(callable\|array $listener, ?string $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null, int $priority = null)`
	`37`	`+ public function __construct(callable\|array $listener, ?string $name, Stopwatch $stopwatch, ?EventDispatcherInterface $dispatcher = null, ?int $priority = null)`
`38`	`38`	`{`
`39`	`39`	`$this->listener = $listener;`
`40`	`40`	`$this->optimizedListener = $listener instanceof \Closure ? $listener : (\is_callable($listener) ? $listener(...) : null);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct()`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- public function dispatch(object $event, string $eventName = null): object`
	`45`	`+ public function dispatch(object $event, ?string $eventName = null): object`
`46`	`46`	`{`
`47`	`47`	`$eventName ??= $event::class;`
`48`	`48`
`@@ -59,7 +59,7 @@ public function dispatch(object $event, string $eventName = null): object`
`59`	`59`	`return $event;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public function getListeners(string $eventName = null): array`
	`62`	`+ public function getListeners(?string $eventName = null): array`
`63`	`63`	`{`
`64`	`64`	`if (null !== $eventName) {`
`65`	`65`	`if (empty($this->listeners[$eventName])) {`
`@@ -108,7 +108,7 @@ public function getListenerPriority(string $eventName, callable\|array $listener)`
`108`	`108`	`return null;`
`109`	`109`	`}`
`110`	`110`
`111`		`- public function hasListeners(string $eventName = null): bool`
	`111`	`+ public function hasListeners(?string $eventName = null): bool`
`112`	`112`	`{`
`113`	`113`	`if (null !== $eventName) {`
`114`	`114`	`return !empty($this->listeners[$eventName]);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber): void;`
`50`	`50`	`*`
`51`	`51`	`* @return array<callable[]\|callable>`
`52`	`52`	`*/`
`53`		`- public function getListeners(string $eventName = null): array;`
	`53`	`+ public function getListeners(?string $eventName = null): array;`
`54`	`54`
`55`	`55`	`/**`
`56`	`56`	`* Gets the listener priority for a specific event.`
`@@ -62,5 +62,5 @@ public function getListenerPriority(string $eventName, callable $listener): ?int`
`62`	`62`	`/**`
`63`	`63`	`* Checks whether an event has any registered listeners.`
`64`	`64`	`*/`
`65`		`- public function hasListeners(string $eventName = null): bool;`
	`65`	`+ public function hasListeners(?string $eventName = null): bool;`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function __construct(EventDispatcherInterface $dispatcher)`
`25`	`25`	`$this->dispatcher = $dispatcher;`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function dispatch(object $event, string $eventName = null): object`
	`28`	`+ public function dispatch(object $event, ?string $eventName = null): object`
`29`	`29`	`{`
`30`	`30`	`return $this->dispatcher->dispatch($event, $eventName);`
`31`	`31`	`}`
`@@ -50,7 +50,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber): never`
`50`	`50`	`throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');`
`51`	`51`	`}`
`52`	`52`
`53`		`- public function getListeners(string $eventName = null): array`
	`53`	`+ public function getListeners(?string $eventName = null): array`
`54`	`54`	`{`
`55`	`55`	`return $this->dispatcher->getListeners($eventName);`
`56`	`56`	`}`
`@@ -60,7 +60,7 @@ public function getListenerPriority(string $eventName, callable\|array $listener)`
`60`	`60`	`return $this->dispatcher->getListenerPriority($eventName, $listener);`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function hasListeners(string $eventName = null): bool`
	`63`	`+ public function hasListeners(?string $eventName = null): bool`
`64`	`64`	`{`
`65`	`65`	`return $this->dispatcher->hasListeners($eventName);`
`66`	`66`	`}`