Merge branch '6.4' into 7.0

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

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