Skip to content

Commit 9fc07ba

Browse files
Merge branch '6.0' into 6.1
* 6.0: (22 commits) Add missing license header Add missing license header [Workflow] Catch error when trying to get an uninitialized marking Add missing license header Allow usage of Provider domains if possible Use reference date in reverse transform Fixes #40997 Fix env resolution in lock configuration Fix Symfony not working on SMB share #45990 [Messenger] DoctrineTransportFactory works with notify and decorated PostgreSQL driver [Cache] make LockRegistry use static properties instead of static variables fix: return-path has higher priority for envelope address than from address (fixes #41322) [HttpClient] Fix sending content-length when streaming the body [Console] Header with column max width is now well wrap with separator Fix use_cookies framework session configuration [FrameworkBundle] [Command] Fix `debug:router --no-interaction` error … [Intl] Update the ICU data to 71.1 - 5.4 [Intl] Update the ICU data to 71.1 - 4.4 Add tests to messenger connection get for OraclePlatform [RateLimiter] Adding default empty value [DependencyInjection] Add TaggedIteratorArgument unit tests ...
2 parents 9ec99bc + 2ef7cb9 commit 9fc07ba

File tree

201 files changed

+3995
-2013
lines changed

Some content is hidden

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

201 files changed

+3995
-2013
lines changed

Data/Generator/RegionDataGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static function isValidCountryCode(int|string|null $region)
7474
}
7575

7676
// WORLD/CONTINENT/SUBCONTINENT/GROUPING
77-
if (ctype_digit($region) || \is_int($region)) {
77+
if (\is_int($region) || ctype_digit($region)) {
7878
return false;
7979
}
8080

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 '70.1';
109+
return '71.1';
110110
}
111111

112112
/**

Resources/data/currencies/en.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@
800800
],
801801
'PHP' => [
802802
0 => '',
803-
1 => 'Philippine Piso',
803+
1 => 'Philippine Peso',
804804
],
805805
'PKR' => [
806806
0 => 'PKR',
@@ -898,6 +898,10 @@
898898
0 => 'SKK',
899899
1 => 'Slovak Koruna',
900900
],
901+
'SLE' => [
902+
0 => 'SLE',
903+
1 => 'Sierra Leonean New Leone',
904+
],
901905
'SLL' => [
902906
0 => 'SLL',
903907
1 => 'Sierra Leonean Leone',
@@ -1046,6 +1050,10 @@
10461050
0 => 'VEB',
10471051
1 => 'Venezuelan Bolívar (1871–2008)',
10481052
],
1053+
'VED' => [
1054+
0 => 'VED',
1055+
1 => 'Bolívar Soberano',
1056+
],
10491057
'VEF' => [
10501058
0 => 'VEF',
10511059
1 => 'Venezuelan Bolívar (2008–2018)',

Resources/data/currencies/en_001.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
0 => 'LVR',
2727
1 => 'Latvian Rouble',
2828
],
29-
'PHP' => [
30-
0 => '',
31-
1 => 'Philippine Peso',
32-
],
3329
'RUB' => [
3430
0 => 'RUB',
3531
1 => 'Russian Rouble',

Resources/data/currencies/en_AU.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@
110110
0 => 'COP',
111111
1 => 'Colombian Peso',
112112
],
113+
'CUP' => [
114+
0 => 'CUP',
115+
1 => 'Cuban Peso',
116+
],
113117
'CVE' => [
114118
0 => 'CVE',
115119
1 => 'Cape Verdean Escudo',

Resources/data/currencies/en_CA.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
0 => 'LVR',
3131
1 => 'Latvian Rouble',
3232
],
33-
'PHP' => [
34-
0 => '',
35-
1 => 'Philippine Peso',
36-
],
3733
'RUB' => [
3834
0 => 'RUB',
3935
1 => 'Russian Rouble',

Resources/data/currencies/en_MV.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
return [
4+
'Names' => [
5+
'MVR' => [
6+
0 => 'Rf',
7+
1 => 'Maldivian Rufiyaa',
8+
],
9+
],
10+
];

Resources/data/currencies/en_PH.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'Names' => [
55
'PHP' => [
66
0 => '',
7-
1 => 'Philippine Piso',
7+
1 => 'Philippine Peso',
88
],
99
],
1010
];

Resources/data/currencies/ks.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
],
125125
'BRL' => [
126126
0 => 'R$',
127-
1 => 'برازیٖلین رِیَل',
127+
1 => 'برازیٖلی رِیَل',
128128
],
129129
'BRN' => [
130130
0 => 'BRN',
@@ -196,7 +196,7 @@
196196
],
197197
'CNY' => [
198198
0 => 'CN¥',
199-
1 => 'چینیٖز یَن رِنمِنبی',
199+
1 => 'چیٖنی یُوان',
200200
],
201201
'COP' => [
202202
0 => 'COP',
@@ -292,7 +292,7 @@
292292
],
293293
'GBP' => [
294294
0 => '£',
295-
1 => 'برطٲنوی پاونڑ سٹٔرلِنگ',
295+
1 => 'برطٲنوی پوٗنڈ',
296296
],
297297
'GEK' => [
298298
0 => 'GEK',
@@ -419,7 +419,7 @@
419419
1 => 'جَرڑینیاہُک دیٖنار',
420420
],
421421
'JPY' => [
422-
0 => 'JP¥',
422+
0 => '¥',
423423
1 => 'جاپانُک یَن',
424424
],
425425
'KES' => [
@@ -704,7 +704,7 @@
704704
],
705705
'RUB' => [
706706
0 => 'RUB',
707-
1 => 'رٔشیَن رَبٕل',
707+
1 => 'روٗسی رَبٕل',
708708
],
709709
'RUR' => [
710710
0 => 'RUR',
@@ -847,8 +847,8 @@
847847
1 => 'اُگاداہُک شِلِنگ',
848848
],
849849
'USD' => [
850-
0 => 'US$',
851-
1 => 'یوٗ ایس ڈالَر',
850+
0 => '$',
851+
1 => 'US ڈالر',
852852
],
853853
'USN' => [
854854
0 => 'USN',

Resources/data/currencies/ks_Deva.php

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
3+
return [
4+
'Names' => [
5+
'BRL' => [
6+
0 => 'R$',
7+
1 => 'ब्राज़िली रील',
8+
],
9+
'CNY' => [
10+
0 => 'CN¥',
11+
1 => 'चीनी युवान',
12+
],
13+
'EUR' => [
14+
0 => '',
15+
1 => 'यूरो',
16+
],
17+
'GBP' => [
18+
0 => '£',
19+
1 => 'बरतानवी पूनड',
20+
],
21+
'INR' => [
22+
0 => '',
23+
1 => 'इंडियन रूपी',
24+
],
25+
'JPY' => [
26+
0 => 'JP¥',
27+
1 => 'जापानी येन',
28+
],
29+
'RUB' => [
30+
0 => 'RUB',
31+
1 => 'रूसी रूबल',
32+
],
33+
'USD' => [
34+
0 => '$',
35+
1 => 'US डॉलर',
36+
],
37+
],
38+
];

0 commit comments

Comments
 (0)