Skip to content

Commit 9917d1e

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.0
* 4.4: [Validator] Add missing translations of nn locale [HttpKernel] Fix that the `Store` would not save responses with the X-Content-Digest header present [Intl] bump icu 67.1
2 parents dc50ad5 + 4605611 commit 9917d1e

File tree

1,065 files changed

+4243
-1278
lines changed

Some content is hidden

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

1,065 files changed

+4243
-1278
lines changed

‎Data/Generator/CurrencyDataGenerator.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
8282

8383
if (isset($localeBundle['Currencies']) && null !== $localeBundle['Currencies']) {
8484
$data = [
85-
'Version' => $localeBundle['Version'],
8685
'Names' => $this->generateSymbolNamePairs($localeBundle),
8786
];
8887

@@ -102,7 +101,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
102101
$rootBundle = $reader->read($tempDir, 'root');
103102

104103
return [
105-
'Version' => $rootBundle['Version'],
106104
'Names' => $this->generateSymbolNamePairs($rootBundle),
107105
];
108106
}
@@ -112,7 +110,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
112110
*/
113111
protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
114112
{
115-
$rootBundle = $reader->read($tempDir, 'root');
116113
$supplementalDataBundle = $reader->read($tempDir, 'supplementalData');
117114
$numericCodesBundle = $reader->read($tempDir, 'currencyNumericCodes');
118115

@@ -121,7 +118,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
121118
sort($this->currencyCodes);
122119

123120
$data = [
124-
'Version' => $rootBundle['Version'],
125121
'Currencies' => $this->currencyCodes,
126122
'Meta' => $this->generateCurrencyMeta($supplementalDataBundle),
127123
'Alpha3ToNumeric' => $this->generateAlpha3ToNumericMapping($numericCodesBundle, $this->currencyCodes),

‎Data/Generator/LanguageDataGenerator.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
143143
}
144144
}
145145
$data = [
146-
'Version' => $localeBundle['Version'],
147146
'Names' => $names,
148147
'LocalizedNames' => $localizedNames,
149148
];
@@ -167,15 +166,13 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
167166
*/
168167
protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
169168
{
170-
$rootBundle = $reader->read($tempDir, 'root');
171169
$metadataBundle = $reader->read($tempDir, 'metadata');
172170

173171
$this->languageCodes = array_unique($this->languageCodes);
174172

175173
sort($this->languageCodes);
176174

177175
return [
178-
'Version' => $rootBundle['Version'],
179176
'Languages' => $this->languageCodes,
180177
'Alpha3Languages' => $this->generateAlpha3Codes($this->languageCodes, $metadataBundle),
181178
'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),

‎Data/Generator/RegionDataGenerator.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
116116
// isset() on \ResourceBundle returns true even if the value is null
117117
if (isset($localeBundle['Countries']) && null !== $localeBundle['Countries']) {
118118
$data = [
119-
'Version' => $localeBundle['Version'],
120119
'Names' => $this->generateRegionNames($localeBundle),
121120
];
122121

@@ -141,7 +140,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
141140
*/
142141
protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
143142
{
144-
$rootBundle = $reader->read($tempDir, 'root');
145143
$metadataBundle = $reader->read($tempDir, 'metadata');
146144

147145
$this->regionCodes = array_unique($this->regionCodes);
@@ -153,7 +151,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
153151
asort($alpha3ToAlpha2);
154152

155153
return [
156-
'Version' => $rootBundle['Version'],
157154
'Regions' => $this->regionCodes,
158155
'Alpha2ToAlpha3' => $alpha2ToAlpha3,
159156
'Alpha3ToAlpha2' => $alpha3ToAlpha2,

‎Data/Generator/ScriptDataGenerator.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
6969
// isset() on \ResourceBundle returns true even if the value is null
7070
if (isset($localeBundle['Scripts']) && null !== $localeBundle['Scripts']) {
7171
$data = [
72-
'Version' => $localeBundle['Version'],
7372
'Names' => array_diff_key(iterator_to_array($localeBundle['Scripts']), self::$blacklist),
7473
];
7574

@@ -94,14 +93,11 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
9493
*/
9594
protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
9695
{
97-
$rootBundle = $reader->read($tempDir, 'root');
98-
9996
$this->scriptCodes = array_unique($this->scriptCodes);
10097

10198
sort($this->scriptCodes);
10299

103100
return [
104-
'Version' => $rootBundle['Version'],
105101
'Scripts' => $this->scriptCodes,
106102
];
107103
}

‎Data/Generator/TimezoneDataGenerator.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
9494
}
9595

9696
$data = [
97-
'Version' => $localeBundle['Version'],
9897
'Names' => $this->generateZones($reader, $tempDir, $displayLocale),
9998
'Meta' => self::generateZoneMetadata($localeBundle),
10099
];
@@ -131,7 +130,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
131130
$rootBundle = $reader->read($tempDir, 'root');
132131

133132
return [
134-
'Version' => $rootBundle['Version'],
135133
'Meta' => self::generateZoneMetadata($rootBundle),
136134
];
137135
}
@@ -149,7 +147,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
149147
ksort($this->zoneToCountryMapping);
150148

151149
$data = [
152-
'Version' => $rootBundle['Version'],
153150
'Zones' => $this->zoneIds,
154151
'ZoneToCountry' => $this->zoneToCountryMapping,
155152
'CountryToZone' => self::generateCountryToZoneMapping($this->zoneToCountryMapping),

‎Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static function getIcuDataVersion(): string
125125
*/
126126
public static function getIcuStubVersion(): string
127127
{
128-
return '66.1';
128+
return '67.1';
129129
}
130130

131131
/**

‎Resources/data/currencies/af.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/af_NA.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"NAD": [
54
"$",

‎Resources/data/currencies/ak.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/am.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",
@@ -239,7 +238,7 @@
239238
],
240239
"HRK": [
241240
"HRK",
242-
"HRK"
241+
"የክሮሽያ ኩና"
243242
],
244243
"HTG": [
245244
"HTG",

‎Resources/data/currencies/ar.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/ar_DJ.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"DJF": [
54
"Fdj",

‎Resources/data/currencies/ar_ER.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ERN": [
54
"Nfk",

‎Resources/data/currencies/ar_KM.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"KMF": [
54
"CF",

‎Resources/data/currencies/ar_LB.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"SDG": [
54
"SDG",

‎Resources/data/currencies/ar_SO.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"SOS": [
54
"S",

‎Resources/data/currencies/ar_SS.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"GBP": [
54
"GB£",

‎Resources/data/currencies/as.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/az.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/az_Cyrl.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AZN": [
54
"₼",

‎Resources/data/currencies/be.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/bg.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/bm.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/bn.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/bo.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"CNY": [
54
"¥",

‎Resources/data/currencies/bo_IN.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"CNY": [
54
"CN¥",

‎Resources/data/currencies/br.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/bs.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/bs_Cyrl.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/ca.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/ca_FR.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"FRF": [
54
"F",

‎Resources/data/currencies/ce.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/cs.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/cy.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/da.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/de.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/de_CH.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"BYN": [
54
"BYN",

‎Resources/data/currencies/de_LI.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"EUR": [
54
"EUR",

‎Resources/data/currencies/de_LU.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"LUF": [
54
"F",

‎Resources/data/currencies/dz.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/ee.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/el.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/en.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"ADP": [
54
"ADP",

‎Resources/data/currencies/en_001.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"BYB": [
54
"BYB",

‎Resources/data/currencies/en_150.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"EUR": [
54
"€",

‎Resources/data/currencies/en_AE.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"AED": [
54
"AED",

‎Resources/data/currencies/en_AG.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"XCD": [
54
"$",

‎Resources/data/currencies/en_AI.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"Version": "36.1",
32
"Names": {
43
"XCD": [
54
"$",

0 commit comments

Comments
 (0)