Skip to content

Commit 0ba89e4

Browse files
Merge branch '5.3' into 5.4
* 5.3: Fix tests on PHP 8.1 [Cache] Fix memory leak [DependencyInjection] fix inlining when non-shared services are involved [DoctrineBridge] add support for the JSON type [PHPUnitBridge] Fix Uncaught ValueError [FrameworkBundle] fix registering late resettable services [Validator] Missing translations for Greek (el) translate for japanese 101,102,103 [HttpClient] Curl http client has to reinit curl multi handle on reset [Validator] Add Swedish translation for issue #43737
2 parents 48069c2 + 6025b53 commit 0ba89e4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/DateFormatter/Verification/IntlDateFormatterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected function getDateFormatter($locale, $datetype, $timetype, $timezone = n
6161
{
6262
IntlTestHelper::requireFullIntl($this, '55.1');
6363

64-
if (!$formatter = new \IntlDateFormatter($locale, $datetype, $timetype, $timezone, $calendar, $pattern)) {
64+
if (!$formatter = new \IntlDateFormatter($locale, $datetype ?? IntlDateFormatter::FULL, $timetype ?? IntlDateFormatter::FULL, $timezone, $calendar, $pattern)) {
6565
throw new \InvalidArgumentException(intl_get_error_message());
6666
}
6767

0 commit comments

Comments
 (0)