Sync intl scripts

Author: nicolas-grekas

Data/Bundle/Compiler/BundleCompilerInterface.php

@@ -23,8 +23,6 @@ interface BundleCompilerInterface
     /**
      * Compiles a resource bundle at the given source to the given target
      * directory.
-     *
-     * @return void
      */
-    public function compile(string $sourcePath, string $targetDir);
+    public function compile(string $sourcePath, string $targetDir): void;
 }

Data/Bundle/Reader/BufferedBundleReader.php

@@ -20,13 +20,13 @@
  */
 class BufferedBundleReader implements BundleReaderInterface
 {
-    private BundleReaderInterface $reader;
     /** @var RingBuffer<string, mixed> */
     private RingBuffer $buffer;
 
-    public function __construct(BundleReaderInterface $reader, int $bufferSize)
-    {
-        $this->reader = $reader;
+    public function __construct(
+        private BundleReaderInterface $reader,
+        int $bufferSize,
+    ) {
         $this->buffer = new RingBuffer($bufferSize);
     }
 

Data/Bundle/Reader/BundleEntryReader.php

@@ -28,8 +28,6 @@
  */
 class BundleEntryReader implements BundleEntryReaderInterface
 {
-    private BundleReaderInterface $reader;
-
     /**
      * A mapping of locale aliases to locales.
      */
@@ -38,9 +36,9 @@ class BundleEntryReader implements BundleEntryReaderInterface
     /**
      * Creates an entry reader based on the given resource bundle reader.
      */
-    public function __construct(BundleReaderInterface $reader)
-    {
-        $this->reader = $reader;
+    public function __construct(
+        private BundleReaderInterface $reader,
+    ) {
     }
 
     /**

Data/Bundle/Writer/BundleWriterInterface.php

@@ -20,8 +20,5 @@
  */
 interface BundleWriterInterface
 {
-    /**
-     * @return void
-     */
-    public function write(string $path, string $locale, mixed $data);
+    public function write(string $path, string $locale, mixed $data): void;
 }

Data/Bundle/Writer/PhpBundleWriter.php

@@ -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);

Data/Generator/AbstractDataGenerator.php

@@ -27,13 +27,10 @@
  */
 abstract class AbstractDataGenerator
 {
-    private BundleCompilerInterface $compiler;
-    private string $dirName;
-
-    public function __construct(BundleCompilerInterface $compiler, string $dirName)
-    {
-        $this->compiler = $compiler;
-        $this->dirName = $dirName;
+    public function __construct(
+        private BundleCompilerInterface $compiler,
+        private string $dirName,
+    ) {
     }
 
     public function generateData(GeneratorConfig $config): void

Data/Generator/GeneratorConfig.php

@@ -22,18 +22,15 @@
  */
 class GeneratorConfig
 {
-    private string $sourceDir;
-    private string $icuVersion;
-
     /**
      * @var BundleWriterInterface[]
      */
     private array $bundleWriters = [];
 
-    public function __construct(string $sourceDir, string $icuVersion)
-    {
-        $this->sourceDir = $sourceDir;
-        $this->icuVersion = $icuVersion;
+    public function __construct(
+        private string $sourceDir,
+        private string $icuVersion,
+    ) {
     }
 
     /**

Data/Generator/RegionDataGenerator.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?');
@@ -242,7 +271,7 @@ private function generateAlpha2ToNumericMapping(array $countries, ArrayAccessibl
                 continue;
             }
 
-            if (\in_array($alias, self::WITHDRAWN_CODES)) {
+            if (\in_array($alias, self::WITHDRAWN_CODES, true)) {
                 continue;
             }
 

Data/Generator/TimezoneDataGenerator.php

@@ -17,7 +17,6 @@
 use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
 use Symfony\Component\Intl\Data\Util\LocaleScanner;
 use Symfony\Component\Intl\Exception\MissingResourceException;
-use Symfony\Component\Intl\Locale;
 
 /**
  * The rule for compiling the zone bundle.
@@ -128,20 +127,16 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
 
     protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
-        $rootBundle = $reader->read($tempDir, 'root');
-
         $this->zoneIds = array_unique($this->zoneIds);
 
         sort($this->zoneIds);
         ksort($this->zoneToCountryMapping);
 
-        $data = [
+        return [
             'Zones' => $this->zoneIds,
             'ZoneToCountry' => $this->zoneToCountryMapping,
             'CountryToZone' => self::generateCountryToZoneMapping($this->zoneToCountryMapping),
         ];
-
-        return $data;
     }
 
     private function generateZones(BundleEntryReaderInterface $reader, string $tempDir, string $locale): array

Data/Util/ArrayAccessibleResourceBundle.php

@@ -25,11 +25,9 @@
  */
 class ArrayAccessibleResourceBundle implements \ArrayAccess, \IteratorAggregate, \Countable
 {
-    private \ResourceBundle $bundleImpl;
-
-    public function __construct(\ResourceBundle $bundleImpl)
-    {
-        $this->bundleImpl = $bundleImpl;
+    public function __construct(
+        private \ResourceBundle $bundleImpl,
+    ) {
     }
 
     public function get(int|string $offset): mixed