Skip to content

Commit 47498d1

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Notifier] fix firebase error handling so the transports doesn't try setting the success message, that doesn't exists. Remove wrong dep [Translation] Fix message key handling for the Localise provider [Serializer] Deprecate support for returning empty, iterable, countable, raw object when normalizing Fix ProgressBar to correctly clear multi-line formats [Mailer] Consume a PSR-14 event dispatcher Ignoring X-Transport header while signing email with DKIM Remove polyfills from ExpressionLanguage Update validators.tr.xlf [Form] fix typo in Danish translation [HttpKernel] Fix timestamp_rfc3339 in LoggerDataCollector Remove broken test case [PropertyInfo] Support for the never return type Show nice CLI output in Psalm action add more explicit error Signed-off-by: Alexander M. Turek <[email protected]>
2 parents 05a1b9d + f808c09 commit 47498d1

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Resources/translations/validators.da.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
</trans-unit>
121121
<trans-unit id="125">
122122
<source>Please enter a valid email address.</source>
123-
<target>Indtast venligst en gyldig emailaddresse.</target>
123+
<target>Indtast venligst en gyldig e-mailadresse.</target>
124124
</trans-unit>
125125
<trans-unit id="126">
126126
<source>Please select a valid option.</source>

Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
class DateTimeToStringTransformerTest extends TestCase
1919
{
20-
public function dataProvider()
20+
public function dataProvider(): array
2121
{
22-
$data = [
22+
return [
2323
['Y-m-d H:i:s', '2010-02-03 16:05:06', '2010-02-03 16:05:06 UTC'],
2424
['Y-m-d H:i:00', '2010-02-03 16:05:00', '2010-02-03 16:05:00 UTC'],
2525
['Y-m-d H:i', '2010-02-03 16:05', '2010-02-03 16:05:00 UTC'],
@@ -36,7 +36,6 @@ public function dataProvider()
3636

3737
// different day representations
3838
['Y-m-j', '2010-02-3', '2010-02-03 00:00:00 UTC'],
39-
['z', '33', '1970-02-03 00:00:00 UTC'],
4039

4140
// not bijective
4241
// this will not work as PHP will use actual date to replace missing info
@@ -63,8 +62,6 @@ public function dataProvider()
6362

6463
['Y-z', '2010-33', '2010-02-03 00:00:00 UTC'],
6564
];
66-
67-
return $data;
6865
}
6966

7067
/**

0 commit comments

Comments
 (0)