Merge branch '7.0' into 7.1

nicolas-grekas · nicolas-grekas · commit 2fc70fd3f393 · 2024-01-23T16:06:13.000+01:00
* 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
diff --git a/Channel/AbstractChannel.php b/Channel/AbstractChannel.php
@@ -23,7 +23,7 @@ abstract class AbstractChannel implements ChannelInterface
     protected ?TransportInterface $transport;
     protected ?MessageBusInterface $bus;
 
-    public function __construct(TransportInterface $transport = null, MessageBusInterface $bus = null)
+    public function __construct(?TransportInterface $transport = null, ?MessageBusInterface $bus = null)
     {
         if (null === $transport && null === $bus) {
             throw new LogicException(sprintf('"%s" needs a Transport or a Bus but both cannot be "null".', static::class));
diff --git a/Channel/BrowserChannel.php b/Channel/BrowserChannel.php
@@ -28,7 +28,7 @@ public function __construct(
     ) {
     }
 
-    public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
+    public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void
     {
         if (null === $request = $this->stack->getCurrentRequest()) {
             return;
diff --git a/Channel/ChannelInterface.php b/Channel/ChannelInterface.php
@@ -19,7 +19,7 @@
  */
 interface ChannelInterface
 {
-    public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void;
+    public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void;
 
     public function supports(Notification $notification, RecipientInterface $recipient): bool;
 }
diff --git a/Channel/ChatChannel.php b/Channel/ChatChannel.php
@@ -21,7 +21,7 @@
  */
 class ChatChannel extends AbstractChannel
 {
-    public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
+    public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void
     {
         $message = null;
         if ($notification instanceof ChatNotificationInterface) {
diff --git a/Channel/EmailChannel.php b/Channel/EmailChannel.php
@@ -34,7 +34,7 @@ class EmailChannel implements ChannelInterface
     public function __construct(
         private ?TransportInterface $transport = null,
         private ?MessageBusInterface $bus = null,
-        string $from = null,
+        ?string $from = null,
         private ?Envelope $envelope = null,
     ) {
         if (null === $transport && null === $bus) {
@@ -47,7 +47,7 @@ public function __construct(
     /**
      * @param EmailRecipientInterface $recipient
      */
-    public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
+    public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void
     {
         $message = null;
         if ($notification instanceof EmailNotificationInterface) {
diff --git a/Channel/PushChannel.php b/Channel/PushChannel.php
@@ -21,7 +21,7 @@
  */
 class PushChannel extends AbstractChannel
 {
-    public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
+    public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void
     {
         $message = null;
         if ($notification instanceof PushNotificationInterface) {
diff --git a/Channel/SmsChannel.php b/Channel/SmsChannel.php
@@ -25,7 +25,7 @@ class SmsChannel extends AbstractChannel
     /**
      * @param SmsRecipientInterface $recipient
      */
-    public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
+    public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void
     {
         $message = null;
         if ($notification instanceof SmsNotificationInterface) {
diff --git a/DataCollector/NotificationDataCollector.php b/DataCollector/NotificationDataCollector.php
@@ -27,7 +27,7 @@ public function __construct(
     ) {
     }
 
-    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->logger->getEvents();
     }
diff --git a/Event/NotificationEvents.php b/Event/NotificationEvents.php
@@ -35,7 +35,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;
@@ -54,7 +54,7 @@ public function getEvents(string $name = null): array
     /**
      * @return MessageInterface[]
      */
-    public function getMessages(string $name = null): array
+    public function getMessages(?string $name = null): array
     {
         $events = $this->getEvents($name);
         $messages = [];
diff --git a/Exception/IncompleteDsnException.php b/Exception/IncompleteDsnException.php
@@ -19,7 +19,7 @@ class IncompleteDsnException extends InvalidArgumentException
     public function __construct(
         string $message,
         private ?string $dsn = null,
-        \Throwable $previous = null,
+        ?\Throwable $previous = null,
     ) {
         if ($dsn) {
             $message = sprintf('Invalid "%s" notifier DSN: %s', $dsn, $message);
diff --git a/Exception/MissingRequiredOptionException.php b/Exception/MissingRequiredOptionException.php
@@ -16,7 +16,7 @@
  */
 class MissingRequiredOptionException extends IncompleteDsnException
 {
-    public function __construct(string $option, string $dsn = null, \Throwable $previous = null)
+    public function __construct(string $option, ?string $dsn = null, ?\Throwable $previous = null)
     {
         $message = sprintf('The option "%s" is required but missing.', $option);
 
diff --git a/Exception/MultipleExclusiveOptionsUsedException.php b/Exception/MultipleExclusiveOptionsUsedException.php
@@ -20,7 +20,7 @@ class MultipleExclusiveOptionsUsedException extends InvalidArgumentException
      * @param string[] $usedExclusiveOptions
      * @param string[] $exclusiveOptions
      */
-    public function __construct(array $usedExclusiveOptions, array $exclusiveOptions, \Throwable $previous = null)
+    public function __construct(array $usedExclusiveOptions, array $exclusiveOptions, ?\Throwable $previous = null)
     {
         $message = sprintf(
             'Multiple exclusive options have been used "%s". Only one of "%s" can be used.',
diff --git a/Exception/TransportException.php b/Exception/TransportException.php
@@ -24,7 +24,7 @@ public function __construct(
         string $message,
         private ResponseInterface $response,
         int $code = 0,
-        \Throwable $previous = null,
+        ?\Throwable $previous = null,
     ) {
         $this->debug .= $response->getInfo('debug') ?? '';
 
diff --git a/Exception/UnsupportedSchemeException.php b/Exception/UnsupportedSchemeException.php
@@ -321,7 +321,7 @@ class UnsupportedSchemeException extends LogicException
     /**
      * @param string[] $supported
      */
-    public function __construct(Dsn $dsn, string $name = null, array $supported = [], \Throwable $previous = null)
+    public function __construct(Dsn $dsn, ?string $name = null, array $supported = [], ?\Throwable $previous = null)
     {
         $provider = $dsn->getScheme();
         if (false !== $pos = strpos($provider, '+')) {
diff --git a/Notification/ChatNotificationInterface.php b/Notification/ChatNotificationInterface.php
@@ -19,5 +19,5 @@
  */
 interface ChatNotificationInterface
 {
-    public function asChatMessage(RecipientInterface $recipient, string $transport = null): ?ChatMessage;
+    public function asChatMessage(RecipientInterface $recipient, ?string $transport = null): ?ChatMessage;
 }
diff --git a/Notification/EmailNotificationInterface.php b/Notification/EmailNotificationInterface.php
@@ -19,5 +19,5 @@
  */
 interface EmailNotificationInterface
 {
-    public function asEmailMessage(EmailRecipientInterface $recipient, string $transport = null): ?EmailMessage;
+    public function asEmailMessage(EmailRecipientInterface $recipient, ?string $transport = null): ?EmailMessage;
 }
diff --git a/Notification/PushNotificationInterface.php b/Notification/PushNotificationInterface.php
@@ -16,5 +16,5 @@
 
 interface PushNotificationInterface
 {
-    public function asPushMessage(RecipientInterface $recipient, string $transport = null): ?PushMessage;
+    public function asPushMessage(RecipientInterface $recipient, ?string $transport = null): ?PushMessage;
 }
diff --git a/Notification/SmsNotificationInterface.php b/Notification/SmsNotificationInterface.php
@@ -19,5 +19,5 @@
  */
 interface SmsNotificationInterface
 {
-    public function asSmsMessage(SmsRecipientInterface $recipient, string $transport = null): ?SmsMessage;
+    public function asSmsMessage(SmsRecipientInterface $recipient, ?string $transport = null): ?SmsMessage;
 }
diff --git a/Test/TransportFactoryTestCase.php b/Test/TransportFactoryTestCase.php
@@ -86,7 +86,7 @@ public function testCreate(string $expected, string $dsn)
     /**
      * @dataProvider unsupportedSchemeProvider
      */
-    public function testUnsupportedSchemeException(string $dsn, string $message = null)
+    public function testUnsupportedSchemeException(string $dsn, ?string $message = null)
     {
         $factory = $this->createFactory();
 
@@ -103,7 +103,7 @@ public function testUnsupportedSchemeException(string $dsn, string $message = nu
     /**
      * @dataProvider incompleteDsnProvider
      */
-    public function testIncompleteDsnException(string $dsn, string $message = null)
+    public function testIncompleteDsnException(string $dsn, ?string $message = null)
     {
         $factory = $this->createFactory();
 
@@ -120,7 +120,7 @@ public function testIncompleteDsnException(string $dsn, string $message = null)
     /**
      * @dataProvider missingRequiredOptionProvider
      */
-    public function testMissingRequiredOptionException(string $dsn, string $message = null)
+    public function testMissingRequiredOptionException(string $dsn, ?string $message = null)
     {
         $factory = $this->createFactory();
 
diff --git a/Test/TransportTestCase.php b/Test/TransportTestCase.php
@@ -27,7 +27,7 @@ abstract class TransportTestCase extends TestCase
     protected const CUSTOM_HOST = 'host.test';
     protected const CUSTOM_PORT = 42;
 
-    abstract public static function createTransport(HttpClientInterface $client = null): TransportInterface;
+    abstract public static function createTransport(?HttpClientInterface $client = null): TransportInterface;
 
     /**
      * @return iterable<array{0: string, 1: TransportInterface}>
@@ -55,7 +55,7 @@ public function testToString(string $expected, TransportInterface $transport)
     /**
      * @dataProvider supportedMessagesProvider
      */
-    public function testSupportedMessages(MessageInterface $message, TransportInterface $transport = null)
+    public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
     {
         $transport ??= $this->createTransport();
 
@@ -65,7 +65,7 @@ public function testSupportedMessages(MessageInterface $message, TransportInterf
     /**
      * @dataProvider unsupportedMessagesProvider
      */
-    public function testUnsupportedMessages(MessageInterface $message, TransportInterface $transport = null)
+    public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
     {
         $transport ??= $this->createTransport();
 
@@ -75,7 +75,7 @@ public function testUnsupportedMessages(MessageInterface $message, TransportInte
     /**
      * @dataProvider unsupportedMessagesProvider
      */
-    public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, TransportInterface $transport = null)
+    public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null)
     {
         $transport ??= $this->createTransport();
 
diff --git a/Tests/Channel/AbstractChannelTest.php b/Tests/Channel/AbstractChannelTest.php
@@ -32,7 +32,7 @@ public function testChannelCannotBeConstructedWithoutTransportAndBus()
 
 class DummyChannel extends AbstractChannel
 {
-    public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
+    public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void
     {
         return;
     }
diff --git a/Tests/Event/FailedMessageEventTest.php b/Tests/Event/FailedMessageEventTest.php
@@ -58,7 +58,7 @@ public function testFailedMessageEventIsDisptachIfError()
         $transport = new class($clientMock, $eventDispatcherMock) extends AbstractTransport {
             public NullTransportException $exception;
 
-            public function __construct($client, EventDispatcherInterface $dispatcher = null)
+            public function __construct($client, ?EventDispatcherInterface $dispatcher = null)
             {
                 $this->exception = new NullTransportException();
                 parent::__construct($client, $dispatcher);
diff --git a/Tests/Mailer/DummyMailer.php b/Tests/Mailer/DummyMailer.php
@@ -22,7 +22,7 @@ class DummyMailer implements MailerInterface
 {
     private RawMessage $sentMessage;
 
-    public function send(RawMessage $message, Envelope $envelope = null): void
+    public function send(RawMessage $message, ?Envelope $envelope = null): void
     {
         $this->sentMessage = $message;
     }
diff --git a/Tests/Transport/DsnTest.php b/Tests/Transport/DsnTest.php
@@ -21,7 +21,7 @@ final class DsnTest extends TestCase
     /**
      * @dataProvider constructProvider
      */
-    public function testConstruct(string $dsnString, string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = [], string $path = null)
+    public function testConstruct(string $dsnString, string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [], ?string $path = null)
     {
         $dsn = new Dsn($dsnString);
         $this->assertSame($dsnString, $dsn->getOriginalDsn());
@@ -172,7 +172,7 @@ public static function invalidDsnProvider(): iterable
     /**
      * @dataProvider getOptionProvider
      */
-    public function testGetOption($expected, string $dsnString, string $option, string $default = null)
+    public function testGetOption($expected, string $dsnString, string $option, ?string $default = null)
     {
         $dsn = new Dsn($dsnString);
 
diff --git a/Transport.php b/Transport.php
@@ -104,14 +104,14 @@ final class Transport
         Bridge\Zulip\ZulipTransportFactory::class,
     ];
 
-    public static function fromDsn(#[\SensitiveParameter] string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): TransportInterface
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, ?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null): TransportInterface
     {
         $factory = new self(self::getDefaultFactories($dispatcher, $client));
 
         return $factory->fromString($dsn);
     }
 
-    public static function fromDsns(#[\SensitiveParameter] array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): TransportInterface
+    public static function fromDsns(#[\SensitiveParameter] array $dsns, ?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null): TransportInterface
     {
         $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client)));
 
@@ -178,7 +178,7 @@ private function createFromDsns(#[\SensitiveParameter] array $dsns): array
     /**
      * @return TransportFactoryInterface[]
      */
-    private static function getDefaultFactories(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): iterable
+    private static function getDefaultFactories(?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null): iterable
     {
         foreach (self::FACTORY_CLASSES as $factoryClass) {
             if (class_exists($factoryClass)) {
diff --git a/Transport/AbstractTransport.php b/Transport/AbstractTransport.php
@@ -34,7 +34,7 @@ abstract class AbstractTransport implements TransportInterface
     protected ?string $host = null;
     protected ?int $port = null;
 
-    public function __construct(HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->client = $client;
         if (null === $client) {
diff --git a/Transport/AbstractTransportFactory.php b/Transport/AbstractTransportFactory.php
@@ -24,7 +24,7 @@ abstract class AbstractTransportFactory implements TransportFactoryInterface
     protected ?EventDispatcherInterface $dispatcher;
     protected ?HttpClientInterface $client;
 
-    public function __construct(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null)
+    public function __construct(?EventDispatcherInterface $dispatcher = null, ?HttpClientInterface $client = null)
     {
         $this->dispatcher = $dispatcher;
         $this->client = $client;
diff --git a/Transport/Dsn.php b/Transport/Dsn.php
@@ -74,7 +74,7 @@ public function getPassword(): ?string
         return $this->password;
     }
 
-    public function getPort(int $default = null): ?int
+    public function getPort(?int $default = null): ?int
     {
         return $this->port ?? $default;
     }
diff --git a/Transport/NullTransport.php b/Transport/NullTransport.php
@@ -25,7 +25,7 @@ class NullTransport implements TransportInterface
 {
     private ?EventDispatcherInterface $dispatcher;
 
-    public function __construct(EventDispatcherInterface $dispatcher = null)
+    public function __construct(?EventDispatcherInterface $dispatcher = null)
     {
         $this->dispatcher = $dispatcher;
     }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ abstract class AbstractChannel implements ChannelInterface`
`23`	`23`	`protected ?TransportInterface $transport;`
`24`	`24`	`protected ?MessageBusInterface $bus;`
`25`	`25`
`26`		`- public function __construct(TransportInterface $transport = null, MessageBusInterface $bus = null)`
	`26`	`+ public function __construct(?TransportInterface $transport = null, ?MessageBusInterface $bus = null)`
`27`	`27`	`{`
`28`	`28`	`if (null === $transport && null === $bus) {`
`29`	`29`	`throw new LogicException(sprintf('"%s" needs a Transport or a Bus but both cannot be "null".', static::class));`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(`
`28`	`28`	`) {`
`29`	`29`	`}`
`30`	`30`
`31`		`- public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void`
	`31`	`+ public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void`
`32`	`32`	`{`
`33`	`33`	`if (null === $request = $this->stack->getCurrentRequest()) {`
`34`	`34`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*/`
`20`	`20`	`interface ChannelInterface`
`21`	`21`	`{`
`22`		`- public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void;`
	`22`	`+ public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void;`
`23`	`23`
`24`	`24`	`public function supports(Notification $notification, RecipientInterface $recipient): bool;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class ChatChannel extends AbstractChannel`
`23`	`23`	`{`
`24`		`- public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void`
	`24`	`+ public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void`
`25`	`25`	`{`
`26`	`26`	`$message = null;`
`27`	`27`	`if ($notification instanceof ChatNotificationInterface) {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class SmsChannel extends AbstractChannel`
`25`	`25`	`/**`
`26`	`26`	`* @param SmsRecipientInterface $recipient`
`27`	`27`	`*/`
`28`		`- public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void`
	`28`	`+ public function notify(Notification $notification, RecipientInterface $recipient, ?string $transportName = null): void`
`29`	`29`	`{`
`30`	`30`	`$message = null;`
`31`	`31`	`if ($notification instanceof SmsNotificationInterface) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __construct(`
`27`	`27`	`) {`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function collect(Request $request, Response $response, \Throwable $exception = null): void`
	`30`	`+ public function collect(Request $request, Response $response, ?\Throwable $exception = null): void`
`31`	`31`	`{`
`32`	`32`	`$this->data['events'] = $this->logger->getEvents();`
`33`	`33`	`}`