[Intl] Add methods to filter currencies more precisely #61431
+2,579
−0
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -48,6 +48,54 @@ class CurrencyDataGenerator extends AbstractDataGenerator | |||||
| */ | ||||||
| private array $currencyCodes = []; | ||||||
|
|
||||||
| /** | ||||||
| * Decodes ICU "date pair" into a DateTimeImmutable (UTC). | ||||||
| * | ||||||
| * ICU stores UDate = milliseconds since 1970-01-01T00:00:00Z in a signed 64-bit. | ||||||
| * | ||||||
| * @param array{0: int, 1: int} $pair | ||||||
| * | ||||||
| * @return non-empty-string | ||||||
|
Comment on lines
+57
to
+58
There was a problem hiding this comment. I'd remove the non-empty-string declarations, they're not really useful IMHO
Suggested change
|
||||||
| */ | ||||||
| private static function icuPairToDate(array $pair): string | ||||||
| { | ||||||
| [$highBits32, $lowBits32] = $pair; | ||||||
|
|
||||||
| // Recompose a 64-bit unsigned integer from two 32-bit chunks. | ||||||
| $unsigned64 = ((($highBits32 & 0xFFFFFFFF) << 32) | ($lowBits32 & 0xFFFFFFFF)); | ||||||
|
|
||||||
| // Convert to signed 64-bit (two's complement) if sign bit is set. | ||||||
| if ($unsigned64 >= (1 << 63)) { | ||||||
| $unsigned64 -= (1 << 64); | ||||||
| } | ||||||
|
|
||||||
| // Split into seconds and milliseconds. | ||||||
| $seconds = intdiv($unsigned64, 1000); | ||||||
| $millisecondsRemainder = $unsigned64 - $seconds * 1000; | ||||||
|
|
||||||
| // Normalize negative millisecond remainders (e.g., for pre-1970 values) | ||||||
| if (0 > $millisecondsRemainder) { | ||||||
| $millisecondsRemainder += 1000; | ||||||
|
|
||||||
| --$seconds; | ||||||
| } | ||||||
|
|
||||||
| // Build "U.u" string (seconds.microseconds). Pad ms to 3 digits, then add 000 to get microseconds. | ||||||
| $epochWithMicros = \sprintf('%d.%03d000', $seconds, $millisecondsRemainder); | ||||||
|
|
||||||
| $datetime = \DateTimeImmutable::createFromFormat( | ||||||
| 'U.u', | ||||||
|
There was a problem hiding this comment. let's simplify this and remove the part about $millisecondsRemainder |
||||||
| $epochWithMicros, | ||||||
| new \DateTimeZone('UTC'), | ||||||
| ); | ||||||
|
|
||||||
| if (false === $datetime) { | ||||||
| throw new \RuntimeException('Unable to parse ICU milliseconds pair.'); | ||||||
| } | ||||||
|
|
||||||
| return $datetime->format('Y-m-d'); | ||||||
| } | ||||||
|
|
||||||
| protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array | ||||||
| { | ||||||
| return $scanner->scanLocales($sourceDir.'/curr'); | ||||||
|
|
@@ -102,6 +150,7 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin | |||||
| $data = [ | ||||||
| 'Currencies' => $this->currencyCodes, | ||||||
| 'Meta' => $this->generateCurrencyMeta($supplementalDataBundle), | ||||||
| 'Map' => $this->generateCurrencyMap($supplementalDataBundle), | ||||||
| 'Alpha3ToNumeric' => $this->generateAlpha3ToNumericMapping($numericCodesBundle, $this->currencyCodes), | ||||||
| ]; | ||||||
|
|
||||||
|
|
@@ -125,6 +174,74 @@ private function generateCurrencyMeta(ArrayAccessibleResourceBundle $supplementa | |||||
| return iterator_to_array($supplementalDataBundle['CurrencyMeta']); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * @return array<non-empty-string, array> | ||||||
| */ | ||||||
| private function generateCurrencyMap(mixed $supplementalDataBundle): array | ||||||
| { | ||||||
| /** | ||||||
| * @var list<non-empty-string, list<non-empty-string, array{ | ||||||
| * from?: non-empty-string, | ||||||
| * to?: non-empty-string, | ||||||
| * tender?: false | ||||||
| * }>> $regionsData | ||||||
| */ | ||||||
| $regionsData = []; | ||||||
|
|
||||||
| foreach ($supplementalDataBundle['CurrencyMap'] as $regionId => $region) { | ||||||
| foreach ($region as $metadata) { | ||||||
| /** | ||||||
| * Note 1: The "to" property (if present) is always greater than "from". | ||||||
| * Note 2: The "to" property may be missing if the currency is still in use. | ||||||
| * Note 3: The "tender" property indicates whether the country legally recognizes the currency within | ||||||
| * its borders. This property is explicitly set to `false` only if that is not the case; | ||||||
| * otherwise, it is `true` by default. | ||||||
| * Note 4: The "from" and "to" dates are not stored as strings; they are stored as a pair of integers. | ||||||
| * Note 5: The "to" property may be missing if "tender" is set to `false`. | ||||||
| * | ||||||
| * @var array{ | ||||||
| * from?: array{0: int, 1: int}, | ||||||
| * to?: array{0: int, 2: int}, | ||||||
| * tender?: bool, | ||||||
| * id: non-empty-string | ||||||
| * } $metadata | ||||||
| */ | ||||||
| $metadata = iterator_to_array($metadata); | ||||||
|
|
||||||
| $id = $metadata['id']; | ||||||
|
|
||||||
| unset($metadata['id']); | ||||||
|
|
||||||
| if (\array_key_exists($id, self::DENYLIST)) { | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (\array_key_exists('from', $metadata)) { | ||||||
| $metadata['from'] = self::icuPairToDate($metadata['from']); | ||||||
| } | ||||||
|
|
||||||
| if (\array_key_exists('to', $metadata)) { | ||||||
| $metadata['to'] = self::icuPairToDate($metadata['to']); | ||||||
| } | ||||||
|
|
||||||
| if (\array_key_exists('tender', $metadata)) { | ||||||
| $metadata['tender'] = filter_var($metadata['tender'], \FILTER_VALIDATE_BOOLEAN, \FILTER_NULL_ON_FAILURE); | ||||||
|
|
||||||
| if (null === $metadata['tender']) { | ||||||
| throw new \RuntimeException('Unexpected boolean value for tender attribute.'); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| $regionsData[$regionId][$id] = $metadata; | ||||||
| } | ||||||
|
|
||||||
| // Do not exclude countries with no currencies or excluded currencies (e.g. Antartica) | ||||||
| $regionsData[$regionId] ??= []; | ||||||
| } | ||||||
|
|
||||||
| return $regionsData; | ||||||
| } | ||||||
|
|
||||||
| private function generateAlpha3ToNumericMapping(ArrayAccessibleResourceBundle $numericCodesBundle, array $currencyCodes): array | ||||||
| { | ||||||
| $alpha3ToNumericMapping = iterator_to_array($numericCodesBundle['codeMap']); | ||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.