Skip to content

Commit 974f522

Browse files
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
2 parents d3bdba1 + 797585c commit 974f522

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Tests/ZulipTransportTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
final class ZulipTransportTest extends TransportTestCase
2323
{
24-
public static function createTransport(HttpClientInterface $client = null): ZulipTransport
24+
public static function createTransport(?HttpClientInterface $client = null): ZulipTransport
2525
{
2626
return (new ZulipTransport('testEmail', 'testToken', 'testChannel', $client ?? new MockHttpClient()))->setHost('test.host');
2727
}

ZulipOptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ final class ZulipOptions implements MessageOptionsInterface
2121
private ?string $topic;
2222
private ?string $recipient;
2323

24-
public function __construct(string $topic = null, string $recipient = null)
24+
public function __construct(?string $topic = null, ?string $recipient = null)
2525
{
2626
$this->topic = $topic;
2727
$this->recipient = $recipient;

ZulipTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class ZulipTransport extends AbstractTransport
3131
private string $token;
3232
private string $channel;
3333

34-
public function __construct(string $email, #[\SensitiveParameter] string $token, string $channel, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
34+
public function __construct(string $email, #[\SensitiveParameter] string $token, string $channel, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
3535
{
3636
$this->email = $email;
3737
$this->token = $token;

0 commit comments

Comments
 (0)