Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit 2924497df109 · 2024-01-23T15:35:58.000+01:00
* 5.4:
  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/MessageBirdTransport.php b/MessageBirdTransport.php
@@ -31,7 +31,7 @@ final class MessageBirdTransport extends AbstractTransport
     private string $token;
     private string $from;
 
-    public function __construct(#[\SensitiveParameter] string $token, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(#[\SensitiveParameter] string $token, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->token = $token;
         $this->from = $from;
diff --git a/Tests/MessageBirdTransportTest.php b/Tests/MessageBirdTransportTest.php
@@ -22,7 +22,7 @@
 
 final class MessageBirdTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null): MessageBirdTransport
+    public static function createTransport(?HttpClientInterface $client = null): MessageBirdTransport
     {
         return new MessageBirdTransport('token', 'from', $client ?? new MockHttpClient());
     }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ final class MessageBirdTransport extends AbstractTransport`
`31`	`31`	`private string $token;`
`32`	`32`	`private string $from;`
`33`	`33`
`34`		`- public function __construct(#[\SensitiveParameter] string $token, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)`
	`34`	`+ public function __construct(#[\SensitiveParameter] string $token, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)`
`35`	`35`	`{`
`36`	`36`	`$this->token = $token;`
`37`	`37`	`$this->from = $from;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`final class MessageBirdTransportTest extends TransportTestCase`
`24`	`24`	`{`
`25`		`- public static function createTransport(HttpClientInterface $client = null): MessageBirdTransport`
	`25`	`+ public static function createTransport(?HttpClientInterface $client = null): MessageBirdTransport`
`26`	`26`	`{`
`27`	`27`	`return new MessageBirdTransport('token', 'from', $client ?? new MockHttpClient());`
`28`	`28`	`}`