Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit a59c23a71f51 · 2024-01-23T15:51:35.000+01:00
* 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
diff --git a/ChatworkTransport.php b/ChatworkTransport.php
@@ -31,7 +31,7 @@ class ChatworkTransport extends AbstractTransport
     private string $apiToken;
     private string $roomId;
 
-    public function __construct(#[\SensitiveParameter] string $apiToken, string $roomId, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(#[\SensitiveParameter] string $apiToken, string $roomId, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->apiToken = $apiToken;
         $this->roomId = $roomId;
diff --git a/Tests/ChatworkTransportTest.php b/Tests/ChatworkTransportTest.php
@@ -24,7 +24,7 @@
 
 class ChatworkTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null): TransportInterface
+    public static function createTransport(?HttpClientInterface $client = null): TransportInterface
     {
         return (new ChatworkTransport('testToken', 'testRoomId', $client ?? new MockHttpClient()))->setHost('host.test');
     }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class ChatworkTransport extends AbstractTransport`
`31`	`31`	`private string $apiToken;`
`32`	`32`	`private string $roomId;`
`33`	`33`
`34`		`- public function __construct(#[\SensitiveParameter] string $apiToken, string $roomId, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)`
	`34`	`+ public function __construct(#[\SensitiveParameter] string $apiToken, string $roomId, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)`
`35`	`35`	`{`
`36`	`36`	`$this->apiToken = $apiToken;`
`37`	`37`	`$this->roomId = $roomId;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`class ChatworkTransportTest extends TransportTestCase`
`26`	`26`	`{`
`27`		`- public static function createTransport(HttpClientInterface $client = null): TransportInterface`
	`27`	`+ public static function createTransport(?HttpClientInterface $client = null): TransportInterface`
`28`	`28`	`{`
`29`	`29`	`return (new ChatworkTransport('testToken', 'testRoomId', $client ?? new MockHttpClient()))->setHost('host.test');`
`30`	`30`	`}`