Merge branch '6.4' into 7.3

* 6.4:
  Sync intl scripts
  [Intl] Add metadata about currencies' validtity dates
  Bump Symfony version to 6.4.26
  Update VERSION for 6.4.25
  Update CONTRIBUTORS for 6.4.25
  Update CHANGELOG for 6.4.25

Author: nicolas-grekas

CONTRIBUTORS.md

@@ -25,11 +25,11 @@ class PhpBundleWriter implements BundleWriterInterface
     public function write(string $path, string $locale, mixed $data): void
     {
         $template = <<<'TEMPLATE'
-<?php
+            <?php
 
-return %s;
+            return %s;
 
-TEMPLATE;
+            TEMPLATE;
 
         if ($data instanceof \Traversable) {
             $data = iterator_to_array($data);

src/Symfony/Component/Intl/Data/Bundle/Writer/PhpBundleWriter.php

@@ -102,6 +102,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 +126,70 @@ private function generateCurrencyMeta(ArrayAccessibleResourceBundle $supplementa
         return iterator_to_array($supplementalDataBundle['CurrencyMeta']);
     }
 
+    /**
+     * @return array<string, array>
+     */
+    private function generateCurrencyMap(mixed $supplementalDataBundle): array
+    {
+        /**
+         * @var list<string, list<string, array{from?: string, to?: 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: 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']);
@@ -152,4 +217,41 @@ private function generateNumericToAlpha3Mapping(array $alpha3ToNumericMapping):
 
         return $numericToAlpha3Mapping;
     }
+
+    /**
+     * 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
+     */
+    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) {
+            --$seconds;
+        }
+
+        $datetime = \DateTimeImmutable::createFromFormat('U', $seconds, new \DateTimeZone('Etc/UTC'));
+
+        if (false === $datetime) {
+            throw new \RuntimeException('Unable to parse ICU milliseconds pair.');
+        }
+
+        return $datetime->format('Y-m-d');
+    }
 }

src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php

@@ -56,11 +56,14 @@ class RegionDataGenerator extends AbstractDataGenerator
         'QO' => true, // Outlying Oceania
         'XA' => true, // Pseudo-Accents
         'XB' => true, // Pseudo-Bidi
-        'XK' => true, // Kosovo
         // Misc
         'ZZ' => true, // Unknown Region
     ];
 
+    private const USER_ASSIGNED = [
+        'XK' => true, // Kosovo
+    ];
+
     // @see https://en.wikipedia.org/wiki/ISO_3166-1_numeric#Withdrawn_codes
     private const WITHDRAWN_CODES = [
         128, //	Canton and Enderbury Islands
@@ -97,7 +100,7 @@ class RegionDataGenerator extends AbstractDataGenerator
 
     public static function isValidCountryCode(int|string|null $region): bool
     {
-        if (isset(self::DENYLIST[$region])) {
+        if (isset(self::DENYLIST[$region]) || isset(self::USER_ASSIGNED[$region])) {
             return false;
         }
 
@@ -109,6 +112,11 @@ public static function isValidCountryCode(int|string|null $region): bool
         return true;
     }
 
+    public static function isUserAssignedCountryCode(int|string|null $region): bool
+    {
+        return isset(self::USER_ASSIGNED[$region]);
+    }
+
     protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
     {
         return $scanner->scanLocales($sourceDir.'/region');
@@ -131,9 +139,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
 
         // isset() on \ResourceBundle returns true even if the value is null
         if (isset($localeBundle['Countries']) && null !== $localeBundle['Countries']) {
-            $data = [
-                'Names' => $this->generateRegionNames($localeBundle),
-            ];
+            $data = $this->generateRegionNames($localeBundle);
 
             $this->regionCodes = array_merge($this->regionCodes, array_keys($data['Names']));
 
@@ -153,23 +159,39 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
         $metadataBundle = $reader->read($tempDir, 'metadata');
 
         $this->regionCodes = array_unique($this->regionCodes);
-
         sort($this->regionCodes);
 
         $alpha2ToAlpha3 = $this->generateAlpha2ToAlpha3Mapping(array_flip($this->regionCodes), $metadataBundle);
+        $userAssignedAlpha2ToAlpha3 = $this->generateAlpha2ToAlpha3Mapping(self::USER_ASSIGNED, $metadataBundle);
+
         $alpha3ToAlpha2 = array_flip($alpha2ToAlpha3);
         asort($alpha3ToAlpha2);
+        $userAssignedAlpha3toAlpha2 = array_flip($userAssignedAlpha2ToAlpha3);
+        asort($userAssignedAlpha3toAlpha2);
 
         $alpha2ToNumeric = $this->generateAlpha2ToNumericMapping(array_flip($this->regionCodes), $metadataBundle);
+        $userAssignedAlpha2ToNumeric = $this->generateAlpha2ToNumericMapping(self::USER_ASSIGNED, $metadataBundle);
+
         $numericToAlpha2 = [];
         foreach ($alpha2ToNumeric as $alpha2 => $numeric) {
             // Add underscore prefix to force keys with leading zeros to remain as string keys.
             $numericToAlpha2['_'.$numeric] = $alpha2;
         }
+        $userAssignedNumericToAlpha2 = [];
+        foreach ($userAssignedAlpha2ToNumeric as $alpha2 => $numeric) {
+            // Add underscore prefix to force keys with leading zeros to remain as string keys.
+            $userAssignedNumericToAlpha2['_'.$numeric] = $alpha2;
+        }
 
         asort($numericToAlpha2);
+        asort($userAssignedNumericToAlpha2);
 
         return [
+            'UserAssignedRegions' => array_keys(self::USER_ASSIGNED),
+            'UserAssignedAlpha2ToAlpha3' => $userAssignedAlpha2ToAlpha3,
+            'UserAssignedAlpha3ToAlpha2' => $userAssignedAlpha3toAlpha2,
+            'UserAssignedAlpha2ToNumeric' => $userAssignedAlpha2ToNumeric,
+            'UserAssignedNumericToAlpha2' => $userAssignedNumericToAlpha2,
             'Regions' => $this->regionCodes,
             'Alpha2ToAlpha3' => $alpha2ToAlpha3,
             'Alpha3ToAlpha2' => $alpha3ToAlpha2,
@@ -181,14 +203,19 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
     protected function generateRegionNames(ArrayAccessibleResourceBundle $localeBundle): array
     {
         $unfilteredRegionNames = iterator_to_array($localeBundle['Countries']);
-        $regionNames = [];
+        $regionNames = ['UserAssignedNames' => [], 'Names' => []];
 
         foreach ($unfilteredRegionNames as $region => $regionName) {
-            if (!self::isValidCountryCode($region)) {
+            if (!self::isValidCountryCode($region) && !self::isUserAssignedCountryCode($region)) {
                 continue;
             }
 
-            $regionNames[$region] = $regionName;
+            if (self::isUserAssignedCountryCode($region)) {
+                $regionNames['UserAssignedNames'][$region] = $regionName;
+                continue;
+            }
+
+            $regionNames['Names'][$region] = $regionName;
         }
 
         return $regionNames;
@@ -204,7 +231,9 @@ private function generateAlpha2ToAlpha3Mapping(array $countries, ArrayAccessible
             $country = $data['replacement'];
 
             if (2 === \strlen($country) && 3 === \strlen($alias) && 'overlong' === $data['reason']) {
-                if (isset(self::PREFERRED_ALPHA2_TO_ALPHA3_MAPPING[$country])) {
+                if (isset($countries[$country]) && self::isUserAssignedCountryCode($country)) {
+                    $alpha2ToAlpha3[$country] = $alias;
+                } elseif (isset($countries[$country]) && !self::isUserAssignedCountryCode($country) && isset(self::PREFERRED_ALPHA2_TO_ALPHA3_MAPPING[$country])) {
                     // Validate to prevent typos
                     if (!isset($aliases[self::PREFERRED_ALPHA2_TO_ALPHA3_MAPPING[$country]])) {
                         throw new RuntimeException('The statically set three-letter mapping '.self::PREFERRED_ALPHA2_TO_ALPHA3_MAPPING[$country].' for the country code '.$country.' seems to be invalid. Typo?');

src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php

@@ -8,5 +8,5 @@ docker run \
     -v /tmp/symfony/icu:/tmp \
     -v $(pwd):/symfony \
     -w /symfony \
-    jakzal/php-intl:8.3-74.1 \
+    jakzal/php-intl:8.4-77.1 \
     php src/Symfony/Component/Intl/Resources/bin/update-data.php