Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit ae9d3a6f3003 · 2024-01-23T15:51:35.000+01:00
* 6.3:
  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
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;
@@ -93,7 +93,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
         $this->dispatcher->removeSubscriber($subscriber);
     }
 
-    public function getListeners(string $eventName = null): array
+    public function getListeners(?string $eventName = null): array
     {
         return $this->dispatcher->getListeners($eventName);
     }
@@ -113,12 +113,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;
 
@@ -153,7 +153,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 [];
@@ -171,7 +171,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();
@@ -213,7 +213,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
@@ -59,7 +59,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber);
      *
      * @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.
@@ -71,5 +71,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);
     }
@@ -62,7 +62,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
         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);
     }
@@ -72,7 +72,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;`
`@@ -93,7 +93,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)`
`93`	`93`	`$this->dispatcher->removeSubscriber($subscriber);`
`94`	`94`	`}`
`95`	`95`
`96`		`- public function getListeners(string $eventName = null): array`
	`96`	`+ public function getListeners(?string $eventName = null): array`
`97`	`97`	`{`
`98`	`98`	`return $this->dispatcher->getListeners($eventName);`
`99`	`99`	`}`
`@@ -113,12 +113,12 @@ public function getListenerPriority(string $eventName, callable\|array $listener)`
`113`	`113`	`return $this->dispatcher->getListenerPriority($eventName, $listener);`
`114`	`114`	`}`
`115`	`115`
`116`		`- public function hasListeners(string $eventName = null): bool`
	`116`	`+ public function hasListeners(?string $eventName = null): bool`
`117`	`117`	`{`
`118`	`118`	`return $this->dispatcher->hasListeners($eventName);`
`119`	`119`	`}`
`120`	`120`
`121`		`- public function dispatch(object $event, string $eventName = null): object`
	`121`	`+ public function dispatch(object $event, ?string $eventName = null): object`
`122`	`122`	`{`
`123`	`123`	`$eventName ??= $event::class;`
`124`	`124`
`@@ -153,7 +153,7 @@ public function dispatch(object $event, string $eventName = null): object`
`153`	`153`	`return $event;`
`154`	`154`	`}`
`155`	`155`
`156`		`- public function getCalledListeners(Request $request = null): array`
	`156`	`+ public function getCalledListeners(?Request $request = null): array`
`157`	`157`	`{`
`158`	`158`	`if (null === $this->callStack) {`
`159`	`159`	`return [];`
`@@ -171,7 +171,7 @@ public function getCalledListeners(Request $request = null): array`
`171`	`171`	`return $called;`
`172`	`172`	`}`
`173`	`173`
`174`		`- public function getNotCalledListeners(Request $request = null): array`
	`174`	`+ public function getNotCalledListeners(?Request $request = null): array`
`175`	`175`	`{`
`176`	`176`	`try {`
`177`	`177`	`$allListeners = $this->dispatcher instanceof EventDispatcher ? $this->getListenersWithPriority() : $this->getListenersWithoutPriority();`
`@@ -213,7 +213,7 @@ public function getNotCalledListeners(Request $request = null): array`
`213`	`213`	`return $notCalled;`
`214`	`214`	`}`
`215`	`215`
`216`		`- public function getOrphanedEvents(Request $request = null): array`
	`216`	`+ public function getOrphanedEvents(?Request $request = null): array`
`217`	`217`	`{`
`218`	`218`	`if ($request) {`
`219`	`219`	`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
`@@ -59,7 +59,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber);`
`59`	`59`	`*`
`60`	`60`	`* @return array<callable[]\|callable>`
`61`	`61`	`*/`
`62`		`- public function getListeners(string $eventName = null): array;`
	`62`	`+ public function getListeners(?string $eventName = null): array;`
`63`	`63`
`64`	`64`	`/**`
`65`	`65`	`* Gets the listener priority for a specific event.`
`@@ -71,5 +71,5 @@ public function getListenerPriority(string $eventName, callable $listener): ?int`
`71`	`71`	`/**`
`72`	`72`	`* Checks whether an event has any registered listeners.`
`73`	`73`	`*/`
`74`		`- public function hasListeners(string $eventName = null): bool;`
	`74`	`+ public function hasListeners(?string $eventName = null): bool;`
`75`	`75`	`}`
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`	`}`
`@@ -62,7 +62,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)`
`62`	`62`	`throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');`
`63`	`63`	`}`
`64`	`64`
`65`		`- public function getListeners(string $eventName = null): array`
	`65`	`+ public function getListeners(?string $eventName = null): array`
`66`	`66`	`{`
`67`	`67`	`return $this->dispatcher->getListeners($eventName);`
`68`	`68`	`}`
`@@ -72,7 +72,7 @@ public function getListenerPriority(string $eventName, callable\|array $listener)`
`72`	`72`	`return $this->dispatcher->getListenerPriority($eventName, $listener);`
`73`	`73`	`}`
`74`	`74`
`75`		`- public function hasListeners(string $eventName = null): bool`
	`75`	`+ public function hasListeners(?string $eventName = null): bool`
`76`	`76`	`{`
`77`	`77`	`return $this->dispatcher->hasListeners($eventName);`
`78`	`78`	`}`