Skip to content

Commit 836c959

Browse files
fabpotfabpot
committed
Merge branch '4.3' into 4.4
* 4.3: [FrameworkBundle] Detect indirect env vars in routing Remove calls to deprecated function assertAttributeX [Intl] Order alpha2 to alpha3 mapping [Routing] added a warning about the getRouteCollection() method Allow sutFqcnResolver to return array [HttpFoundation] Revert getClientIp @return docblock
2 parents 0406a81 + 3a0f543 commit 836c959

File tree

3 files changed

+42
-40
lines changed

3 files changed

+42
-40
lines changed

‎Data/Generator/LanguageDataGenerator.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me
205205
}
206206
}
207207

208+
asort($alpha2ToAlpha3);
209+
208210
return $alpha2ToAlpha3;
209211
}
210212
}

‎Resources/data/languages/meta.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -622,35 +622,29 @@
622622
"Alpha2ToAlpha3": {
623623
"aa": "aar",
624624
"ab": "abk",
625-
"dz": "dzo",
626625
"af": "afr",
627626
"ak": "aka",
628-
"sq": "sqi",
629627
"am": "amh",
630628
"ar": "ara",
631629
"an": "arg",
632-
"hy": "hye",
633630
"as": "asm",
634631
"av": "ava",
635632
"ae": "ave",
636633
"ay": "aym",
637634
"az": "aze",
638635
"ba": "bak",
639636
"bm": "bam",
640-
"eu": "eus",
641637
"be": "bel",
642638
"bn": "ben",
643639
"bi": "bis",
644640
"bo": "bod",
645641
"bs": "bos",
646642
"br": "bre",
647643
"bg": "bul",
648-
"my": "mya",
649644
"ca": "cat",
650645
"cs": "ces",
651646
"ch": "cha",
652647
"ce": "che",
653-
"zh": "zho",
654648
"cu": "chu",
655649
"cv": "chv",
656650
"kw": "cor",
@@ -660,13 +654,12 @@
660654
"da": "dan",
661655
"de": "deu",
662656
"dv": "div",
663-
"mn": "mon",
664-
"nl": "nld",
665-
"et": "est",
657+
"dz": "dzo",
666658
"el": "ell",
667659
"en": "eng",
668660
"eo": "epo",
669-
"ik": "ipk",
661+
"et": "est",
662+
"eu": "eus",
670663
"ee": "ewe",
671664
"fo": "fao",
672665
"fa": "fas",
@@ -675,8 +668,6 @@
675668
"fr": "fra",
676669
"fy": "fry",
677670
"ff": "ful",
678-
"om": "orm",
679-
"ka": "kat",
680671
"gd": "gla",
681672
"ga": "gle",
682673
"gl": "glg",
@@ -691,31 +682,34 @@
691682
"ho": "hmo",
692683
"hr": "hrv",
693684
"hu": "hun",
685+
"hy": "hye",
694686
"ig": "ibo",
695-
"is": "isl",
696687
"io": "ido",
697688
"ii": "iii",
698689
"iu": "iku",
699690
"ie": "ile",
700691
"ia": "ina",
701692
"id": "ind",
693+
"ik": "ipk",
694+
"is": "isl",
702695
"it": "ita",
703696
"jv": "jav",
704697
"ja": "jpn",
705698
"kl": "kal",
706699
"kn": "kan",
707700
"ks": "kas",
701+
"ka": "kat",
708702
"kr": "kau",
709703
"kk": "kaz",
710704
"km": "khm",
711705
"ki": "kik",
712706
"rw": "kin",
713707
"ky": "kir",
714-
"ku": "kur",
715-
"kg": "kon",
716708
"kv": "kom",
709+
"kg": "kon",
717710
"ko": "kor",
718711
"kj": "kua",
712+
"ku": "kur",
719713
"lo": "lao",
720714
"la": "lat",
721715
"lv": "lav",
@@ -725,40 +719,43 @@
725719
"lb": "ltz",
726720
"lu": "lub",
727721
"lg": "lug",
728-
"mk": "mkd",
729722
"mh": "mah",
730723
"ml": "mal",
731-
"mi": "mri",
732724
"mr": "mar",
733-
"ms": "msa",
725+
"mk": "mkd",
734726
"mg": "mlg",
735727
"mt": "mlt",
736-
"ro": "ron",
728+
"mn": "mon",
729+
"mi": "mri",
730+
"ms": "msa",
731+
"my": "mya",
737732
"na": "nau",
738733
"nv": "nav",
739734
"nr": "nbl",
740735
"nd": "nde",
741736
"ng": "ndo",
742737
"ne": "nep",
738+
"nl": "nld",
743739
"nn": "nno",
744740
"nb": "nob",
745741
"ny": "nya",
746742
"oc": "oci",
747743
"oj": "oji",
748744
"or": "ori",
745+
"om": "orm",
749746
"os": "oss",
750747
"pa": "pan",
751-
"ps": "pus",
752748
"pi": "pli",
753749
"pl": "pol",
754750
"pt": "por",
751+
"ps": "pus",
755752
"qu": "que",
756753
"rm": "roh",
754+
"ro": "ron",
757755
"rn": "run",
758756
"ru": "rus",
759757
"sg": "sag",
760758
"sa": "san",
761-
"sr": "srp",
762759
"si": "sin",
763760
"sk": "slk",
764761
"sl": "slv",
@@ -769,7 +766,9 @@
769766
"so": "som",
770767
"st": "sot",
771768
"es": "spa",
769+
"sq": "sqi",
772770
"sc": "srd",
771+
"sr": "srp",
773772
"ss": "ssw",
774773
"su": "sun",
775774
"sw": "swa",
@@ -799,6 +798,7 @@
799798
"yi": "yid",
800799
"yo": "yor",
801800
"za": "zha",
801+
"zh": "zho",
802802
"zu": "zul"
803803
}
804804
}

‎Tests/Data/Provider/AbstractLanguageDataProviderTest.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -647,32 +647,27 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
647647
'ab' => 'abk',
648648
'af' => 'afr',
649649
'ak' => 'aka',
650-
'sq' => 'sqi',
651650
'am' => 'amh',
652651
'ar' => 'ara',
653652
'an' => 'arg',
654-
'hy' => 'hye',
655653
'as' => 'asm',
656654
'av' => 'ava',
657655
'ae' => 'ave',
658656
'ay' => 'aym',
659657
'az' => 'aze',
660658
'ba' => 'bak',
661659
'bm' => 'bam',
662-
'eu' => 'eus',
663660
'be' => 'bel',
664661
'bn' => 'ben',
665662
'bi' => 'bis',
666663
'bo' => 'bod',
667664
'bs' => 'bos',
668665
'br' => 'bre',
669666
'bg' => 'bul',
670-
'my' => 'mya',
671667
'ca' => 'cat',
672668
'cs' => 'ces',
673669
'ch' => 'cha',
674670
'ce' => 'che',
675-
'zh' => 'zho',
676671
'cu' => 'chu',
677672
'cv' => 'chv',
678673
'kw' => 'cor',
@@ -682,13 +677,12 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
682677
'da' => 'dan',
683678
'de' => 'deu',
684679
'dv' => 'div',
685-
'nl' => 'nld',
686680
'dz' => 'dzo',
687-
'et' => 'est',
688681
'el' => 'ell',
689682
'en' => 'eng',
690683
'eo' => 'epo',
691-
'ik' => 'ipk',
684+
'et' => 'est',
685+
'eu' => 'eus',
692686
'ee' => 'ewe',
693687
'fo' => 'fao',
694688
'fa' => 'fas',
@@ -697,8 +691,6 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
697691
'fr' => 'fra',
698692
'fy' => 'fry',
699693
'ff' => 'ful',
700-
'om' => 'orm',
701-
'ka' => 'kat',
702694
'gd' => 'gla',
703695
'ga' => 'gle',
704696
'gl' => 'glg',
@@ -713,32 +705,34 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
713705
'ho' => 'hmo',
714706
'hr' => 'hrv',
715707
'hu' => 'hun',
708+
'hy' => 'hye',
716709
'ig' => 'ibo',
717-
'is' => 'isl',
718710
'io' => 'ido',
719711
'ii' => 'iii',
720712
'iu' => 'iku',
721713
'ie' => 'ile',
722714
'ia' => 'ina',
723715
'id' => 'ind',
716+
'ik' => 'ipk',
717+
'is' => 'isl',
724718
'it' => 'ita',
725719
'jv' => 'jav',
726720
'ja' => 'jpn',
727721
'kl' => 'kal',
728722
'kn' => 'kan',
729723
'ks' => 'kas',
724+
'ka' => 'kat',
730725
'kr' => 'kau',
731726
'kk' => 'kaz',
732-
'mn' => 'mon',
733727
'km' => 'khm',
734728
'ki' => 'kik',
735729
'rw' => 'kin',
736730
'ky' => 'kir',
737-
'ku' => 'kur',
738-
'kg' => 'kon',
739731
'kv' => 'kom',
732+
'kg' => 'kon',
740733
'ko' => 'kor',
741734
'kj' => 'kua',
735+
'ku' => 'kur',
742736
'lo' => 'lao',
743737
'la' => 'lat',
744738
'lv' => 'lav',
@@ -748,40 +742,43 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
748742
'lb' => 'ltz',
749743
'lu' => 'lub',
750744
'lg' => 'lug',
751-
'mk' => 'mkd',
752745
'mh' => 'mah',
753746
'ml' => 'mal',
754-
'mi' => 'mri',
755747
'mr' => 'mar',
756-
'ms' => 'msa',
748+
'mk' => 'mkd',
757749
'mg' => 'mlg',
758750
'mt' => 'mlt',
751+
'mn' => 'mon',
752+
'mi' => 'mri',
753+
'ms' => 'msa',
754+
'my' => 'mya',
759755
'na' => 'nau',
760756
'nv' => 'nav',
761757
'nr' => 'nbl',
762758
'nd' => 'nde',
763759
'ng' => 'ndo',
764760
'ne' => 'nep',
761+
'nl' => 'nld',
765762
'nn' => 'nno',
766763
'nb' => 'nob',
767764
'ny' => 'nya',
768765
'oc' => 'oci',
769766
'oj' => 'oji',
770767
'or' => 'ori',
768+
'om' => 'orm',
771769
'os' => 'oss',
772770
'pa' => 'pan',
773-
'ps' => 'pus',
774771
'pi' => 'pli',
775772
'pl' => 'pol',
776773
'pt' => 'por',
774+
'ps' => 'pus',
777775
'qu' => 'que',
778776
'rm' => 'roh',
779777
'ro' => 'ron',
780778
'rn' => 'run',
781779
'ru' => 'rus',
782780
'sg' => 'sag',
783781
'sa' => 'san',
784-
'sr' => 'srp',
785782
'si' => 'sin',
786783
'sk' => 'slk',
787784
'sl' => 'slv',
@@ -792,7 +789,9 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
792789
'so' => 'som',
793790
'st' => 'sot',
794791
'es' => 'spa',
792+
'sq' => 'sqi',
795793
'sc' => 'srd',
794+
'sr' => 'srp',
796795
'ss' => 'ssw',
797796
'su' => 'sun',
798797
'sw' => 'swa',
@@ -822,6 +821,7 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
822821
'yi' => 'yid',
823822
'yo' => 'yor',
824823
'za' => 'zha',
824+
'zh' => 'zho',
825825
'zu' => 'zul',
826826
];
827827

0 commit comments

Comments
 (0)