Merge branch '7.0' into 7.1

nicolas-grekas · nicolas-grekas · commit a4f5ec73433c · 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/MessageMediaTransport.php b/MessageMediaTransport.php
@@ -33,8 +33,8 @@ public function __construct(
         #[\SensitiveParameter] private string $apiKey,
         #[\SensitiveParameter] private string $apiSecret,
         private ?string $from = null,
-        HttpClientInterface $client = null,
-        EventDiserInterface $diser = null,
+        ?HttpClientInterface $client = null,
+        ?EventDiserInterface $diser = null,
     ) {
         parent::__construct($client, $diser);
     }
diff --git a/Tests/MessageMediaTransportTest.php b/Tests/MessageMediaTransportTest.php
@@ -25,7 +25,7 @@
 
 final class MessageMediaTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null, string $from = null): MessageMediaTransport
+    public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): MessageMediaTransport
     {
         return new MessageMediaTransport('apiKey', 'apiSecret', $from, $client ?? new MockHttpClient());
     }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`final class MessageMediaTransportTest extends TransportTestCase`
`27`	`27`	`{`
`28`		`-public static function createTransport(HttpClientInterface $client = null, string $from = null): MessageMediaTransport`
	`28`	`+public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): MessageMediaTransport`
`29`	`29`	`{`
`30`	`30`	`return new MessageMediaTransport('apiKey', 'apiSecret', $from, $client ?? new MockHttpClient());`
`31`	`31`	`}`