Skip to content

Commit 11bee7f

Browse files
jakzalfabpot
authored andcommitted
[Intl] Update ICU data to 60.2
Not much has changed in data we actually use in Symfony. However, the extension compiled for ICU 60.2 behaves slightly differently in some cases. This can be observed on one assertion that had to be disabled. There's no point in keeping it since the Symfony implementation does not support the behaviour.
1 parent 76b7cac commit 11bee7f

File tree

13 files changed

+17
-15
lines changed

13 files changed

+17
-15
lines changed

src/Symfony/Component/Intl/Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public static function getIcuDataVersion()
234234
*/
235235
public static function getIcuStubVersion()
236236
{
237-
return '60.1';
237+
return '60.2';
238238
}
239239

240240
/**

src/Symfony/Component/Intl/Resources/bin/icu.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
57 = http://source.icu-project.org/repos/icu/icu/tags/release-57-1/source
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
18-
60 = http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c/source
18+
60 = http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c/source

src/Symfony/Component/Intl/Resources/data/currencies/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.11",
2+
"Version": "2.1.37.96",
33
"Names": {
44
"ADP": [
55
"ADP",

src/Symfony/Component/Intl/Resources/data/currencies/ur.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.28",
2+
"Version": "2.1.37.69",
33
"Names": {
44
"AED": [
55
"AED",

src/Symfony/Component/Intl/Resources/data/languages/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.11",
2+
"Version": "2.1.37.96",
33
"Names": {
44
"aa": "Afar",
55
"ab": "Abchasisch",

src/Symfony/Component/Intl/Resources/data/languages/ur.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.28",
2+
"Version": "2.1.37.69",
33
"Names": {
44
"aa": "افار",
55
"ab": "ابقازیان",

src/Symfony/Component/Intl/Resources/data/regions/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.11",
2+
"Version": "2.1.37.96",
33
"Names": {
44
"AC": "Ascension",
55
"AD": "Andorra",

src/Symfony/Component/Intl/Resources/data/regions/ur.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.28",
2+
"Version": "2.1.37.69",
33
"Names": {
44
"AC": "اسینشن آئلینڈ",
55
"AD": "انڈورا",

src/Symfony/Component/Intl/Resources/data/scripts/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.11",
2+
"Version": "2.1.37.96",
33
"Names": {
44
"Afak": "Afaka",
55
"Aghb": "Kaukasisch-Albanisch",

src/Symfony/Component/Intl/Resources/data/scripts/ur.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.37.28",
2+
"Version": "2.1.37.69",
33
"Names": {
44
"Arab": "عربی",
55
"Armn": "آرمینیائی",
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SVN information
22
===============
33

4-
URL: http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c/source
5-
Revision: 40662
4+
URL: http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c/source
5+
Revision: 40727
66
Author: yoshito
7-
Date: 2017-10-31T15:14:15.305164Z
7+
Date: 2017-12-13T20:01:38.026283Z
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
60.1
1+
60.2

src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,9 @@ public function testParseWithNullPositionValue()
936936
$position = null;
937937
$formatter = $this->getDefaultDateFormatter('y');
938938
$this->assertSame(0, $formatter->parse('1970', $position));
939-
$this->assertNull($position);
939+
// Since $position is not supported by the Symfony implementation, the following won't work.
940+
// The intl implementation works this way since 60.2.
941+
// $this->assertSame(4, $position);
940942
}
941943

942944
public function testSetPattern()

0 commit comments

Comments
 (0)