Merge branch '6.3' into 6.4

* 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
symfony · Jan 23, 2024 · 09e1bb3 · 09e1bb3
2 parents 6e0d682 + 8668f53
commit 09e1bb3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Block/SlackActionsBlock.php b/Block/SlackActionsBlock.php
@@ -24,7 +24,7 @@ public function __construct()
     /**
      * @return $this
      */
-    public function button(string $text, string $url, string $style = null): static
+    public function button(string $text, string $url, ?string $style = null): static
     {
         if (25 === \count($this->options['elements'] ?? [])) {
             throw new \LogicException('Maximum number of buttons should not exceed 25.');

diff --git a/SlackTransport.php b/SlackTransport.php
@@ -31,7 +31,7 @@ final class SlackTransport extends AbstractTransport
     private string $accessToken;
     private ?string $chatChannel;
 
-    public function __construct(#[\SensitiveParameter] string $accessToken, string $channel = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(#[\SensitiveParameter] string $accessToken, ?string $channel = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
     {
         if (!preg_match('/^xox(b-|p-|a-2)/', $accessToken)) {
             throw new InvalidArgumentException('A valid Slack token needs to start with "xoxb-", "xoxp-" or "xoxa-2". See https://api.slack.com/authentication/token-types for further information.');

diff --git a/Tests/SlackOptionsTest.php b/Tests/SlackOptionsTest.php
@@ -27,7 +27,7 @@ final class SlackOptionsTest extends TestCase
      * @dataProvider toArrayProvider
      * @dataProvider toArraySimpleOptionsProvider
      */
-    public function testToArray(array $options, array $expected = null)
+    public function testToArray(array $options, ?array $expected = null)
     {
         $this->assertSame($expected ?? $options, (new SlackOptions($options))->toArray());
     }

diff --git a/Tests/SlackTransportTest.php b/Tests/SlackTransportTest.php
@@ -27,7 +27,7 @@
 
 final class SlackTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null, string $channel = null): SlackTransport
+    public static function createTransport(?HttpClientInterface $client = null, ?string $channel = null): SlackTransport
     {
         return new SlackTransport('xoxb-TestToken', $channel, $client ?? new MockHttpClient());
     }