Merge branch '6.4' into 7.3

* 6.4:
  [Intl] Take timezoneTypes’ ianaMap into account

Author: nicolas-grekas

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

@@ -37,6 +37,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
     {
@@ -64,8 +65,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
@@ -76,7 +83,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;
         }
 
@@ -217,6 +224,10 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD
             }
 
             $zones[$id] = $name;
+
+            if (isset($this->ianaMap[$id])) {
+                $zones[$this->ianaMap[$id]] = $name;
+            }
         }
 
         return $zones;
@@ -237,14 +248,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;
+                        }
+                    }
                 }
             }
         }