Skip to content

Commit d58df88

Browse files
Merge branch '3.4' into 4.0
* 3.4: (24 commits) moved Twig runtime to proper class fixed deprecated messages in tests add PHP errors options to XML schema definition [HttpCache] Unlink tmp file on error Added LB translation for #26327 (Errors sign for people that do not see colors) [TwigBridge] Fix rendering of currency by MoneyType Import InvalidArgumentException in PdoAdapter [DI] Do not suggest writing an implementation when multiple exist [Intl] Update ICU data to 61.1 Use 3rd person verb form in command description [Validator] Add Japanese translation Support phpdbg SAPI in Debug::enable() [HttpKernel] DumpDataCollector: do not flush when a dumper is provided [DI] Fix hardcoded cache dir for warmups [Routing] fix tests [Routing] Fixed the importing of files using glob patterns that match multiple resources [Ldap] cast to string when checking empty passwords [Validator] sync validator translation id [WebProfilerBundle] use the router to resolve file links no type errors with invalid submitted data types ...
2 parents a4c3f1e + e0e9ba7 commit d58df88

File tree

838 files changed

+3529
-1419
lines changed

Some content is hidden

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

838 files changed

+3529
-1419
lines changed

Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public static function getIcuDataVersion()
235235
*/
236236
public static function getIcuStubVersion()
237237
{
238-
return '60.2';
238+
return '61.1';
239239
}
240240

241241
/**

Resources/bin/icu.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@
1616
58 = http://source.icu-project.org/repos/icu/tags/release-58-2/icu4c/source
1717
59 = http://source.icu-project.org/repos/icu/tags/release-59-1/icu4c/source
1818
60 = http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c/source
19+
61 = http://source.icu-project.org/repos/icu/tags/release-61-1/icu4c/source

Resources/data/currencies/af.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.5",
2+
"Version": "2.1.39.11",
33
"Names": {
44
"AED": [
55
"AED",
@@ -391,6 +391,10 @@
391391
],
392392
"MRO": [
393393
"MRO",
394+
"Mauritaniese ouguiya (1973–2017)"
395+
],
396+
"MRU": [
397+
"MRU",
394398
"Mauritaniese ouguiya"
395399
],
396400
"MUR": [
@@ -547,6 +551,10 @@
547551
],
548552
"STD": [
549553
"STD",
554+
"São Tomé en Príncipe dobra (1977–2017)"
555+
],
556+
"STN": [
557+
"STN",
550558
"São Tomé en Príncipe dobra"
551559
],
552560
"SYP": [

Resources/data/currencies/af_NA.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.31.33",
2+
"Version": "2.1.38.69",
33
"Names": {
44
"NAD": [
55
"$",

Resources/data/currencies/ak.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.1",
2+
"Version": "2.1.39.11",
33
"Names": {
44
"AED": [
55
"AED",
@@ -123,6 +123,10 @@
123123
],
124124
"MRO": [
125125
"MRO",
126+
"Mɔretenia Ouguiya (1973–2017)"
127+
],
128+
"MRU": [
129+
"MRU",
126130
"Mɔretenia Ouguiya"
127131
],
128132
"MUR": [
@@ -179,6 +183,10 @@
179183
],
180184
"STD": [
181185
"STD",
186+
"Sao Tome ne Principe Dobra (1977–2017)"
187+
],
188+
"STN": [
189+
"STN",
182190
"Sao Tome ne Principe Dobra"
183191
],
184192
"SZL": [

Resources/data/currencies/am.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.5",
2+
"Version": "2.1.39.11",
33
"Names": {
44
"AED": [
55
"AED",
@@ -383,6 +383,10 @@
383383
],
384384
"MRO": [
385385
"MRO",
386+
"የሞሪቴኒያ ኦውጉያ (1973–2017)"
387+
],
388+
"MRU": [
389+
"MRU",
386390
"የሞሪቴኒያ ኦውጉያ"
387391
],
388392
"MUR": [
@@ -535,6 +539,10 @@
535539
],
536540
"STD": [
537541
"STD",
542+
"የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ (1977–2017)"
543+
],
544+
"STN": [
545+
"STN",
538546
"የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ"
539547
],
540548
"SYP": [

Resources/data/currencies/ar.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.36.86",
2+
"Version": "2.1.39.20",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -567,6 +567,10 @@
567567
],
568568
"MRO": [
569569
"أ.م.‏",
570+
"أوقية موريتانية - 1973-2017"
571+
],
572+
"MRU": [
573+
"MRU",
570574
"أوقية موريتانية"
571575
],
572576
"MTL": [
@@ -779,6 +783,10 @@
779783
],
780784
"STD": [
781785
"STD",
786+
"دوبرا ساو تومي وبرينسيبي - 1977-2017"
787+
],
788+
"STN": [
789+
"STN",
782790
"دوبرا ساو تومي وبرينسيبي"
783791
],
784792
"SUR": [

Resources/data/currencies/ar_DJ.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.31.33",
2+
"Version": "2.1.38.80",
33
"Names": {
44
"DJF": [
55
"Fdj",

Resources/data/currencies/ar_ER.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.31.33",
2+
"Version": "2.1.38.80",
33
"Names": {
44
"ERN": [
55
"Nfk",

Resources/data/currencies/ar_KM.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.35.71",
2+
"Version": "2.1.38.80",
33
"Names": {
44
"KMF": [
55
"CF",

0 commit comments

Comments
 (0)