Skip to content

Commit

Permalink
[Intl] Update ICU data to 60.2
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jakzal authored and fabpot committed Dec 18, 2017
1 parent 76b7cac commit 11bee7f
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Intl.php
Expand Up @@ -234,7 +234,7 @@ public static function getIcuDataVersion()
*/
public static function getIcuStubVersion()
{
return '60.1';
return '60.2';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Resources/bin/icu.ini
Expand Up @@ -15,4 +15,4 @@
57 = http://source.icu-project.org/repos/icu/icu/tags/release-57-1/source
58 = http://source.icu-project.org/repos/icu/tags/release-58-2/icu4c/source
59 = http://source.icu-project.org/repos/icu/tags/release-59-1/icu4c/source
60 = http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c/source
60 = http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c/source
@@ -1,5 +1,5 @@
{
"Version": "2.1.37.11",
"Version": "2.1.37.96",
"Names": {
"ADP": [
"ADP",
Expand Down
@@ -1,5 +1,5 @@
{
"Version": "2.1.37.28",
"Version": "2.1.37.69",
"Names": {
"AED": [
"AED",
Expand Down
@@ -1,5 +1,5 @@
{
"Version": "2.1.37.11",
"Version": "2.1.37.96",
"Names": {
"aa": "Afar",
"ab": "Abchasisch",
Expand Down
@@ -1,5 +1,5 @@
{
"Version": "2.1.37.28",
"Version": "2.1.37.69",
"Names": {
"aa": "افار",
"ab": "ابقازیان",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Resources/data/regions/de.json
@@ -1,5 +1,5 @@
{
"Version": "2.1.37.11",
"Version": "2.1.37.96",
"Names": {
"AC": "Ascension",
"AD": "Andorra",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Resources/data/regions/ur.json
@@ -1,5 +1,5 @@
{
"Version": "2.1.37.28",
"Version": "2.1.37.69",
"Names": {
"AC": "اسینشن آئلینڈ",
"AD": "انڈورا",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Resources/data/scripts/de.json
@@ -1,5 +1,5 @@
{
"Version": "2.1.37.11",
"Version": "2.1.37.96",
"Names": {
"Afak": "Afaka",
"Aghb": "Kaukasisch-Albanisch",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Resources/data/scripts/ur.json
@@ -1,5 +1,5 @@
{
"Version": "2.1.37.28",
"Version": "2.1.37.69",
"Names": {
"Arab": "عربی",
"Armn": "آرمینیائی",
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/svn-info.txt
@@ -1,7 +1,7 @@
SVN information
===============

URL: http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c/source
Revision: 40662
URL: http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c/source
Revision: 40727
Author: yoshito
Date: 2017-10-31T15:14:15.305164Z
Date: 2017-12-13T20:01:38.026283Z
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Resources/data/version.txt
@@ -1 +1 @@
60.1
60.2
Expand Up @@ -936,7 +936,9 @@ public function testParseWithNullPositionValue()
$position = null;
$formatter = $this->getDefaultDateFormatter('y');
$this->assertSame(0, $formatter->parse('1970', $position));
$this->assertNull($position);
// Since $position is not supported by the Symfony implementation, the following won't work.
// The intl implementation works this way since 60.2.
// $this->assertSame(4, $position);
}

public function testSetPattern()
Expand Down

0 comments on commit 11bee7f

Please sign in to comment.