Skip to content

Commit 35569f7

Browse files
Merge branch '6.4' into 7.0
* 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
2 parents 794e0df + 0e52354 commit 35569f7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Tests/Transport/BeanstalkdTransportTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function testReceivesMessages()
5050
$this->assertSame($decodedMessage, $envelopes[0]->getMessage());
5151
}
5252

53-
private function getTransport(SerializerInterface $serializer = null, Connection $connection = null): BeanstalkdTransport
53+
private function getTransport(?SerializerInterface $serializer = null, ?Connection $connection = null): BeanstalkdTransport
5454
{
5555
$serializer ??= $this->createMock(SerializerInterface::class);
5656
$connection ??= $this->createMock(Connection::class);

Transport/BeanstalkdReceiver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class BeanstalkdReceiver implements ReceiverInterface, MessageCountAwareInterfac
2727
private Connection $connection;
2828
private SerializerInterface $serializer;
2929

30-
public function __construct(Connection $connection, SerializerInterface $serializer = null)
30+
public function __construct(Connection $connection, ?SerializerInterface $serializer = null)
3131
{
3232
$this->connection = $connection;
3333
$this->serializer = $serializer ?? new PhpSerializer();

Transport/BeanstalkdSender.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class BeanstalkdSender implements SenderInterface
2525
private Connection $connection;
2626
private SerializerInterface $serializer;
2727

28-
public function __construct(Connection $connection, SerializerInterface $serializer = null)
28+
public function __construct(Connection $connection, ?SerializerInterface $serializer = null)
2929
{
3030
$this->connection = $connection;
3131
$this->serializer = $serializer ?? new PhpSerializer();

Transport/BeanstalkdTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class BeanstalkdTransport implements TransportInterface, MessageCountAwareInterf
2727
private BeanstalkdReceiver $receiver;
2828
private BeanstalkdSender $sender;
2929

30-
public function __construct(Connection $connection, SerializerInterface $serializer = null)
30+
public function __construct(Connection $connection, ?SerializerInterface $serializer = null)
3131
{
3232
$this->connection = $connection;
3333
$this->serializer = $serializer ?? new PhpSerializer();

0 commit comments

Comments
 (0)