Skip to content

Commit 3a0f543

Browse files
fabpotfabpot
committed
Merge branch '3.4' into 4.3
* 3.4: [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 8682e5c + 851501d commit 3a0f543

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
@@ -204,6 +204,8 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me
204204
}
205205
}
206206

207+
asort($alpha2ToAlpha3);
208+
207209
return $alpha2ToAlpha3;
208210
}
209211
}

‎Resources/data/languages/meta.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -623,35 +623,29 @@
623623
"Alpha2ToAlpha3": {
624624
"aa": "aar",
625625
"ab": "abk",
626-
"dz": "dzo",
627626
"af": "afr",
628627
"ak": "aka",
629-
"sq": "sqi",
630628
"am": "amh",
631629
"ar": "ara",
632630
"an": "arg",
633-
"hy": "hye",
634631
"as": "asm",
635632
"av": "ava",
636633
"ae": "ave",
637634
"ay": "aym",
638635
"az": "aze",
639636
"ba": "bak",
640637
"bm": "bam",
641-
"eu": "eus",
642638
"be": "bel",
643639
"bn": "ben",
644640
"bi": "bis",
645641
"bo": "bod",
646642
"bs": "bos",
647643
"br": "bre",
648644
"bg": "bul",
649-
"my": "mya",
650645
"ca": "cat",
651646
"cs": "ces",
652647
"ch": "cha",
653648
"ce": "che",
654-
"zh": "zho",
655649
"cu": "chu",
656650
"cv": "chv",
657651
"kw": "cor",
@@ -661,13 +655,12 @@
661655
"da": "dan",
662656
"de": "deu",
663657
"dv": "div",
664-
"mn": "mon",
665-
"nl": "nld",
666-
"et": "est",
658+
"dz": "dzo",
667659
"el": "ell",
668660
"en": "eng",
669661
"eo": "epo",
670-
"ik": "ipk",
662+
"et": "est",
663+
"eu": "eus",
671664
"ee": "ewe",
672665
"fo": "fao",
673666
"fa": "fas",
@@ -676,8 +669,6 @@
676669
"fr": "fra",
677670
"fy": "fry",
678671
"ff": "ful",
679-
"om": "orm",
680-
"ka": "kat",
681672
"gd": "gla",
682673
"ga": "gle",
683674
"gl": "glg",
@@ -692,31 +683,34 @@
692683
"ho": "hmo",
693684
"hr": "hrv",
694685
"hu": "hun",
686+
"hy": "hye",
695687
"ig": "ibo",
696-
"is": "isl",
697688
"io": "ido",
698689
"ii": "iii",
699690
"iu": "iku",
700691
"ie": "ile",
701692
"ia": "ina",
702693
"id": "ind",
694+
"ik": "ipk",
695+
"is": "isl",
703696
"it": "ita",
704697
"jv": "jav",
705698
"ja": "jpn",
706699
"kl": "kal",
707700
"kn": "kan",
708701
"ks": "kas",
702+
"ka": "kat",
709703
"kr": "kau",
710704
"kk": "kaz",
711705
"km": "khm",
712706
"ki": "kik",
713707
"rw": "kin",
714708
"ky": "kir",
715-
"ku": "kur",
716-
"kg": "kon",
717709
"kv": "kom",
710+
"kg": "kon",
718711
"ko": "kor",
719712
"kj": "kua",
713+
"ku": "kur",
720714
"lo": "lao",
721715
"la": "lat",
722716
"lv": "lav",
@@ -726,40 +720,43 @@
726720
"lb": "ltz",
727721
"lu": "lub",
728722
"lg": "lug",
729-
"mk": "mkd",
730723
"mh": "mah",
731724
"ml": "mal",
732-
"mi": "mri",
733725
"mr": "mar",
734-
"ms": "msa",
726+
"mk": "mkd",
735727
"mg": "mlg",
736728
"mt": "mlt",
737-
"ro": "ron",
729+
"mn": "mon",
730+
"mi": "mri",
731+
"ms": "msa",
732+
"my": "mya",
738733
"na": "nau",
739734
"nv": "nav",
740735
"nr": "nbl",
741736
"nd": "nde",
742737
"ng": "ndo",
743738
"ne": "nep",
739+
"nl": "nld",
744740
"nn": "nno",
745741
"nb": "nob",
746742
"ny": "nya",
747743
"oc": "oci",
748744
"oj": "oji",
749745
"or": "ori",
746+
"om": "orm",
750747
"os": "oss",
751748
"pa": "pan",
752-
"ps": "pus",
753749
"pi": "pli",
754750
"pl": "pol",
755751
"pt": "por",
752+
"ps": "pus",
756753
"qu": "que",
757754
"rm": "roh",
755+
"ro": "ron",
758756
"rn": "run",
759757
"ru": "rus",
760758
"sg": "sag",
761759
"sa": "san",
762-
"sr": "srp",
763760
"si": "sin",
764761
"sk": "slk",
765762
"sl": "slv",
@@ -770,7 +767,9 @@
770767
"so": "som",
771768
"st": "sot",
772769
"es": "spa",
770+
"sq": "sqi",
773771
"sc": "srd",
772+
"sr": "srp",
774773
"ss": "ssw",
775774
"su": "sun",
776775
"sw": "swa",
@@ -800,6 +799,7 @@
800799
"yi": "yid",
801800
"yo": "yor",
802801
"za": "zha",
802+
"zh": "zho",
803803
"zu": "zul"
804804
}
805805
}

‎Tests/Data/Provider/AbstractLanguageDataProviderTest.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -648,32 +648,27 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
648648
'ab' => 'abk',
649649
'af' => 'afr',
650650
'ak' => 'aka',
651-
'sq' => 'sqi',
652651
'am' => 'amh',
653652
'ar' => 'ara',
654653
'an' => 'arg',
655-
'hy' => 'hye',
656654
'as' => 'asm',
657655
'av' => 'ava',
658656
'ae' => 'ave',
659657
'ay' => 'aym',
660658
'az' => 'aze',
661659
'ba' => 'bak',
662660
'bm' => 'bam',
663-
'eu' => 'eus',
664661
'be' => 'bel',
665662
'bn' => 'ben',
666663
'bi' => 'bis',
667664
'bo' => 'bod',
668665
'bs' => 'bos',
669666
'br' => 'bre',
670667
'bg' => 'bul',
671-
'my' => 'mya',
672668
'ca' => 'cat',
673669
'cs' => 'ces',
674670
'ch' => 'cha',
675671
'ce' => 'che',
676-
'zh' => 'zho',
677672
'cu' => 'chu',
678673
'cv' => 'chv',
679674
'kw' => 'cor',
@@ -683,13 +678,12 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
683678
'da' => 'dan',
684679
'de' => 'deu',
685680
'dv' => 'div',
686-
'nl' => 'nld',
687681
'dz' => 'dzo',
688-
'et' => 'est',
689682
'el' => 'ell',
690683
'en' => 'eng',
691684
'eo' => 'epo',
692-
'ik' => 'ipk',
685+
'et' => 'est',
686+
'eu' => 'eus',
693687
'ee' => 'ewe',
694688
'fo' => 'fao',
695689
'fa' => 'fas',
@@ -698,8 +692,6 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
698692
'fr' => 'fra',
699693
'fy' => 'fry',
700694
'ff' => 'ful',
701-
'om' => 'orm',
702-
'ka' => 'kat',
703695
'gd' => 'gla',
704696
'ga' => 'gle',
705697
'gl' => 'glg',
@@ -714,32 +706,34 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
714706
'ho' => 'hmo',
715707
'hr' => 'hrv',
716708
'hu' => 'hun',
709+
'hy' => 'hye',
717710
'ig' => 'ibo',
718-
'is' => 'isl',
719711
'io' => 'ido',
720712
'ii' => 'iii',
721713
'iu' => 'iku',
722714
'ie' => 'ile',
723715
'ia' => 'ina',
724716
'id' => 'ind',
717+
'ik' => 'ipk',
718+
'is' => 'isl',
725719
'it' => 'ita',
726720
'jv' => 'jav',
727721
'ja' => 'jpn',
728722
'kl' => 'kal',
729723
'kn' => 'kan',
730724
'ks' => 'kas',
725+
'ka' => 'kat',
731726
'kr' => 'kau',
732727
'kk' => 'kaz',
733-
'mn' => 'mon',
734728
'km' => 'khm',
735729
'ki' => 'kik',
736730
'rw' => 'kin',
737731
'ky' => 'kir',
738-
'ku' => 'kur',
739-
'kg' => 'kon',
740732
'kv' => 'kom',
733+
'kg' => 'kon',
741734
'ko' => 'kor',
742735
'kj' => 'kua',
736+
'ku' => 'kur',
743737
'lo' => 'lao',
744738
'la' => 'lat',
745739
'lv' => 'lav',
@@ -749,40 +743,43 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
749743
'lb' => 'ltz',
750744
'lu' => 'lub',
751745
'lg' => 'lug',
752-
'mk' => 'mkd',
753746
'mh' => 'mah',
754747
'ml' => 'mal',
755-
'mi' => 'mri',
756748
'mr' => 'mar',
757-
'ms' => 'msa',
749+
'mk' => 'mkd',
758750
'mg' => 'mlg',
759751
'mt' => 'mlt',
752+
'mn' => 'mon',
753+
'mi' => 'mri',
754+
'ms' => 'msa',
755+
'my' => 'mya',
760756
'na' => 'nau',
761757
'nv' => 'nav',
762758
'nr' => 'nbl',
763759
'nd' => 'nde',
764760
'ng' => 'ndo',
765761
'ne' => 'nep',
762+
'nl' => 'nld',
766763
'nn' => 'nno',
767764
'nb' => 'nob',
768765
'ny' => 'nya',
769766
'oc' => 'oci',
770767
'oj' => 'oji',
771768
'or' => 'ori',
769+
'om' => 'orm',
772770
'os' => 'oss',
773771
'pa' => 'pan',
774-
'ps' => 'pus',
775772
'pi' => 'pli',
776773
'pl' => 'pol',
777774
'pt' => 'por',
775+
'ps' => 'pus',
778776
'qu' => 'que',
779777
'rm' => 'roh',
780778
'ro' => 'ron',
781779
'rn' => 'run',
782780
'ru' => 'rus',
783781
'sg' => 'sag',
784782
'sa' => 'san',
785-
'sr' => 'srp',
786783
'si' => 'sin',
787784
'sk' => 'slk',
788785
'sl' => 'slv',
@@ -793,7 +790,9 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
793790
'so' => 'som',
794791
'st' => 'sot',
795792
'es' => 'spa',
793+
'sq' => 'sqi',
796794
'sc' => 'srd',
795+
'sr' => 'srp',
797796
'ss' => 'ssw',
798797
'su' => 'sun',
799798
'sw' => 'swa',
@@ -823,6 +822,7 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
823822
'yi' => 'yid',
824823
'yo' => 'yor',
825824
'za' => 'zha',
825+
'zh' => 'zho',
826826
'zu' => 'zul',
827827
];
828828

0 commit comments

Comments
 (0)