Skip to content

Commit 2fa074d

Browse files
committed
Merge branch '7.3' into 7.4
* 7.3: fix test Restore Relay 8.5 test account for PHP_ZTS being a boolean value on PHP 8.4+ [Intl] Update data to ICU 78.1 [Notifier][Smsbox] Add tests for `Mode` enum [DependencyInjection] Remove unused variable [Console] Fix exception message when abbreviation matches multiple hidden commands [FrameworkBundle] Fix TypeError when traversing scalar values in debug:config [DependencyInjection] Fix loop corruption in CheckTypeDeclarationsPass [Security] Fix UserBadge validation bypass via identifier normalizer [DependencyInjection] Fix invalid PHP syntax for nullable TypedReference in PhpDumper Fix typo in comment [Translation][Routing] Fix typos [Config] Fix nullable EnumNode with BackedEnum [String] Fix normalization in trimPrefix/trimSuffix
2 parents 808e80e + 14092dd commit 2fa074d

File tree

592 files changed

+19186
-6790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

592 files changed

+19186
-6790
lines changed

Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public static function getIcuDataVersion(): string
106106
*/
107107
public static function getIcuStubVersion(): string
108108
{
109-
return '77.1';
109+
return '78.1';
110110
}
111111

112112
/**

Resources/bin/update-data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
echo "Git clone to {$repoDir} complete.\n";
7878
}
7979

80-
$gitTag = $git->getLastTag(fn ($tag) => preg_match('#^release-[0-9]{1,}-[0-9]{1}$#', $tag));
81-
$shortIcuVersion = strip_minor_versions(preg_replace('#release-([0-9]{1,})-([0-9]{1,})#', '$1.$2', $gitTag));
80+
$gitTag = $git->getLastTag(fn ($tag) => preg_match('#^release-[0-9]{1,}[.-][0-9]{1}$#', $tag));
81+
$shortIcuVersion = strip_minor_versions(preg_replace('#release-([0-9]{1,})[.-]([0-9]{1,})#', '$1.$2', $gitTag));
8282

8383
echo "Checking out `{$gitTag}` for version `{$shortIcuVersion}`...\n";
8484
$git->checkout('tags/'.$gitTag);

Resources/data/currencies/af.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
],
9797
'BYN' => [
9898
'BYN',
99-
'Belarusiese roebel',
99+
'Belarussiese roebel',
100100
],
101101
'BYR' => [
102102
'BYR',
@@ -184,7 +184,7 @@
184184
],
185185
'EUR' => [
186186
'',
187-
'Euro',
187+
'euro',
188188
],
189189
'FJD' => [
190190
'FJD',
@@ -348,7 +348,7 @@
348348
],
349349
'LSL' => [
350350
'LSL',
351-
'Lesotho loti',
351+
'Lesotho-loti',
352352
],
353353
'LTL' => [
354354
'LTL',
@@ -540,7 +540,7 @@
540540
],
541541
'SLL' => [
542542
'SLL',
543-
'Sierra Leoniese leone (19642022)',
543+
'Sierra Leoniese leone (19642022)',
544544
],
545545
'SOS' => [
546546
'SOS',
@@ -658,6 +658,10 @@
658658
'EC$',
659659
'Oos-Karibiese dollar',
660660
],
661+
'XCG' => [
662+
'Cg.',
663+
'Karibiese gulde',
664+
],
661665
'XOF' => [
662666
'F CFA',
663667
'Wes-Afrikaanse CFA-frank',
@@ -686,5 +690,9 @@
686690
'ZWD',
687691
'Zimbabwiese dollar',
688692
],
693+
'ZWG' => [
694+
'ZWG',
695+
'Zimbabwiese goud',
696+
],
689697
],
690698
];

Resources/data/currencies/ak.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
],
125125
'CNY' => [
126126
'CN¥',
127-
'kyaena yuan',
127+
'Kyaena yuan',
128128
],
129129
'COP' => [
130130
'COP',
@@ -180,7 +180,7 @@
180180
],
181181
'EUR' => [
182182
'',
183-
'Iro',
183+
'yuro',
184184
],
185185
'FJD' => [
186186
'FJD',
@@ -552,7 +552,7 @@
552552
],
553553
'SZL' => [
554554
'SZL',
555-
'Lilangeni',
555+
'Swazi lilangeni',
556556
],
557557
'THB' => [
558558
'THB',
@@ -634,6 +634,10 @@
634634
'EC$',
635635
'Karibine Apueeɛ dɔla',
636636
],
637+
'XCG' => [
638+
'Cg.',
639+
'Karibiafoᴐ giida',
640+
],
637641
'XOF' => [
638642
'AAS',
639643
'Afrika Atɔeɛ Sefa',
@@ -662,5 +666,9 @@
662666
'ZWD',
663667
'Zimbabwe Dɔla',
664668
],
669+
'ZWG' => [
670+
'ZWG',
671+
'Zimbabwe sika kᴐkᴐᴐ',
672+
],
665673
],
666674
];

Resources/data/currencies/am.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,10 @@
642642
'EC$',
643643
'የምዕራብ ካሪብያን ዶላር',
644644
],
645+
'XCG' => [
646+
'Cg.',
647+
'የካሪቢያን ጊልደር',
648+
],
645649
'XOF' => [
646650
'F CFA',
647651
'የምዕራብ አፍሪካ ሴፋ ፍራንክ',
@@ -670,5 +674,9 @@
670674
'ZWD',
671675
'የዚምቧቡዌ ዶላር',
672676
],
677+
'ZWG' => [
678+
'ZWG',
679+
'የዚምባብዌ ወርቅ',
680+
],
673681
],
674682
];

Resources/data/currencies/ar.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -930,6 +930,10 @@
930930
'EC$',
931931
'دولار شرق الكاريبي',
932932
],
933+
'XCG' => [
934+
'Cg.',
935+
'غيلدر كاريبي',
936+
],
933937
'XEU' => [
934938
'XEU',
935939
'وحدة النقد الأوروبية',
@@ -994,6 +998,10 @@
994998
'ZWD',
995999
'دولار زمبابوي',
9961000
],
1001+
'ZWG' => [
1002+
'ZWG',
1003+
'ذهب زيمبابوي',
1004+
],
9971005
'ZWL' => [
9981006
'ZWL',
9991007
'دولار زمبابوي 2009',

Resources/data/currencies/as.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,10 @@
626626
'EC$',
627627
'ইষ্ট কেৰিবিয়ান ডলাৰ',
628628
],
629+
'XCG' => [
630+
'Cg.',
631+
'কেৰিবীয়ান গিল্ডাৰ',
632+
],
629633
'XOF' => [
630634
'F CFA',
631635
'পশ্চিম আফ্ৰিকান CFA ফ্ৰেংক',
@@ -646,5 +650,9 @@
646650
'ZMW',
647651
'জাম্বিয়ান কোৱাচা',
648652
],
653+
'ZWG' => [
654+
'ZWG',
655+
'জিম্বাৱীয় সোণ',
656+
],
649657
],
650658
];

Resources/data/currencies/az.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,10 @@
990990
'EC$',
991991
'Şərqi Karib Dolları',
992992
],
993+
'XCG' => [
994+
'Cg.',
995+
'Karib gilderi',
996+
],
993997
'XFO' => [
994998
'XFO',
995999
'Fransız Gızıl Frankı',
@@ -1054,6 +1058,10 @@
10541058
'ZWD',
10551059
'Zimbabve Dolları (1980–2008)',
10561060
],
1061+
'ZWG' => [
1062+
'ZWG',
1063+
'Zimbabve Qızılı',
1064+
],
10571065
'ZWL' => [
10581066
'ZWL',
10591067
'Zimbabve Dolları (2009)',

0 commit comments

Comments
 (0)