Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 15d88e975964 · 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/SmsapiTransport.php b/SmsapiTransport.php
@@ -34,7 +34,7 @@ final class SmsapiTransport extends AbstractTransport
     private bool $fast = false;
     private bool $test = false;
 
-    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/SmsapiTransportTest.php b/Tests/SmsapiTransportTest.php
@@ -23,7 +23,7 @@
 
 final class SmsapiTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null, string $from = '', bool $fast = false, bool $test = false): SmsapiTransport
+    public static function createTransport(?HttpClientInterface $client = null, string $from = '', bool $fast = false, bool $test = false): SmsapiTransport
     {
         return (new SmsapiTransport('testToken', $from, $client ?? new MockHttpClient()))->setHost('test.host')->setFast($fast)->setTest($test);
     }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ final class SmsapiTransport extends AbstractTransport`
`34`	`34`	`private bool $fast = false;`
`35`	`35`	`private bool $test = false;`
`36`	`36`
`37`		`- public function __construct(#[\SensitiveParameter] string $authToken, string $from = '', HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)`
	`37`	`+ public function __construct(#[\SensitiveParameter] string $authToken, string $from = '', ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)`
`38`	`38`	`{`
`39`	`39`	`$this->authToken = $authToken;`
`40`	`40`	`$this->from = $from;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`final class SmsapiTransportTest extends TransportTestCase`
`25`	`25`	`{`
`26`		`- public static function createTransport(HttpClientInterface $client = null, string $from = '', bool $fast = false, bool $test = false): SmsapiTransport`
	`26`	`+ public static function createTransport(?HttpClientInterface $client = null, string $from = '', bool $fast = false, bool $test = false): SmsapiTransport`
`27`	`27`	`{`
`28`	`28`	`return (new SmsapiTransport('testToken', $from, $client ?? new MockHttpClient()))->setHost('test.host')->setFast($fast)->setTest($test);`
`29`	`29`	`}`