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

Author: fabpot

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);
     }
 
     /**

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

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

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",

Resources/data/currencies/af_NA.json

@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "NAD": [
             "$",

Resources/data/currencies/ak.json

@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "AED": [
             "AED",

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",

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",

Resources/data/currencies/ar_DJ.json

@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "DJF": [
             "Fdj",

Resources/data/currencies/ar_ER.json

@@ -1,5 +1,5 @@
 {
-    "Version": "2.1.27.40",
+    "Version": "2.1.31.33",
     "Names": {
         "ERN": [
             "Nfk",