Merge branch '4.4'

* 4.4:
  [Mailer] simplified the way TLS/SSL/StartTls work
  [VarDumper] Add test dump image
  Allow exchange type headers binding
  Add types to private and final methods.
  [Messenger] InMemoryTransport handle acknowledged and rejected messages
  [Intl] Validate region preferred alpha code mapping
  Added ErrorHandler::call() method utility to turns any PHP warnings into `\ErrorException`
  [Intl] Full alpha3 language support
  [Monolog] Added ElasticsearchLogstashHandler

Author: fabpot

Data/Generator/LanguageDataGenerator.php

@@ -162,15 +162,12 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
 
         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;
+    }
 }

Data/Generator/RegionDataGenerator.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
 use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
 use Symfony\Component\Intl\Data\Util\LocaleScanner;
+use Symfony\Component\Intl\Exception\RuntimeException;
 
 /**
  * The rule for compiling the region bundle.
@@ -28,9 +29,10 @@
 class RegionDataGenerator extends AbstractDataGenerator
 {
     /**
-     * Source: https://www.iso.org/obp/ui/#iso:pub:PUB500001:en.
+     * Source: https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes.
      */
     private static $preferredAlpha2ToAlpha3Mapping = [
+        'CD' => 'COD',
         'DE' => 'DEU',
         'FR' => 'FRA',
         'MM' => 'MMR',
@@ -141,15 +143,11 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
 
         $this->regionCodes = array_unique($this->regionCodes);
 
-        $alpha2ToAlpha3 = $this->generateAlpha3($metadataBundle);
-
         sort($this->regionCodes);
 
-        $alpha3ToAlpha2 = [];
-        foreach ($this->regionCodes as $alpha2Code) {
-            $alpha3code = $alpha2ToAlpha3[$alpha2Code];
-            $alpha3ToAlpha2[$alpha3code] = $alpha2Code;
-        }
+        $alpha2ToAlpha3 = $this->generateAlpha2ToAlpha3Mapping(array_flip($this->regionCodes), $metadataBundle);
+        $alpha3ToAlpha2 = array_flip($alpha2ToAlpha3);
+        asort($alpha3ToAlpha2);
 
         return [
             'Version' => $rootBundle['Version'],
@@ -178,31 +176,32 @@ protected function generateRegionNames(ArrayAccessibleResourceBundle $localeBund
         return $regionNames;
     }
 
-    protected function generateAlpha3(ArrayAccessibleResourceBundle $metadataBundle)
+    private function generateAlpha2ToAlpha3Mapping(array $countries, ArrayAccessibleResourceBundle $metadataBundle): array
     {
-        $alpha2Codes = array_flip($this->regionCodes);
+        $aliases = iterator_to_array($metadataBundle['alias']['territory']);
         $alpha2ToAlpha3 = [];
-        foreach ($metadataBundle['alias']['territory'] as $alias => $data) {
-            if (3 !== \strlen($alias) || 'overlong' !== $data['reason'] || ctype_digit($alias)) {
-                continue;
-            }
-
-            $alpha2Code = $data['replacement'];
-            if (!isset($alpha2Codes[$alpha2Code])) {
-                continue;
-            }
-
-            if (!isset($alpha2ToAlpha3[$alpha2Code])) {
-                $alpha2ToAlpha3[$alpha2Code] = $alias;
-                continue;
-            }
 
-            // Found a second alias for the same country
-            if (isset(self::$preferredAlpha2ToAlpha3Mapping[$alpha2Code])) {
-                $preferred = self::$preferredAlpha2ToAlpha3Mapping[$alpha2Code];
-                // Only use the preferred mapping if it actually is in the mapping
-                if ($alias === $preferred) {
-                    $alpha2ToAlpha3[$alpha2Code] = $preferred;
+        foreach ($aliases as $alias => $data) {
+            $country = $data['replacement'];
+            if (2 === \strlen($country) && 3 === \strlen($alias) && 'overlong' === $data['reason']) {
+                if (isset(self::$preferredAlpha2ToAlpha3Mapping[$country])) {
+                    // Validate to prevent typos
+                    if (!isset($aliases[self::$preferredAlpha2ToAlpha3Mapping[$country]])) {
+                        throw new RuntimeException('The statically set three-letter mapping '.self::$preferredAlpha2ToAlpha3Mapping[$country].' for the country code '.$country.' seems to be invalid. Typo?');
+                    }
+
+                    $alpha3 = self::$preferredAlpha2ToAlpha3Mapping[$country];
+                    $alpha2 = $aliases[$alpha3]['replacement'];
+
+                    if ($country !== $alpha2) {
+                        throw new RuntimeException('The statically set three-letter mapping '.$alpha3.' for the country code '.$country.' seems to be an alias for '.$alpha2.'. Wrong mapping?');
+                    }
+
+                    $alpha2ToAlpha3[$country] = $alpha3;
+                } elseif (isset($alpha2ToAlpha3[$country])) {
+                    throw new RuntimeException('Multiple three-letter mappings exist for the country code '.$country.'. Please add one of them to the property $preferredAlpha2ToAlpha3Mapping.');
+                } elseif (isset($countries[$country]) && self::isValidCountryCode($alias)) {
+                    $alpha2ToAlpha3[$country] = $alias;
                 }
             }
         }

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) {