Merge branch '2.8' into 3.2

fabpot · fabpot · commit 7aeef013ee0f · 2017-03-05T09:42:14.000-08:00
* 2.8:
  [Serializer] Xml encoder throws exception for valid data
  [Form] Hardened form type tests
  fixed CS
diff --git a/DateFormatter/DateFormat/TimeZoneTransformer.php b/DateFormatter/DateFormat/TimeZoneTransformer.php
@@ -96,6 +96,6 @@ public static function getEtcTimeZoneId($formattedTimeZone)
             return 'Etc/GMT'.($hours !== 0 ? $signal.$hours : '');
         }
 
-        throw new \InvalidArgumentException(sprintf("The GMT time zone '%s' does not match with the supported formats GMT[+-]HH:MM or GMT[+-]HHMM.", $formattedTimeZone));
+        throw new \InvalidArgumentException(sprintf('The GMT time zone "%s" does not match with the supported formats GMT[+-]HH:MM or GMT[+-]HHMM.', $formattedTimeZone));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,6 @@ public static function getEtcTimeZoneId($formattedTimeZone)`
`96`	`96`	`return 'Etc/GMT'.($hours !== 0 ? $signal.$hours : '');`
`97`	`97`	`}`
`98`	`98`
`99`		`- throw new \InvalidArgumentException(sprintf("The GMT time zone '%s' does not match with the supported formats GMT[+-]HH:MM or GMT[+-]HHMM.", $formattedTimeZone));`
	`99`	`+ throw new \InvalidArgumentException(sprintf('The GMT time zone "%s" does not match with the supported formats GMT[+-]HH:MM or GMT[+-]HHMM.', $formattedTimeZone));`
`100`	`100`	`}`
`101`	`101`	`}`