Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit d95cb4d040d2 · 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/FirebaseTransport.php b/FirebaseTransport.php
@@ -31,7 +31,7 @@ final class FirebaseTransport extends AbstractTransport
 
     private string $token;
 
-    public function __construct(#[\SensitiveParameter] string $token, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(#[\SensitiveParameter] string $token, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->token = $token;
         $this->client = $client;
diff --git a/Tests/FirebaseTransportTest.php b/Tests/FirebaseTransportTest.php
@@ -28,7 +28,7 @@
  */
 final class FirebaseTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null): FirebaseTransport
+    public static function createTransport(?HttpClientInterface $client = null): FirebaseTransport
     {
         return new FirebaseTransport('username:password', $client ?? new MockHttpClient());
     }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ final class FirebaseTransport extends AbstractTransport`
`31`	`31`
`32`	`32`	`private string $token;`
`33`	`33`
`34`		`- public function __construct(#[\SensitiveParameter] string $token, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)`
	`34`	`+ public function __construct(#[\SensitiveParameter] string $token, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)`
`35`	`35`	`{`
`36`	`36`	`$this->token = $token;`
`37`	`37`	`$this->client = $client;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*/`
`29`	`29`	`final class FirebaseTransportTest extends TransportTestCase`
`30`	`30`	`{`
`31`		`- public static function createTransport(HttpClientInterface $client = null): FirebaseTransport`
	`31`	`+ public static function createTransport(?HttpClientInterface $client = null): FirebaseTransport`
`32`	`32`	`{`
`33`	`33`	`return new FirebaseTransport('username:password', $client ?? new MockHttpClient());`
`34`	`34`	`}`