Skip to content

Commit b0fd66f

Browse files
Merge branch '5.4' into 6.3
* 5.4: 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
1 parent 4ce5bdb commit b0fd66f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

MockClock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class MockClock implements ClockInterface
2222
{
2323
private \DateTimeImmutable $now;
2424

25-
public function __construct(\DateTimeImmutable|string $now = 'now', \DateTimeZone|string $timezone = null)
25+
public function __construct(\DateTimeImmutable|string $now = 'now', \DateTimeZone|string|null $timezone = null)
2626
{
2727
if (\is_string($timezone)) {
2828
$timezone = new \DateTimeZone($timezone);

MonotonicClock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class MonotonicClock implements ClockInterface
2222
private int $usOffset;
2323
private \DateTimeZone $timezone;
2424

25-
public function __construct(\DateTimeZone|string $timezone = null)
25+
public function __construct(\DateTimeZone|string|null $timezone = null)
2626
{
2727
if (false === $offset = hrtime()) {
2828
throw new \RuntimeException('hrtime() returned false: the runtime environment does not provide access to a monotonic timer.');

NativeClock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ final class NativeClock implements ClockInterface
2020
{
2121
private \DateTimeZone $timezone;
2222

23-
public function __construct(\DateTimeZone|string $timezone = null)
23+
public function __construct(\DateTimeZone|string|null $timezone = null)
2424
{
2525
if (\is_string($timezone ??= date_default_timezone_get())) {
2626
$this->timezone = new \DateTimeZone($timezone);

0 commit comments

Comments
 (0)