Skip to content

Commit 8c439d8

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 c4ef274 + 45c6d55 commit 8c439d8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Tests/ZendeskTransportTest.php

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

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

ZendeskOptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ final class ZendeskOptions implements MessageOptionsInterface
2020
{
2121
private ?string $priority;
2222

23-
public function __construct(string $priority = null)
23+
public function __construct(?string $priority = null)
2424
{
2525
$this->priority = $priority;
2626
}

ZendeskTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class ZendeskTransport extends AbstractTransport
2929
private string $email;
3030
private string $token;
3131

32-
public function __construct(string $email, #[\SensitiveParameter] string $token, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
32+
public function __construct(string $email, #[\SensitiveParameter] string $token, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
3333
{
3434
parent::__construct($client, $dispatcher);
3535

@@ -47,7 +47,7 @@ public function supports(MessageInterface $message): bool
4747
return $message instanceof ChatMessage && (null === $message->getOptions() || $message->getOptions() instanceof ZendeskOptions);
4848
}
4949

50-
protected function doSend(MessageInterface $message = null): SentMessage
50+
protected function doSend(?MessageInterface $message = null): SentMessage
5151
{
5252
if (!$message instanceof ChatMessage) {
5353
throw new UnsupportedMessageTypeException(__CLASS__, ChatMessage::class, $message);

0 commit comments

Comments
 (0)