symfony · fabpot · Aug 18, 2019 · Aug 13, 2019
diff --git a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
@@ -162,15 +162,12 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, $temp

        sort($this->languageCodes);

-        $alpha2ToAlpha3 = $this->generateAlpha2ToAlpha3Mapping($metadataBundle);
-        $alpha3ToAlpha2 = array_flip($alpha2ToAlpha3);
-        asort($alpha3ToAlpha2);
-
        return [
            'Version' => $rootBundle['Version'],
            'Languages' => $this->languageCodes,
-            'Alpha2ToAlpha3' => $alpha2ToAlpha3,
-            'Alpha3ToAlpha2' => $alpha3ToAlpha2,
+            'Alpha3Languages' => $this->generateAlpha3Codes($this->languageCodes, $metadataBundle),
+            'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),
+            'Alpha3ToAlpha2' => $this->generateAlpha3ToAlpha2Mapping($metadataBundle),
        ];
    }

@@ -179,6 +176,23 @@ private static function generateLanguageNames(ArrayAccessibleResourceBundle $loc
        return array_diff_key(iterator_to_array($localeBundle['Languages']), self::$blacklist);
    }

+    private function generateAlpha3Codes(array $languageCodes, ArrayAccessibleResourceBundle $metadataBundle): array
+    {
+        $alpha3Codes = array_flip(array_filter($languageCodes, static function (string $language): bool {
+            return 3 === \strlen($language);
+        }));
+
+        foreach ($metadataBundle['alias']['language'] as $alias => $data) {
+            if (3 === \strlen($alias) && 'overlong' === $data['reason']) {
+                $alpha3Codes[$alias] = true;
+            }
+        }
+
+        ksort($alpha3Codes);
+
+        return array_keys($alpha3Codes);
+    }
+
    private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $metadataBundle)
    {
        $aliases = iterator_to_array($metadataBundle['alias']['language']);
@@ -213,4 +227,20 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me

        return $alpha2ToAlpha3;
    }
+
+    private function generateAlpha3ToAlpha2Mapping(ArrayAccessibleResourceBundle $metadataBundle): array
+    {
+        $alpha3ToAlpha2 = [];
+
+        foreach ($metadataBundle['alias']['language'] as $alias => $data) {
+            $language = $data['replacement'];
+            if (2 === \strlen($language) && 3 === \strlen($alias) && 'overlong' === $data['reason']) {
+                $alpha3ToAlpha2[$alias] = $language;
+            }
+        }
+
+        asort($alpha3ToAlpha2);
+
+        return $alpha3ToAlpha2;
+    }
 }
diff --git a/src/Symfony/Component/Intl/Languages.php b/src/Symfony/Component/Intl/Languages.php
@@ -98,7 +98,7 @@ public static function getAlpha2Code(string $language): string
     */
    public static function getAlpha3Codes(): array
    {
-        return self::readEntry(['Alpha2ToAlpha3'], 'meta');
+        return self::readEntry(['Alpha3Languages'], 'meta');
    }

    /**
@@ -111,7 +111,12 @@ public static function alpha3CodeExists(string $language): bool

            return true;
        } catch (MissingResourceException $e) {
-            return false;
+            static $cache;
+            if (null === $cache) {
+                $cache = array_flip(self::getAlpha3Codes());
+            }
+
+            return isset($cache[$language]);
        }
    }

@@ -122,7 +127,15 @@ public static function alpha3CodeExists(string $language): bool
     */
    public static function getAlpha3Name(string $language, string $displayLocale = null): string
    {
-        return self::getName(self::getAlpha2Code($language), $displayLocale);
+        try {
+            return self::getName(self::getAlpha2Code($language), $displayLocale);
+        } catch (MissingResourceException $e) {
+            if (3 === \strlen($language)) {
+                return self::getName($language, $displayLocale);
+            }
+
+            throw $e;
+        }
    }

    /**
@@ -137,6 +150,10 @@ public static function getAlpha3Names($displayLocale = null): array
        $alpha2Names = self::getNames($displayLocale);
        $alpha3Names = [];
        foreach ($alpha2Names as $alpha2Code => $name) {
+            if (3 === \strlen($alpha2Code)) {
+                $alpha3Names[$alpha2Code] = $name;
+                continue;
+            }
            try {
                $alpha3Names[self::getAlpha3Code($alpha2Code)] = $name;
            } catch (MissingResourceException $e) {