Merge branch '2.7' into 2.8

* 2.7: [Intl][Form] Update tests, TimeZoneTransformer, and DateTimeToLocalizedStringTransformer for the GMT and UTC split in ICU [Intl] Update ICU data to 59.1
symfony · May 15, 2017 · b8c9597 · b8c9597
2 parents 6ef78ec + c4abc15
commit b8c9597
Show file tree

Hide file tree

Showing 921 changed files with 1,471 additions and 1,094 deletions.
diff --git a/...nt/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/...nt/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -61,11 +61,13 @@ public function dataProvider()
             array(\IntlDateFormatter::FULL, \IntlDateFormatter::NONE, null, 'Mittwoch, 3. Februar 2010', '2010-02-03 00:00:00 UTC'),
             array(null, \IntlDateFormatter::SHORT, null, '03.02.2010, 04:05', '2010-02-03 04:05:00 UTC'),
             array(null, \IntlDateFormatter::MEDIUM, null, '03.02.2010, 04:05:06', '2010-02-03 04:05:06 UTC'),
-            array(null, \IntlDateFormatter::LONG, null, '03.02.2010, 04:05:06 GMT', '2010-02-03 04:05:06 UTC'),
+            array(null, \IntlDateFormatter::LONG, null, '03.02.2010, 04:05:06 UTC', '2010-02-03 04:05:06 UTC'),
+            array(null, \IntlDateFormatter::LONG, null, '03.02.2010, 04:05:06 UTC', '2010-02-03 04:05:06 GMT'),
             // see below for extra test case for time format FULL
             array(\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, null, '04:05', '1970-01-01 04:05:00 UTC'),
             array(\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, null, '04:05:06', '1970-01-01 04:05:06 UTC'),
-            array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 GMT', '1970-01-01 04:05:06 UTC'),
+            array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 UTC', '1970-01-01 04:05:06 GMT'),
+            array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 UTC', '1970-01-01 04:05:06 UTC'),
             array(null, null, 'yyyy-MM-dd HH:mm:00', '2010-02-03 04:05:00', '2010-02-03 04:05:00 UTC'),
             array(null, null, 'yyyy-MM-dd HH:mm', '2010-02-03 04:05', '2010-02-03 04:05:00 UTC'),
             array(null, null, 'yyyy-MM-dd HH', '2010-02-03 04', '2010-02-03 04:00:00 UTC'),
@@ -85,6 +87,9 @@ public function dataProvider()
      */
     public function testTransform($dateFormat, $timeFormat, $pattern, $output, $input)
     {
+        IntlTestHelper::requireFullIntl($this, '59.1');
+        \Locale::setDefault('de_AT');
+
         $transformer = new DateTimeToLocalizedStringTransformer(
             'UTC',
             'UTC',
@@ -101,9 +106,12 @@ public function testTransform($dateFormat, $timeFormat, $pattern, $output, $inpu
 
     public function testTransformFullTime()
     {
+        IntlTestHelper::requireFullIntl($this, '59.1');
+        \Locale::setDefault('de_AT');
+
         $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
 
-        $this->assertEquals('03.02.2010, 04:05:06 GMT', $transformer->transform($this->dateTime));
+        $this->assertEquals('03.02.2010, 04:05:06 Koordinierte Weltzeit', $transformer->transform($this->dateTime));
     }
 
     public function testTransformToDifferentLocale()

diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimeZoneTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimeZoneTransformer.php
@@ -35,10 +35,29 @@ public function format(\DateTime $dateTime, $length)
             throw new NotImplementedException('Time zone different than GMT or UTC is not supported as a formatting output.');
         }
 
-        // From ICU >= 4.8, the zero offset is not more used, example: GMT instead of GMT+00:00
-        $format = (0 !== (int) $dateTime->format('O')) ? '\G\M\TP' : '\G\M\T';
+        if ('Etc' === $timeZone) {
+            // i.e. Etc/GMT+1, Etc/UTC, Etc/Zulu
+            $timeZone = substr($dateTime->getTimezone()->getName(), 4);
+        }
+
+        // From ICU >= 59.1 GMT and UTC are no longer unified
+        if (in_array($timeZone, array('UTC', 'UCT', 'Universal', 'Zulu'))) {
+            // offset is not supported with UTC
+            return $length > 3 ? 'Coordinated Universal Time' : 'UTC';
+        }
+
+        $offset = (int) $dateTime->format('O');
+
+        // From ICU >= 4.8, the zero offset is no more used, example: GMT instead of GMT+00:00
+        if (0 === $offset) {
+            return $length > 3 ? 'Greenwich Mean Time' : 'GMT';
+        }
+
+        if ($length > 3) {
+            return $dateTime->format('\G\M\TP');
+        }
 
-        return $dateTime->format($format);
+        return sprintf('GMT%s%d', ($offset >= 0 ? '+' : ''), $offset / 100);
     }
 
     /**

diff --git a/src/Symfony/Component/Intl/README.md b/src/Symfony/Component/Intl/README.md
@@ -15,5 +15,7 @@ Resources
   * [Report issues](https://github.com/symfony/symfony/issues) and
     [send Pull Requests](https://github.com/symfony/symfony/pulls)
     in the [main Symfony repository](https://github.com/symfony/symfony)
+  * [Docker images with intl support](https://hub.docker.com/r/jakzal/php-intl)
+    (for the Intl component development)
 
 [0]: http://www.php.net/manual/en/intl.setup.php
diff --git a/src/Symfony/Component/Intl/Resources/bin/icu.ini b/src/Symfony/Component/Intl/Resources/bin/icu.ini
@@ -14,3 +14,4 @@
 55 = http://source.icu-project.org/repos/icu/icu/tags/release-55-1/source
 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
diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/af.json b/src/Symfony/Component/Intl/Resources/data/currencies/af.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.29.44",
+    "Version": "2.1.32.59",
     "Names": {
         "AED": [
             "AED",
@@ -451,7 +451,7 @@
         ],
         "PEN": [
             "PEN",
-            "Peruaanse nuwe sol"
+            "Peruaanse sol"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json b/src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "NAD": [
             "$",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ak.json b/src/Symfony/Component/Intl/Resources/data/currencies/ak.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "AED": [
             "AED",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/am.json b/src/Symfony/Component/Intl/Resources/data/currencies/am.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.28.79",
+    "Version": "2.1.32.59",
     "Names": {
         "AED": [
             "AED",
@@ -439,7 +439,7 @@
         ],
         "PEN": [
             "PEN",
-            "የፔሩቪያ ኑኤቮ ሶል"
+            "የፔሩቪያ ሶል"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.28.79",
+    "Version": "2.1.32.86",
     "Names": {
         "ADP": [
             "ADP",
@@ -647,7 +647,7 @@
         ],
         "PEN": [
             "PEN",
-            "سول جديد البيرو"
+            "سول البيرو"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "DJF": [
             "Fdj",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "ERN": [
             "Nfk",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "SDG": [
             "SDG",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "SOS": [
             "S",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "GBP": [
             "GB£",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/az.json b/src/Symfony/Component/Intl/Resources/data/currencies/az.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.28.79",
+    "Version": "2.1.32.59",
     "Names": {
         "ADP": [
             "ADP",
@@ -703,11 +703,11 @@
         ],
         "PEN": [
             "PEN",
-            "Peru Nuevo Solu"
+            "Peru Solu"
         ],
         "PES": [
             "PES",
-            "Peru Solu"
+            "Peru Solu (1863–1965)"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.74",
     "Names": {
         "AZN": [
             "₼",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/be.json b/src/Symfony/Component/Intl/Resources/data/currencies/be.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.29.66",
+    "Version": "2.1.31.86",
     "Names": {
         "AED": [
             "AED",
@@ -423,7 +423,7 @@
         ],
         "PEN": [
             "PEN",
-            "перуанскі новы соль"
+            "перуанскі соль"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bg.json b/src/Symfony/Component/Intl/Resources/data/currencies/bg.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.30.6",
+    "Version": "2.1.33.75",
     "Names": {
         "ADP": [
             "ADP",
@@ -687,11 +687,11 @@
         ],
         "PEN": [
             "PEN",
-            "Перуански нов сол"
+            "Перуански сол"
         ],
         "PES": [
             "PES",
-            "Перуански сол"
+            "Перуански сол (1863–1965)"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bm.json b/src/Symfony/Component/Intl/Resources/data/currencies/bm.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "AED": [
             "AED",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bn.json b/src/Symfony/Component/Intl/Resources/data/currencies/bn.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.29.44",
+    "Version": "2.1.32.59",
     "Names": {
         "ADP": [
             "ADP",
@@ -707,11 +707,11 @@
         ],
         "PEN": [
             "PEN",
-            "পেরুভিয়ান সোল নুয়েভো"
+            "পেরুভিয়ান সোল"
         ],
         "PES": [
             "PES",
-            "পেরুভিয়ান সোল"
+            "পেরুভিয়ান সোল (1863–1965)"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bo.json b/src/Symfony/Component/Intl/Resources/data/currencies/bo.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "CNY": [
             "¥",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bo_IN.json b/src/Symfony/Component/Intl/Resources/data/currencies/bo_IN.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "CNY": [
             "CN¥",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/br.json b/src/Symfony/Component/Intl/Resources/data/currencies/br.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.28.76",
+    "Version": "2.1.31.86",
     "Names": {
         "ADP": [
             "ADP",
@@ -779,7 +779,7 @@
         ],
         "PEN": [
             "PEN",
-            "nuevo sol Perou"
+            "sol Perou"
         ],
         "PES": [
             "PES",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bs.json b/src/Symfony/Component/Intl/Resources/data/currencies/bs.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.28.79",
+    "Version": "2.1.31.86",
     "Names": {
         "ADP": [
             "ADP",
@@ -739,7 +739,7 @@
         ],
         "PEN": [
             "PEN",
-            "Peruanski novi sol"
+            "Peruanski sol"
         ],
         "PES": [
             "PES",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.28.76",
+    "Version": "2.1.32.72",
     "Names": {
         "ADP": [
             "ADP",
@@ -715,11 +715,11 @@
         ],
         "PEN": [
             "PEN",
-            "Перуански нуево сол"
+            "Перуански сол"
         ],
         "PES": [
             "PES",
-            "Перуански сол"
+            "Перуански сол (1863–1965)"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ca.json b/src/Symfony/Component/Intl/Resources/data/currencies/ca.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.28.79",
+    "Version": "2.1.32.59",
     "Names": {
         "ADP": [
             "ADP",
@@ -772,11 +772,11 @@
         ],
         "PEN": [
             "PEN",
-            "nou sol peruà"
+            "sol peruà"
         ],
         "PES": [
             "PES",
-            "sol peruà"
+            "sol peruà (1863–1965)"
         ],
         "PGK": [
             "PGK",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ca_FR.json b/src/Symfony/Component/Intl/Resources/data/currencies/ca_FR.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "FRF": [
             "F",

diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ce.json b/src/Symfony/Component/Intl/Resources/data/currencies/ce.json
@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.28.76",
+    "Version": "2.1.31.86",
     "Names": {
         "AED": [
             "AED",
@@ -423,7 +423,7 @@
         ],
         "PEN": [
             "PEN",
-            "Перун керла соль"
+            "Перун соль"
         ],
         "PGK": [
             "PGK",