Skip to content

Commit

Permalink
[Intl] bump icu 67.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ro0NL authored and nicolas-grekas committed May 19, 2020
1 parent cb7e78c commit 29eb271
Show file tree
Hide file tree
Showing 1,033 changed files with 6,199 additions and 1,286 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te

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

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

return [
'Version' => $rootBundle['Version'],
'Names' => $this->generateSymbolNamePairs($rootBundle),
];
}
Expand All @@ -112,7 +110,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
*/
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$rootBundle = $reader->read($tempDir, 'root');
$supplementalDataBundle = $reader->read($tempDir, 'supplementalData');
$numericCodesBundle = $reader->read($tempDir, 'currencyNumericCodes');

Expand All @@ -121,7 +118,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, $temp
sort($this->currencyCodes);

$data = [
'Version' => $rootBundle['Version'],
'Currencies' => $this->currencyCodes,
'Meta' => $this->generateCurrencyMeta($supplementalDataBundle),
'Alpha3ToNumeric' => $this->generateAlpha3ToNumericMapping($numericCodesBundle, $this->currencyCodes),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
// isset() on \ResourceBundle returns true even if the value is null
if (isset($localeBundle['Languages']) && null !== $localeBundle['Languages']) {
$data = [
'Version' => $localeBundle['Version'],
'Names' => iterator_to_array($localeBundle['Languages']),
];

Expand All @@ -150,15 +149,13 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
*/
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$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,
'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
// 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),
];

Expand All @@ -120,14 +119,11 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
*/
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$rootBundle = $reader->read($tempDir, 'root');

$this->regionCodes = array_unique($this->regionCodes);

sort($this->regionCodes);

return [
'Version' => $rootBundle['Version'],
'Regions' => $this->regionCodes,
];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
// isset() on \ResourceBundle returns true even if the value is null
if (isset($localeBundle['Scripts']) && null !== $localeBundle['Scripts']) {
$data = [
'Version' => $localeBundle['Version'],
'Names' => iterator_to_array($localeBundle['Scripts']),
];

Expand All @@ -89,14 +88,11 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
*/
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$rootBundle = $reader->read($tempDir, 'root');

$this->scriptCodes = array_unique($this->scriptCodes);

sort($this->scriptCodes);

return [
'Version' => $rootBundle['Version'],
'Scripts' => $this->scriptCodes,
];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Intl.php
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public static function getIcuDataVersion()
*/
public static function getIcuStubVersion()
{
return '66.1';
return '67.1';
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"NAD": [
"$",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/Intl/Resources/data/currencies/am.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down Expand Up @@ -239,7 +238,7 @@
],
"HRK": [
"HRK",
"HRK"
"የክሮሽያ ኩና"
],
"HTG": [
"HTG",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"DJF": [
"Fdj",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ERN": [
"Nfk",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"KMF": [
"CF",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"SDG": [
"SDG",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"SOS": [
"S",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"GBP": [
"GB£",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AZN": [
"",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"CNY": [
"¥",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"CNY": [
"CN¥",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"FRF": [
"F",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BYN": [
"BYN",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"EUR": [
"EUR",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"LUF": [
"F",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BYB": [
"BYB",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"EUR": [
"",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"XCD": [
"$",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"XCD": [
"$",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BBD": [
"$",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BIF": [
"FBu",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BMD": [
"$",
Expand Down

0 comments on commit 29eb271

Please sign in to comment.