[Intl] Order alpha2 to alpha3 mapping

ro0NL · ro0NL · commit 851501da3ad1 · 2019-08-04T08:13:19.000+02:00
diff --git a/Data/Generator/LanguageDataGenerator.php b/Data/Generator/LanguageDataGenerator.php
@@ -193,6 +193,8 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me
             }
         }
 
+        asort($alpha2ToAlpha3);
+
         return $alpha2ToAlpha3;
     }
 }
diff --git a/Resources/data/languages/meta.json b/Resources/data/languages/meta.json
@@ -626,35 +626,29 @@
     "Alpha2ToAlpha3": {
         "aa": "aar",
         "ab": "abk",
-        "dz": "dzo",
         "af": "afr",
         "ak": "aka",
-        "sq": "sqi",
         "am": "amh",
         "ar": "ara",
         "an": "arg",
-        "hy": "hye",
         "as": "asm",
         "av": "ava",
         "ae": "ave",
         "ay": "aym",
         "az": "aze",
         "ba": "bak",
         "bm": "bam",
-        "eu": "eus",
         "be": "bel",
         "bn": "ben",
         "bi": "bis",
         "bo": "bod",
         "bs": "bos",
         "br": "bre",
         "bg": "bul",
-        "my": "mya",
         "ca": "cat",
         "cs": "ces",
         "ch": "cha",
         "ce": "che",
-        "zh": "zho",
         "cu": "chu",
         "cv": "chv",
         "kw": "cor",
@@ -664,13 +658,12 @@
         "da": "dan",
         "de": "deu",
         "dv": "div",
-        "mn": "mon",
-        "nl": "nld",
-        "et": "est",
+        "dz": "dzo",
         "el": "ell",
         "en": "eng",
         "eo": "epo",
-        "ik": "ipk",
+        "et": "est",
+        "eu": "eus",
         "ee": "ewe",
         "fo": "fao",
         "fa": "fas",
@@ -679,8 +672,6 @@
         "fr": "fra",
         "fy": "fry",
         "ff": "ful",
-        "om": "orm",
-        "ka": "kat",
         "gd": "gla",
         "ga": "gle",
         "gl": "glg",
@@ -695,31 +686,34 @@
         "ho": "hmo",
         "hr": "hrv",
         "hu": "hun",
+        "hy": "hye",
         "ig": "ibo",
-        "is": "isl",
         "io": "ido",
         "ii": "iii",
         "iu": "iku",
         "ie": "ile",
         "ia": "ina",
         "id": "ind",
+        "ik": "ipk",
+        "is": "isl",
         "it": "ita",
         "jv": "jav",
         "ja": "jpn",
         "kl": "kal",
         "kn": "kan",
         "ks": "kas",
+        "ka": "kat",
         "kr": "kau",
         "kk": "kaz",
         "km": "khm",
         "ki": "kik",
         "rw": "kin",
         "ky": "kir",
-        "ku": "kur",
-        "kg": "kon",
         "kv": "kom",
+        "kg": "kon",
         "ko": "kor",
         "kj": "kua",
+        "ku": "kur",
         "lo": "lao",
         "la": "lat",
         "lv": "lav",
@@ -729,40 +723,43 @@
         "lb": "ltz",
         "lu": "lub",
         "lg": "lug",
-        "mk": "mkd",
         "mh": "mah",
         "ml": "mal",
-        "mi": "mri",
         "mr": "mar",
-        "ms": "msa",
+        "mk": "mkd",
         "mg": "mlg",
         "mt": "mlt",
-        "ro": "ron",
+        "mn": "mon",
+        "mi": "mri",
+        "ms": "msa",
+        "my": "mya",
         "na": "nau",
         "nv": "nav",
         "nr": "nbl",
         "nd": "nde",
         "ng": "ndo",
         "ne": "nep",
+        "nl": "nld",
         "nn": "nno",
         "nb": "nob",
         "ny": "nya",
         "oc": "oci",
         "oj": "oji",
         "or": "ori",
+        "om": "orm",
         "os": "oss",
         "pa": "pan",
-        "ps": "pus",
         "pi": "pli",
         "pl": "pol",
         "pt": "por",
+        "ps": "pus",
         "qu": "que",
         "rm": "roh",
+        "ro": "ron",
         "rn": "run",
         "ru": "rus",
         "sg": "sag",
         "sa": "san",
-        "sr": "srp",
         "si": "sin",
         "sk": "slk",
         "sl": "slv",
@@ -773,7 +770,9 @@
         "so": "som",
         "st": "sot",
         "es": "spa",
+        "sq": "sqi",
         "sc": "srd",
+        "sr": "srp",
         "ss": "ssw",
         "su": "sun",
         "sw": "swa",
@@ -803,6 +802,7 @@
         "yi": "yid",
         "yo": "yor",
         "za": "zha",
+        "zh": "zho",
         "zu": "zul"
     }
 }
diff --git a/Tests/Data/Provider/AbstractLanguageDataProviderTest.php b/Tests/Data/Provider/AbstractLanguageDataProviderTest.php
@@ -649,32 +649,27 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'ab' => 'abk',
         'af' => 'afr',
         'ak' => 'aka',
-        'sq' => 'sqi',
         'am' => 'amh',
         'ar' => 'ara',
         'an' => 'arg',
-        'hy' => 'hye',
         'as' => 'asm',
         'av' => 'ava',
         'ae' => 'ave',
         'ay' => 'aym',
         'az' => 'aze',
         'ba' => 'bak',
         'bm' => 'bam',
-        'eu' => 'eus',
         'be' => 'bel',
         'bn' => 'ben',
         'bi' => 'bis',
         'bo' => 'bod',
         'bs' => 'bos',
         'br' => 'bre',
         'bg' => 'bul',
-        'my' => 'mya',
         'ca' => 'cat',
         'cs' => 'ces',
         'ch' => 'cha',
         'ce' => 'che',
-        'zh' => 'zho',
         'cu' => 'chu',
         'cv' => 'chv',
         'kw' => 'cor',
@@ -684,13 +679,12 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'da' => 'dan',
         'de' => 'deu',
         'dv' => 'div',
-        'nl' => 'nld',
         'dz' => 'dzo',
-        'et' => 'est',
         'el' => 'ell',
         'en' => 'eng',
         'eo' => 'epo',
-        'ik' => 'ipk',
+        'et' => 'est',
+        'eu' => 'eus',
         'ee' => 'ewe',
         'fo' => 'fao',
         'fa' => 'fas',
@@ -699,8 +693,6 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'fr' => 'fra',
         'fy' => 'fry',
         'ff' => 'ful',
-        'om' => 'orm',
-        'ka' => 'kat',
         'gd' => 'gla',
         'ga' => 'gle',
         'gl' => 'glg',
@@ -715,32 +707,34 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'ho' => 'hmo',
         'hr' => 'hrv',
         'hu' => 'hun',
+        'hy' => 'hye',
         'ig' => 'ibo',
-        'is' => 'isl',
         'io' => 'ido',
         'ii' => 'iii',
         'iu' => 'iku',
         'ie' => 'ile',
         'ia' => 'ina',
         'id' => 'ind',
+        'ik' => 'ipk',
+        'is' => 'isl',
         'it' => 'ita',
         'jv' => 'jav',
         'ja' => 'jpn',
         'kl' => 'kal',
         'kn' => 'kan',
         'ks' => 'kas',
+        'ka' => 'kat',
         'kr' => 'kau',
         'kk' => 'kaz',
-        'mn' => 'mon',
         'km' => 'khm',
         'ki' => 'kik',
         'rw' => 'kin',
         'ky' => 'kir',
-        'ku' => 'kur',
-        'kg' => 'kon',
         'kv' => 'kom',
+        'kg' => 'kon',
         'ko' => 'kor',
         'kj' => 'kua',
+        'ku' => 'kur',
         'lo' => 'lao',
         'la' => 'lat',
         'lv' => 'lav',
@@ -750,40 +744,43 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'lb' => 'ltz',
         'lu' => 'lub',
         'lg' => 'lug',
-        'mk' => 'mkd',
         'mh' => 'mah',
         'ml' => 'mal',
-        'mi' => 'mri',
         'mr' => 'mar',
-        'ms' => 'msa',
+        'mk' => 'mkd',
         'mg' => 'mlg',
         'mt' => 'mlt',
+        'mn' => 'mon',
+        'mi' => 'mri',
+        'ms' => 'msa',
+        'my' => 'mya',
         'na' => 'nau',
         'nv' => 'nav',
         'nr' => 'nbl',
         'nd' => 'nde',
         'ng' => 'ndo',
         'ne' => 'nep',
+        'nl' => 'nld',
         'nn' => 'nno',
         'nb' => 'nob',
         'ny' => 'nya',
         'oc' => 'oci',
         'oj' => 'oji',
         'or' => 'ori',
+        'om' => 'orm',
         'os' => 'oss',
         'pa' => 'pan',
-        'ps' => 'pus',
         'pi' => 'pli',
         'pl' => 'pol',
         'pt' => 'por',
+        'ps' => 'pus',
         'qu' => 'que',
         'rm' => 'roh',
         'ro' => 'ron',
         'rn' => 'run',
         'ru' => 'rus',
         'sg' => 'sag',
         'sa' => 'san',
-        'sr' => 'srp',
         'si' => 'sin',
         'sk' => 'slk',
         'sl' => 'slv',
@@ -794,7 +791,9 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'so' => 'som',
         'st' => 'sot',
         'es' => 'spa',
+        'sq' => 'sqi',
         'sc' => 'srd',
+        'sr' => 'srp',
         'ss' => 'ssw',
         'su' => 'sun',
         'sw' => 'swa',
@@ -824,6 +823,7 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
         'yi' => 'yid',
         'yo' => 'yor',
         'za' => 'zha',
+        'zh' => 'zho',
         'zu' => 'zul',
     ];
 

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,8 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`
	`196`	`+ asort($alpha2ToAlpha3);`
	`197`	`+`
`196`	`198`	`return $alpha2ToAlpha3;`
`197`	`199`	`}`
`198`	`200`	`}`