[Intl] Exclude invalid/unknown codes

symfony · May 2, 2019 · 5b24cb6 · 5b24cb6
1 parent 446480e
commit 5b24cb6
Show file tree

Hide file tree

Showing 175 changed files with 151 additions and 393 deletions.
diff --git a/src/Symfony/Component/Intl/CHANGELOG.md b/src/Symfony/Component/Intl/CHANGELOG.md
@@ -10,6 +10,8 @@ CHANGELOG
  * added `Locales` in favor of `Intl::getLocaleBundle()`
  * added `Regions` in favor of `Intl::getRegionBundle()`
  * added `Timezones`
+ * excluded country codes `XA` and `XB`
+ * excluded script code `Zzzz`
 
 4.2.0
 -----

diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
@@ -25,37 +25,20 @@
  */
 class CurrencyDataGenerator extends AbstractDataGenerator
 {
-    const UNKNOWN_CURRENCY_ID = 'XXX';
-    const EUROPEAN_COMPOSITE_UNIT_ID = 'XBA';
-    const EUROPEAN_MONETARY_UNIT_ID = 'XBB';
-    const EUROPEAN_UNIT_OF_ACCOUNT_XBC_ID = 'XBC';
-    const EUROPEAN_UNIT_OF_ACCOUNT_XBD_ID = 'XBD';
-    const TESTING_CURRENCY_CODE_ID = 'XTS';
-    const ADB_UNIT_OF_ACCOUNT_ID = 'XUA';
-    const GOLD_ID = 'XAU';
-    const SILVER_ID = 'XAG';
-    const PLATINUM_ID = 'XPT';
-    const PALLADIUM_ID = 'XPD';
-    const SUCRE_ID = 'XSU';
-    const SPECIAL_DRAWING_RIGHTS_ID = 'XDR';
-
-    /**
-     * Monetary units excluded from generation.
-     */
     private static $blacklist = [
-        self::UNKNOWN_CURRENCY_ID => true,
-        self::EUROPEAN_COMPOSITE_UNIT_ID => true,
-        self::EUROPEAN_MONETARY_UNIT_ID => true,
-        self::EUROPEAN_UNIT_OF_ACCOUNT_XBC_ID => true,
-        self::EUROPEAN_UNIT_OF_ACCOUNT_XBD_ID => true,
-        self::TESTING_CURRENCY_CODE_ID => true,
-        self::ADB_UNIT_OF_ACCOUNT_ID => true,
-        self::GOLD_ID => true,
-        self::SILVER_ID => true,
-        self::PLATINUM_ID => true,
-        self::PALLADIUM_ID => true,
-        self::SUCRE_ID => true,
-        self::SPECIAL_DRAWING_RIGHTS_ID => true,
+        'XBA' => true, // European Composite Unit
+        'XBB' => true, // European Monetary Unit
+        'XBC' => true, // European Unit of Account (XBC)
+        'XBD' => true, // European Unit of Account (XBD)
+        'XUA' => true, // ADB Unit of Account
+        'XAU' => true, // Gold
+        'XAG' => true, // Silver
+        'XPT' => true, // Platinum
+        'XPD' => true, // Palladium
+        'XSU' => true, // Sucre
+        'XDR' => true, // Special Drawing Rights
+        'XTS' => true, // Testing Currency Code
+        'XXX' => true, // Unknown Currency
     ];
 
     /**

diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
@@ -27,32 +27,20 @@
  */
 class RegionDataGenerator extends AbstractDataGenerator
 {
-    const UNKNOWN_REGION_ID = 'ZZ';
-    const OUTLYING_OCEANIA_REGION_ID = 'QO';
-    const EUROPEAN_UNION_ID = 'EU';
-    const NETHERLANDS_ANTILLES_ID = 'AN';
-    const BOUVET_ISLAND_ID = 'BV';
-    const HEARD_MCDONALD_ISLANDS_ID = 'HM';
-    const CLIPPERTON_ISLAND_ID = 'CP';
-    const EUROZONE_ID = 'EZ';
-    const UNITED_NATIONS_ID = 'UN';
-
-    /**
-     * Regions excluded from generation.
-     */
     private static $blacklist = [
-        self::UNKNOWN_REGION_ID => true,
         // Look like countries, but are sub-continents
-        self::OUTLYING_OCEANIA_REGION_ID => true,
-        self::EUROPEAN_UNION_ID => true,
-        self::EUROZONE_ID => true,
-        self::UNITED_NATIONS_ID => true,
-        // No longer exists
-        self::NETHERLANDS_ANTILLES_ID => true,
+        'QO' => true, // Outlying Oceania
+        'EU' => true, // European Union
+        'EZ' => true, // Eurozone
+        'UN' => true, // United Nations
         // Uninhabited islands
-        self::BOUVET_ISLAND_ID => true,
-        self::HEARD_MCDONALD_ISLANDS_ID => true,
-        self::CLIPPERTON_ISLAND_ID => true,
+        'BV' => true, // Bouvet Island
+        'HM' => true, // Heard & McDonald Islands
+        'CP' => true, // Clipperton Island
+        // Misc
+        'XA' => true, // Pseudo-Accents
+        'XB' => true, // Pseudo-Bidi
+        'ZZ' => true, // Unknown Region
     ];
 
     /**

diff --git a/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php
@@ -24,6 +24,10 @@
  */
 class ScriptDataGenerator extends AbstractDataGenerator
 {
+    private static $blacklist = [
+        'Zzzz' => true, // Unknown Script
+    ];
+
     /**
      * Collects all available language codes.
      *
@@ -66,7 +70,7 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
         if (isset($localeBundle['Scripts']) && null !== $localeBundle['Scripts']) {
             $data = [
                 'Version' => $localeBundle['Version'],
-                'Names' => iterator_to_array($localeBundle['Scripts']),
+                'Names' => array_diff_key(iterator_to_array($localeBundle['Scripts']), self::$blacklist),
             ];
 
             $this->scriptCodes = array_merge($this->scriptCodes, array_keys($data['Names']));

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ar.json b/src/Symfony/Component/Intl/Resources/data/regions/ar.json
@@ -248,7 +248,6 @@
         "VU": "فانواتو",
         "WF": "جزر والس وفوتونا",
         "WS": "ساموا",
-        "XA": "XA",
         "XK": "كوسوفو",
         "YE": "اليمن",
         "YT": "مايوت",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/as.json b/src/Symfony/Component/Intl/Resources/data/regions/as.json
@@ -248,8 +248,6 @@
         "VU": "ভানাটু",
         "WF": "ৱালিছ আৰু ফুটুনা",
         "WS": "চামোৱা",
-        "XA": "ছুডু-একচেণ্ট",
-        "XB": "ছুডু-বিডি",
         "XK": "কচ’ভ’",
         "YE": "য়েমেন",
         "YT": "মায়োট্টে",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/az.json b/src/Symfony/Component/Intl/Resources/data/regions/az.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Uollis və Futuna",
         "WS": "Samoa",
-        "XA": "Psevdo-Aksent",
-        "XB": "Psevdo-Bidi",
         "XK": "Kosovo",
         "YE": "Yəmən",
         "YT": "Mayot",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ca.json b/src/Symfony/Component/Intl/Resources/data/regions/ca.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis i Futuna",
         "WS": "Samoa",
-        "XA": "Pseudo-Accents",
-        "XB": "Pseudo-Bidi",
         "XK": "Kosovo",
         "YE": "Iemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cs.json b/src/Symfony/Component/Intl/Resources/data/regions/cs.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis a Futuna",
         "WS": "Samoa",
-        "XA": "simulovaná diakritika",
-        "XB": "simulovaný obousměrný zápis",
         "XK": "Kosovo",
         "YE": "Jemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cy.json b/src/Symfony/Component/Intl/Resources/data/regions/cy.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis a Futuna",
         "WS": "Samoa",
-        "XA": "Acenion Ffug",
-        "XB": "Bidi Ffug",
         "XK": "Kosovo",
         "YE": "Yemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/el.json b/src/Symfony/Component/Intl/Resources/data/regions/el.json
@@ -248,8 +248,6 @@
         "VU": "Βανουάτου",
         "WF": "Γουάλις και Φουτούνα",
         "WS": "Σαμόα",
-        "XA": "Ψευδο-προφορές",
-        "XB": "Ψευδο-αμφικατευθυντικό",
         "XK": "Κοσσυφοπέδιο",
         "YE": "Υεμένη",
         "YT": "Μαγιότ",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/en.json b/src/Symfony/Component/Intl/Resources/data/regions/en.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis & Futuna",
         "WS": "Samoa",
-        "XA": "Pseudo-Accents",
-        "XB": "Pseudo-Bidi",
         "XK": "Kosovo",
         "YE": "Yemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/et.json b/src/Symfony/Component/Intl/Resources/data/regions/et.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis ja Futuna",
         "WS": "Samoa",
-        "XA": "pseudo-aktsent",
-        "XB": "pseudo-Bidi",
         "XK": "Kosovo",
         "YE": "Jeemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fr.json b/src/Symfony/Component/Intl/Resources/data/regions/fr.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis-et-Futuna",
         "WS": "Samoa",
-        "XA": "pseudo-accents",
-        "XB": "pseudo-bidi",
         "XK": "Kosovo",
         "YE": "Yémen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ga.json b/src/Symfony/Component/Intl/Resources/data/regions/ga.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatú",
         "WF": "Vailís agus Futúna",
         "WS": "Samó",
-        "XA": "XA",
-        "XB": "XB",
         "XK": "an Chosaiv",
         "YE": "Éimin",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hr.json b/src/Symfony/Component/Intl/Resources/data/regions/hr.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis i Futuna",
         "WS": "Samoa",
-        "XA": "pseudo naglasci",
-        "XB": "pseudo bidi",
         "XK": "Kosovo",
         "YE": "Jemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hu.json b/src/Symfony/Component/Intl/Resources/data/regions/hu.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis és Futuna",
         "WS": "Szamoa",
-        "XA": "Pszeudo-nyelvjárások",
-        "XB": "Pszeudo-kétirányú",
         "XK": "Koszovó",
         "YE": "Jemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/id.json b/src/Symfony/Component/Intl/Resources/data/regions/id.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Kepulauan Wallis dan Futuna",
         "WS": "Samoa",
-        "XA": "Aksen Asing",
-        "XB": "Pseudo-Bidi",
         "XK": "Kosovo",
         "YE": "Yaman",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/in.json b/src/Symfony/Component/Intl/Resources/data/regions/in.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Kepulauan Wallis dan Futuna",
         "WS": "Samoa",
-        "XA": "Aksen Asing",
-        "XB": "Pseudo-Bidi",
         "XK": "Kosovo",
         "YE": "Yaman",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/it.json b/src/Symfony/Component/Intl/Resources/data/regions/it.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis e Futuna",
         "WS": "Samoa",
-        "XA": "pseudo-accenti",
-        "XB": "pseudo-bidi",
         "XK": "Kosovo",
         "YE": "Yemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/kk.json b/src/Symfony/Component/Intl/Resources/data/regions/kk.json
@@ -248,8 +248,6 @@
         "VU": "Вануату",
         "WF": "Уоллис және Футуна",
         "WS": "Самоа",
-        "XA": "жалған акцент",
-        "XB": "жалған Bidi",
         "XK": "Косово",
         "YE": "Йемен",
         "YT": "Майотта",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ko.json b/src/Symfony/Component/Intl/Resources/data/regions/ko.json
@@ -248,8 +248,6 @@
         "VU": "바누아투",
         "WF": "왈리스-푸투나 제도",
         "WS": "사모아",
-        "XA": "유사 억양",
-        "XB": "유사 양방향",
         "XK": "코소보",
         "YE": "예멘",
         "YT": "마요트",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lt.json b/src/Symfony/Component/Intl/Resources/data/regions/lt.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Volisas ir Futūna",
         "WS": "Samoa",
-        "XA": "XA",
-        "XB": "XB",
         "XK": "Kosovas",
         "YE": "Jemenas",
         "YT": "Majotas",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lv.json b/src/Symfony/Component/Intl/Resources/data/regions/lv.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Volisa un Futunas salas",
         "WS": "Samoa",
-        "XA": "pseidoakcenti",
-        "XB": "pseido-Bidi",
         "XK": "Kosova",
         "YE": "Jemena",
         "YT": "Majota",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/meta.json b/src/Symfony/Component/Intl/Resources/data/regions/meta.json
@@ -248,8 +248,6 @@
         "VU",
         "WF",
         "WS",
-        "XA",
-        "XB",
         "XK",
         "YE",
         "YT",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mk.json b/src/Symfony/Component/Intl/Resources/data/regions/mk.json
@@ -248,8 +248,6 @@
         "VU": "Вануату",
         "WF": "Валис и Футуна",
         "WS": "Самоа",
-        "XA": "псевдо-акценти",
-        "XB": "псевдо-биди",
         "XK": "Косово",
         "YE": "Јемен",
         "YT": "Мајот",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mo.json b/src/Symfony/Component/Intl/Resources/data/regions/mo.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis și Futuna",
         "WS": "Samoa",
-        "XA": "Pseudo-accente",
-        "XB": "Pseudo-Bidi",
         "XK": "Kosovo",
         "YE": "Yemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ms.json b/src/Symfony/Component/Intl/Resources/data/regions/ms.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis dan Futuna",
         "WS": "Samoa",
-        "XA": "XA",
-        "XB": "XB",
         "XK": "Kosovo",
         "YE": "Yaman",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nl.json b/src/Symfony/Component/Intl/Resources/data/regions/nl.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis en Futuna",
         "WS": "Samoa",
-        "XA": "Pseudo-Accenten",
-        "XB": "Pseudo-Bidi",
         "XK": "Kosovo",
         "YE": "Jemen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/or.json b/src/Symfony/Component/Intl/Resources/data/regions/or.json
@@ -248,8 +248,6 @@
         "VU": "ଭାନୁଆତୁ",
         "WF": "ୱାଲିସ୍ ଏବଂ ଫୁତୁନା",
         "WS": "ସାମୋଆ",
-        "XA": "ସିୟୁଡୋ-ଏସେଣ୍ଟ",
-        "XB": "ସିୟୁଡୋ-ବିଡି",
         "XK": "କୋସୋଭୋ",
         "YE": "ୟେମେନ୍",
         "YT": "ମାୟୋଟେ",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pl.json b/src/Symfony/Component/Intl/Resources/data/regions/pl.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis i Futuna",
         "WS": "Samoa",
-        "XA": "Pseudoakcenty",
-        "XB": "Pseudodwukierunkowe",
         "XK": "Kosowo",
         "YE": "Jemen",
         "YT": "Majotta",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ps.json b/src/Symfony/Component/Intl/Resources/data/regions/ps.json
@@ -248,8 +248,6 @@
         "VU": "واناتو",
         "WF": "والیس او فوتونا",
         "WS": "ساموا",
-        "XA": "جعلي خج",
-        "XB": "جعلي بيدي",
         "XK": "کوسوو",
         "YE": "یمن",
         "YT": "مايوټ",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pt.json b/src/Symfony/Component/Intl/Resources/data/regions/pt.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis e Futuna",
         "WS": "Samoa",
-        "XA": "Pseudossotaques",
-        "XB": "Pseudobidi",
         "XK": "Kosovo",
         "YE": "Iêmen",
         "YT": "Mayotte",

diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ro.json b/src/Symfony/Component/Intl/Resources/data/regions/ro.json
@@ -248,8 +248,6 @@
         "VU": "Vanuatu",
         "WF": "Wallis și Futuna",
         "WS": "Samoa",
-        "XA": "Pseudo-accente",
-        "XB": "Pseudo-Bidi",
         "XK": "Kosovo",
         "YE": "Yemen",
         "YT": "Mayotte",