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

Author: nicolas-grekas

Data/Generator/CurrencyDataGenerator.php

@@ -82,7 +82,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
 
         if (isset($localeBundle['Currencies']) && null !== $localeBundle['Currencies']) {
             $data = [
-                'Version' => $localeBundle['Version'],
                 'Names' => $this->generateSymbolNamePairs($localeBundle),
             ];
 
@@ -102,7 +101,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
         $rootBundle = $reader->read($tempDir, 'root');
 
         return [
-            'Version' => $rootBundle['Version'],
             'Names' => $this->generateSymbolNamePairs($rootBundle),
         ];
     }
@@ -112,7 +110,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
      */
     protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
-        $rootBundle = $reader->read($tempDir, 'root');
         $supplementalDataBundle = $reader->read($tempDir, 'supplementalData');
         $numericCodesBundle = $reader->read($tempDir, 'currencyNumericCodes');
 
@@ -121,7 +118,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
         sort($this->currencyCodes);
 
         $data = [
-            'Version' => $rootBundle['Version'],
             'Currencies' => $this->currencyCodes,
             'Meta' => $this->generateCurrencyMeta($supplementalDataBundle),
             'Alpha3ToNumeric' => $this->generateAlpha3ToNumericMapping($numericCodesBundle, $this->currencyCodes),

Data/Generator/LanguageDataGenerator.php

@@ -143,7 +143,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
                 }
             }
             $data = [
-                'Version' => $localeBundle['Version'],
                 'Names' => $names,
                 'LocalizedNames' => $localizedNames,
             ];
@@ -167,15 +166,13 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
      */
     protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
-        $rootBundle = $reader->read($tempDir, 'root');
         $metadataBundle = $reader->read($tempDir, 'metadata');
 
         $this->languageCodes = array_unique($this->languageCodes);
 
         sort($this->languageCodes);
 
         return [
-            'Version' => $rootBundle['Version'],
             'Languages' => $this->languageCodes,
             'Alpha3Languages' => $this->generateAlpha3Codes($this->languageCodes, $metadataBundle),
             'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),

Data/Generator/RegionDataGenerator.php

@@ -116,7 +116,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
         // isset() on \ResourceBundle returns true even if the value is null
         if (isset($localeBundle['Countries']) && null !== $localeBundle['Countries']) {
             $data = [
-                'Version' => $localeBundle['Version'],
                 'Names' => $this->generateRegionNames($localeBundle),
             ];
 
@@ -141,7 +140,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
      */
     protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
-        $rootBundle = $reader->read($tempDir, 'root');
         $metadataBundle = $reader->read($tempDir, 'metadata');
 
         $this->regionCodes = array_unique($this->regionCodes);
@@ -153,7 +151,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
         asort($alpha3ToAlpha2);
 
         return [
-            'Version' => $rootBundle['Version'],
             'Regions' => $this->regionCodes,
             'Alpha2ToAlpha3' => $alpha2ToAlpha3,
             'Alpha3ToAlpha2' => $alpha3ToAlpha2,

Data/Generator/ScriptDataGenerator.php

@@ -69,7 +69,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
         // isset() on \ResourceBundle returns true even if the value is null
         if (isset($localeBundle['Scripts']) && null !== $localeBundle['Scripts']) {
             $data = [
-                'Version' => $localeBundle['Version'],
                 'Names' => array_diff_key(iterator_to_array($localeBundle['Scripts']), self::$blacklist),
             ];
 
@@ -94,14 +93,11 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
      */
     protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
-        $rootBundle = $reader->read($tempDir, 'root');
-
         $this->scriptCodes = array_unique($this->scriptCodes);
 
         sort($this->scriptCodes);
 
         return [
-            'Version' => $rootBundle['Version'],
             'Scripts' => $this->scriptCodes,
         ];
     }

Data/Generator/TimezoneDataGenerator.php

@@ -94,7 +94,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
         }
 
         $data = [
-            'Version' => $localeBundle['Version'],
             'Names' => $this->generateZones($reader, $tempDir, $displayLocale),
             'Meta' => self::generateZoneMetadata($localeBundle),
         ];
@@ -131,7 +130,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
         $rootBundle = $reader->read($tempDir, 'root');
 
         return [
-            'Version' => $rootBundle['Version'],
             'Meta' => self::generateZoneMetadata($rootBundle),
         ];
     }
@@ -149,7 +147,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
         ksort($this->zoneToCountryMapping);
 
         $data = [
-            'Version' => $rootBundle['Version'],
             'Zones' => $this->zoneIds,
             'ZoneToCountry' => $this->zoneToCountryMapping,
             'CountryToZone' => self::generateCountryToZoneMapping($this->zoneToCountryMapping),

Intl.php

@@ -125,7 +125,7 @@ public static function getIcuDataVersion(): string
      */
     public static function getIcuStubVersion(): string
     {
-        return '66.1';
+        return '67.1';
     }
 
     /**

Resources/data/currencies/af.json

@@ -1,5 +1,4 @@
 {
-    "Version": "36.1",
     "Names": {
         "AED": [
             "AED",

Resources/data/currencies/af_NA.json

@@ -1,5 +1,4 @@
 {
-    "Version": "36.1",
     "Names": {
         "NAD": [
             "$",

Resources/data/currencies/ak.json

@@ -1,5 +1,4 @@
 {
-    "Version": "36.1",
     "Names": {
         "AED": [
             "AED",

Resources/data/currencies/am.json

@@ -1,5 +1,4 @@
 {
-    "Version": "36.1",
     "Names": {
         "AED": [
             "AED",
@@ -239,7 +238,7 @@
         ],
         "HRK": [
             "HRK",
-            "HRK"
+            "የክሮሽያ ኩና"
         ],
         "HTG": [
             "HTG",