Merge branch '6.3' into 6.4

* 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

Author: nicolas-grekas

DataCollector/MessageDataCollector.php

@@ -29,7 +29,7 @@ public function __construct(MessageLoggerListener $logger)
         $this->events = $logger->getEvents();
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         $this->data['events'] = $this->events;
     }

Event/MessageEvents.php

@@ -42,7 +42,7 @@ public function getTransports(): array
     /**
      * @return MessageEvent[]
      */
-    public function getEvents(string $name = null): array
+    public function getEvents(?string $name = null): array
     {
         if (null === $name) {
             return $this->events;
@@ -61,7 +61,7 @@ public function getEvents(string $name = null): array
     /**
      * @return RawMessage[]
      */
-    public function getMessages(string $name = null): array
+    public function getMessages(?string $name = null): array
     {
         $events = $this->getEvents($name);
         $messages = [];

EventListener/EnvelopeListener.php

@@ -33,7 +33,7 @@ class EnvelopeListener implements EventSubscriberInterface
     /**
      * @param array<Address|string> $recipients
      */
-    public function __construct(Address|string $sender = null, array $recipients = null)
+    public function __construct(Address|string|null $sender = null, ?array $recipients = null)
     {
         if (null !== $sender) {
             $this->sender = Address::create($sender);

EventListener/MessageListener.php

@@ -43,7 +43,7 @@ class MessageListener implements EventSubscriberInterface
     private array $headerRules = [];
     private ?BodyRendererInterface $renderer;
 
-    public function __construct(Headers $headers = null, BodyRendererInterface $renderer = null, array $headerRules = self::DEFAULT_RULES)
+    public function __construct(?Headers $headers = null, ?BodyRendererInterface $renderer = null, array $headerRules = self::DEFAULT_RULES)
     {
         $this->headers = $headers;
         $this->renderer = $renderer;

Exception/HttpTransportException.php

@@ -20,7 +20,7 @@ class HttpTransportException extends TransportException
 {
     private ResponseInterface $response;
 
-    public function __construct(string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message, ResponseInterface $response, int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 

Exception/UnsupportedSchemeException.php

@@ -78,7 +78,7 @@ class UnsupportedSchemeException extends LogicException
         ],
     ];
 
-    public function __construct(Dsn $dsn, string $name = null, array $supported = [])
+    public function __construct(Dsn $dsn, ?string $name = null, array $supported = [])
     {
         $provider = $dsn->getScheme();
         if (false !== $pos = strpos($provider, '+')) {

Mailer.php

@@ -29,14 +29,14 @@ final class Mailer implements MailerInterface
     private ?MessageBusInterface $bus;
     private ?EventDispatcherInterface $dispatcher;
 
-    public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(TransportInterface $transport, ?MessageBusInterface $bus = null, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->transport = $transport;
         $this->bus = $bus;
         $this->dispatcher = $dispatcher;
     }
 
-    public function send(RawMessage $message, Envelope $envelope = null): void
+    public function send(RawMessage $message, ?Envelope $envelope = null): void
     {
         if (null === $this->bus) {
             $this->transport->send($message, $envelope);

MailerInterface.php

@@ -26,5 +26,5 @@ interface MailerInterface
     /**
      * @throws TransportExceptionInterface
      */
-    public function send(RawMessage $message, Envelope $envelope = null): void;
+    public function send(RawMessage $message, ?Envelope $envelope = null): void;
 }

Messenger/SendEmailMessage.php

@@ -22,7 +22,7 @@ class SendEmailMessage
     private RawMessage $message;
     private ?Envelope $envelope;
 
-    public function __construct(RawMessage $message, Envelope $envelope = null)
+    public function __construct(RawMessage $message, ?Envelope $envelope = null)
     {
         $this->message = $message;
         $this->envelope = $envelope;

Test/Constraint/EmailCount.php

@@ -20,7 +20,7 @@ final class EmailCount extends Constraint
     private ?string $transport;
     private bool $queued;
 
-    public function __construct(int $expectedValue, string $transport = null, bool $queued = false)
+    public function __construct(int $expectedValue, ?string $transport = null, bool $queued = false)
     {
         $this->expectedValue = $expectedValue;
         $this->transport = $transport;