Merge pull request #20018 from rob006/patch-1

Use `self` to access private method in `BaseFormatConverter`
This commit is contained in:
Bizley
2023-10-20 08:32:54 +02:00
committed by GitHub

View File

@ -103,7 +103,7 @@ class BaseFormatConverter
{ {
if (isset(self::$_icuShortFormats[$pattern])) { if (isset(self::$_icuShortFormats[$pattern])) {
if (extension_loaded('intl')) { if (extension_loaded('intl')) {
$pattern = static::createFormatter($locale, $type, $pattern); $pattern = self::createFormatter($locale, $type, $pattern);
} else { } else {
return static::$phpFallbackDatePatterns[$pattern][$type]; return static::$phpFallbackDatePatterns[$pattern][$type];
} }
@ -347,7 +347,7 @@ class BaseFormatConverter
{ {
if (isset(self::$_icuShortFormats[$pattern])) { if (isset(self::$_icuShortFormats[$pattern])) {
if (extension_loaded('intl')) { if (extension_loaded('intl')) {
$pattern = static::createFormatter($locale, $type, $pattern); $pattern = self::createFormatter($locale, $type, $pattern);
} else { } else {
return static::$juiFallbackDatePatterns[$pattern][$type]; return static::$juiFallbackDatePatterns[$pattern][$type];
} }