geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-02 18:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare the date formatter prototype pattern with the derived one once per pattern

Browse Source
This commit is contained in:
Fabien Potencier
2026-09-25 07:43:00 +02:00
parent c8d782ea0b
commit 10fe9808bb
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extra/intl-extra/IntlExtension.php
+17 -7
View File
@@ -186,7 +186,10 @@ final class IntlExtension extends AbstractExtension
private $listFormatters = [];
private $dateFormatterPrototype;
private $numberFormatterPrototype;
private array $prototypeDerivedPatterns = [];
/**
* @var array<string, string>
*/
private array $prototypePatterns = [];
public function __construct(?\IntlDateFormatter $dateFormatterPrototype = null, ?\NumberFormatter $numberFormatterPrototype = null)
{
@@ -552,11 +555,19 @@ final class IntlExtension extends AbstractExtension
private function prototypePattern(): string
{
$pattern = $this->dateFormatterPrototype->getPattern();
if (!\is_string($pattern) || '' === $pattern) {
return '';
}
return $this->prototypePatterns[$pattern] ??= $pattern === $this->derivedPrototypePattern() ? '' : $pattern;
}
private function derivedPrototypePattern(): ?string
{
$dateType = $this->dateFormatterPrototype->getDateType();
$timeType = $this->dateFormatterPrototype->getTimeType();
if (!\is_string($pattern) || '' === $pattern || false === $dateType || false === $timeType) {
return \is_string($pattern) ? $pattern : '';
if (false === $dateType || false === $timeType) {
return null;
}
$locale = $this->prototypeLocale() ?: \Locale::getDefault();
@@ -566,10 +577,9 @@ final class IntlExtension extends AbstractExtension
$locale .= '@calendar='.$calendar->getType();
}
$key = $locale.'|'.$dateType.'|'.$timeType;
$this->prototypeDerivedPatterns[$key] ??= (new \IntlDateFormatter($locale, $dateType, $timeType))->getPattern();
$pattern = (new \IntlDateFormatter($locale, $dateType, $timeType))->getPattern();
return $pattern === $this->prototypeDerivedPatterns[$key] ? '' : $pattern;
return \is_string($pattern) ? $pattern : null;
}
private function createNumberFormatter(?string $locale, string $style, array $attrs = []): \NumberFormatter