diff options
Diffstat (limited to 'vendor/commerceguys/intl/src/Formatter')
6 files changed, 44 insertions, 42 deletions
diff --git a/vendor/commerceguys/intl/src/Formatter/CurrencyFormatter.php b/vendor/commerceguys/intl/src/Formatter/CurrencyFormatter.php index 7d3b90d6e..a95fd5fcb 100644 --- a/vendor/commerceguys/intl/src/Formatter/CurrencyFormatter.php +++ b/vendor/commerceguys/intl/src/Formatter/CurrencyFormatter.php @@ -21,42 +21,42 @@ class CurrencyFormatter implements CurrencyFormatterInterface * * @var NumberFormatRepositoryInterface */ - protected $numberFormatRepository; + protected NumberFormatRepositoryInterface $numberFormatRepository; /** * The currency repository. * * @var CurrencyRepositoryInterface */ - protected $currencyRepository; + protected CurrencyRepositoryInterface $currencyRepository; /** * The default locale. * * @var string */ - protected $defaultLocale; + protected string $defaultLocale; /** * The loaded number formats. * * @var NumberFormat[] */ - protected $numberFormats = []; + protected array $numberFormats = []; /** * The loaded currencies. * * @var Currency[] */ - protected $currencies = []; + protected array $currencies = []; /** * The default options. * * @var array */ - protected $defaultOptions = [ + protected array $defaultOptions = [ 'locale' => 'en', 'use_grouping' => true, 'minimum_fraction_digits' => null, @@ -90,7 +90,7 @@ class CurrencyFormatter implements CurrencyFormatterInterface /** * {@inheritdoc} */ - public function format($number, $currencyCode, array $options = []) + public function format(string $number, string $currencyCode, array $options = []): string { if (!is_numeric($number)) { $message = sprintf('The provided value "%s" is not a valid number or numeric string.', $number); @@ -127,7 +127,7 @@ class CurrencyFormatter implements CurrencyFormatterInterface /** * {@inheritdoc} */ - public function parse($number, $currencyCode, array $options = []) + public function parse(string $number, string $currencyCode, array $options = []): string|bool { $this->validateOptions($options); $options = array_replace($this->defaultOptions, $options); @@ -151,7 +151,7 @@ class CurrencyFormatter implements CurrencyFormatterInterface * * @return NumberFormat */ - protected function getNumberFormat($locale) + protected function getNumberFormat(string $locale): NumberFormat { if (!isset($this->numberFormats[$locale])) { $this->numberFormats[$locale] = $this->numberFormatRepository->get($locale); @@ -168,7 +168,7 @@ class CurrencyFormatter implements CurrencyFormatterInterface * * @return Currency */ - protected function getCurrency($currencyCode, $locale) + protected function getCurrency(string $currencyCode, string $locale): Currency { if (!isset($this->currencies[$currencyCode][$locale])) { try { @@ -192,7 +192,7 @@ class CurrencyFormatter implements CurrencyFormatterInterface /** * {@inheritdoc} */ - protected function getAvailablePatterns(NumberFormat $numberFormat) + protected function getAvailablePatterns(NumberFormat $numberFormat): array { return [ 'standard' => $numberFormat->getCurrencyPattern(), diff --git a/vendor/commerceguys/intl/src/Formatter/CurrencyFormatterInterface.php b/vendor/commerceguys/intl/src/Formatter/CurrencyFormatterInterface.php index 3fc25fcc6..217171a4c 100644 --- a/vendor/commerceguys/intl/src/Formatter/CurrencyFormatterInterface.php +++ b/vendor/commerceguys/intl/src/Formatter/CurrencyFormatterInterface.php @@ -33,7 +33,7 @@ interface CurrencyFormatterInterface * * @return string The formatted number. */ - public function format($number, $currencyCode, array $options = []); + public function format(string $number, string $currencyCode, array $options = []): string; /** * Parses a formatted currency amount. @@ -50,5 +50,5 @@ interface CurrencyFormatterInterface * * @return string|false The parsed number or FALSE on error. */ - public function parse($number, $currencyCode, array $options = []); + public function parse(string $number, string $currencyCode, array $options = []): string|bool; } diff --git a/vendor/commerceguys/intl/src/Formatter/FormatterTrait.php b/vendor/commerceguys/intl/src/Formatter/FormatterTrait.php index 11cdd2372..716c570b6 100644 --- a/vendor/commerceguys/intl/src/Formatter/FormatterTrait.php +++ b/vendor/commerceguys/intl/src/Formatter/FormatterTrait.php @@ -13,14 +13,14 @@ trait FormatterTrait * * @var ParsedPattern[] */ - protected $parsedPatterns = []; + protected array $parsedPatterns = []; /** * Localized digits. * * @var array */ - protected $digits = [ + protected array $digits = [ NumberFormat::NUMBERING_SYSTEM_ARABIC => [ 0 => '٠', 1 => '١', 2 => '٢', 3 => '٣', 4 => '٤', 5 => '٥', 6 => '٦', 7 => '٧', 8 => '٨', 9 => '٩', @@ -47,7 +47,7 @@ trait FormatterTrait * * @return string The formatted number. */ - protected function formatNumber($number, NumberFormat $numberFormat, array $options = []) + protected function formatNumber(string $number, NumberFormat $numberFormat, array $options = []): string { $parsedPattern = $this->getParsedPattern($numberFormat, $options['style']); // Start by rounding the number, if rounding is enabled. @@ -116,7 +116,7 @@ trait FormatterTrait * * @see http://cldr.unicode.org/translation/number-symbols */ - protected function localizeNumber($number, NumberFormat $numberFormat) + protected function localizeNumber(string $number, NumberFormat $numberFormat): string { // Localize digits. $numberingSystem = $numberFormat->getNumberingSystem(); @@ -139,9 +139,9 @@ trait FormatterTrait * @param string $number The number. * @param NumberFormat $numberFormat The number format. * - * @return string The localized number. + * @return string|bool The localized number, or FALSE on error. */ - protected function parseNumber($number, NumberFormat $numberFormat) + protected function parseNumber(string $number, NumberFormat $numberFormat): string|bool { // Convert localized symbols back to their original form. $replacements = array_flip($this->getLocalizedSymbols($numberFormat)); @@ -179,8 +179,10 @@ trait FormatterTrait * @param string $style The formatter style. * * @return ParsedPattern + * + * @throws InvalidArgumentException */ - protected function getParsedPattern(NumberFormat $numberFormat, $style) + protected function getParsedPattern(NumberFormat $numberFormat, string $style): ParsedPattern { $locale = $numberFormat->getLocale(); if (!isset($this->parsedPatterns[$locale][$style])) { @@ -202,7 +204,7 @@ trait FormatterTrait * * @return string[] The patterns, keyed by style. */ - abstract protected function getAvailablePatterns(NumberFormat $numberFormat); + abstract protected function getAvailablePatterns(NumberFormat $numberFormat): array; /** * Gets the localized symbols for the provided number format. diff --git a/vendor/commerceguys/intl/src/Formatter/NumberFormatter.php b/vendor/commerceguys/intl/src/Formatter/NumberFormatter.php index 03795fe6d..2ef2b282c 100644 --- a/vendor/commerceguys/intl/src/Formatter/NumberFormatter.php +++ b/vendor/commerceguys/intl/src/Formatter/NumberFormatter.php @@ -19,14 +19,14 @@ class NumberFormatter implements NumberFormatterInterface * * @var NumberFormatRepositoryInterface */ - protected $numberFormatRepository; + protected NumberFormatRepositoryInterface $numberFormatRepository; /** * The default options. * * @var array */ - protected $defaultOptions = [ + protected array $defaultOptions = [ 'locale' => 'en', 'use_grouping' => true, 'minimum_fraction_digits' => 0, @@ -40,7 +40,7 @@ class NumberFormatter implements NumberFormatterInterface * * @var NumberFormat[] */ - protected $numberFormats = []; + protected array $numberFormats = []; /** * Creates a NumberFormatter instance. @@ -65,7 +65,7 @@ class NumberFormatter implements NumberFormatterInterface /** * {@inheritdoc} */ - public function format($number, array $options = []) + public function format(string $number, array $options = []): string { if (!is_numeric($number)) { $message = sprintf('The provided value "%s" is not a valid number or numeric string.', $number); @@ -88,7 +88,7 @@ class NumberFormatter implements NumberFormatterInterface /** * {@inheritdoc} */ - public function parse($number, array $options = []) + public function parse(string $number, array $options = []): string|bool { $this->validateOptions($options); $options = array_replace($this->defaultOptions, $options); @@ -105,7 +105,7 @@ class NumberFormatter implements NumberFormatterInterface * * @return NumberFormat */ - protected function getNumberFormat($locale) + protected function getNumberFormat(string $locale): NumberFormat { if (!isset($this->numberFormats[$locale])) { $this->numberFormats[$locale] = $this->numberFormatRepository->get($locale); @@ -117,7 +117,7 @@ class NumberFormatter implements NumberFormatterInterface /** * {@inheritdoc} */ - protected function getAvailablePatterns(NumberFormat $numberFormat) + protected function getAvailablePatterns(NumberFormat $numberFormat): array { return [ 'decimal' => $numberFormat->getDecimalPattern(), diff --git a/vendor/commerceguys/intl/src/Formatter/NumberFormatterInterface.php b/vendor/commerceguys/intl/src/Formatter/NumberFormatterInterface.php index ce6207f52..2ebea7e11 100644 --- a/vendor/commerceguys/intl/src/Formatter/NumberFormatterInterface.php +++ b/vendor/commerceguys/intl/src/Formatter/NumberFormatterInterface.php @@ -29,7 +29,7 @@ interface NumberFormatterInterface * * @return string The formatted number. */ - public function format($number, array $options = []); + public function format(string $number, array $options = []): string; /** * Parses a number. @@ -45,5 +45,5 @@ interface NumberFormatterInterface * * @return string|false The parsed number or FALSE on error. */ - public function parse($number, array $options = []); + public function parse(string $number, array $options = []): string|bool; } diff --git a/vendor/commerceguys/intl/src/Formatter/ParsedPattern.php b/vendor/commerceguys/intl/src/Formatter/ParsedPattern.php index aa6e5f43e..faa5c879d 100644 --- a/vendor/commerceguys/intl/src/Formatter/ParsedPattern.php +++ b/vendor/commerceguys/intl/src/Formatter/ParsedPattern.php @@ -12,42 +12,42 @@ final class ParsedPattern * * @var string */ - protected $positivePattern; + protected string $positivePattern; /** * The negative number pattern. * * @var string */ - protected $negativePattern; + protected string $negativePattern; /** * Whether grouping is used. * * @var bool */ - protected $groupingUsed; + protected bool $groupingUsed; /** * The primary group size. * * @var int */ - protected $primaryGroupSize; + protected int $primaryGroupSize; /** * The secondary group size. * * @var int */ - protected $secondaryGroupSize; + protected int $secondaryGroupSize; /** * Creates a new ParsedPattern instance. * * @param string $pattern The raw pattern. */ - public function __construct($pattern) + public function __construct(string $pattern) { // Split the pattern into positive and negative patterns. $patternList = explode(';', $pattern); @@ -58,7 +58,7 @@ final class ParsedPattern $this->positivePattern = $patternList[0]; $this->negativePattern = $patternList[1]; - $this->groupingUsed = (strpos($patternList[0], ',') !== false); + $this->groupingUsed = (str_contains($patternList[0], ',')); if ($this->groupingUsed) { preg_match('/#+0/', $patternList[0], $primaryGroupMatches); $this->primaryGroupSize = $this->secondaryGroupSize = strlen($primaryGroupMatches[0]); @@ -77,7 +77,7 @@ final class ParsedPattern * * @return string */ - public function getPositivePattern() + public function getPositivePattern(): string { return $this->positivePattern; } @@ -89,7 +89,7 @@ final class ParsedPattern * * @return string */ - public function getNegativePattern() + public function getNegativePattern(): string { return $this->negativePattern; } @@ -102,7 +102,7 @@ final class ParsedPattern * * @return bool */ - public function isGroupingUsed() + public function isGroupingUsed(): bool { return $this->groupingUsed; } @@ -112,7 +112,7 @@ final class ParsedPattern * * @return int|null */ - public function getPrimaryGroupSize() + public function getPrimaryGroupSize(): ?int { return $this->primaryGroupSize; } @@ -122,7 +122,7 @@ final class ParsedPattern * * @return int|null */ - public function getSecondaryGroupSize() + public function getSecondaryGroupSize(): ?int { return $this->secondaryGroupSize; } |