bug symfony#61426 [Intl] Take timezoneTypes’ ianaMap into account (MatTheCat)

This PR was submitted for the 7.4 branch but it was merged into the 6.4 branch instead.

Discussion
----------

[Intl] Take timezoneTypes’ ianaMap into account

| Q             | A
| ------------- | ---
| Branch?       | 7.4
| Bug fix?      | yes
| New feature?  | yes
| Deprecations? | no
| Issues        | Fix symfony#61289
| License       | MIT

Timezones name are CLDR canonical’s which “[are] based on very old version of the time zone database” ([source](https://github.com/unicode-org/icu/blob/3a66f8c5fecfc3f0ee427c12b90966bac1b02d92/icu4c/source/i18n/unicode/ucal.h#L1398)). This means that IANA canonical timezones won’t appear if they changed, so this PR adds them.

~EDIT: I see tests run against ICU 76.1; should I update everything to 77.1?~

Commits
-------

3ed85ef [Intl] Take timezoneTypes’ ianaMap into account

Author: nicolas-grekas

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

@@ -38,6 +38,7 @@ class TimezoneDataGenerator extends AbstractDataGenerator
     private array $zoneIds = [];
     private array $zoneToCountryMapping = [];
     private array $localeAliases = [];
+    private array $ianaMap = [];
 
     protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
     {
@@ -65,8 +66,14 @@ protected function preGenerate(): void
 
     protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array
     {
+        if (!$this->ianaMap) {
+            foreach ($reader->readEntry($tempDir, 'timezoneTypes', ['ianaMap', 'timezone']) as $cldr => $iana) {
+                $this->ianaMap[str_replace(':', '/', $cldr)] = $iana;
+            }
+        }
+
         if (!$this->zoneToCountryMapping) {
-            $this->zoneToCountryMapping = self::generateZoneToCountryMapping($reader->read($tempDir, 'windowsZones'));
+            $this->zoneToCountryMapping = $this->generateZoneToCountryMapping($reader->read($tempDir, 'windowsZones'));
         }
 
         // Don't generate aliases, as they are resolved during runtime
@@ -77,7 +84,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
 
         $localeBundle = $reader->read($tempDir, $displayLocale);
 
-        if (!isset($localeBundle['zoneStrings']) || null === $localeBundle['zoneStrings']) {
+        if (!isset($localeBundle['zoneStrings'])) {
             return null;
         }
 
@@ -222,6 +229,10 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD
             }
 
             $zones[$id] = $name;
+
+            if (isset($this->ianaMap[$id])) {
+                $zones[$this->ianaMap[$id]] = $name;
+            }
         }
 
         return $zones;
@@ -242,14 +253,20 @@ private static function generateZoneMetadata(ArrayAccessibleResourceBundle $loca
         return $metadata;
     }
 
-    private static function generateZoneToCountryMapping(ArrayAccessibleResourceBundle $windowsZoneBundle): array
+    private function generateZoneToCountryMapping(ArrayAccessibleResourceBundle $windowsZoneBundle): array
     {
         $mapping = [];
 
         foreach ($windowsZoneBundle['mapTimezones'] as $zoneInfo) {
             foreach ($zoneInfo as $region => $zones) {
                 if (RegionDataGenerator::isValidCountryCode($region)) {
-                    $mapping += array_fill_keys(explode(' ', $zones), $region);
+                    foreach (explode(' ', $zones) as $zone) {
+                        $mapping[$zone] = $region;
+
+                        if (isset($this->ianaMap[$zone])) {
+                            $mapping[$this->ianaMap[$zone]] = $region;
+                        }
+                    }
                 }
             }
         }