Skip to content

Commit 905a22c

Browse files
committed
Merge branch '5.2' into 5.3
* 5.2: Fix incompatible implicit float-to-int conversions [Translation] Don't pass null to strtoupper() cs fix [String] Fix implicit float-to-int casts [DependencyInjection] Don't pass null to trim() Add return types to JsonSerializable implementations Fix Serializable deprecations triggered by token mocks Add missing security translations
2 parents 1d3953e + 2382e8e commit 905a22c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Command/Descriptor/CliDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function describe(OutputInterface $output, Data $data, array $context, in
4242
$io = $output instanceof SymfonyStyle ? $output : new SymfonyStyle(new ArrayInput([]), $output);
4343
$this->dumper->setColors($output->isDecorated());
4444

45-
$rows = [['date', date('r', $context['timestamp'])]];
45+
$rows = [['date', date('r', (int) $context['timestamp'])]];
4646
$lastIdentifier = $this->lastIdentifier;
4747
$this->lastIdentifier = $clientId;
4848

Command/Descriptor/HtmlDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function describe(OutputInterface $output, Data $data, array $context, in
9494

9595
private function extractDate(array $context, string $format = 'r'): string
9696
{
97-
return date($format, $context['timestamp']);
97+
return date($format, (int) $context['timestamp']);
9898
}
9999

100100
private function renderTags(array $tags): string

0 commit comments

Comments
 (0)