Merge branch '4.2' into 4.3

fabpot · fabpot · commit 33f3933a90fe · 2019-06-04T14:23:51.000+02:00
* 4.2:
  Fix inconsistency in json format regarding DST value
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/IntlCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/IntlCasterTest.php
@@ -240,6 +240,12 @@ public function testCastDateFormatter()
         $expectedTimeType = $var->getTimeType();
         $expectedDateType = $var->getDateType();
 
+        $expectedTimeZone = $var->getTimeZone();
+        $expectedTimeZoneDisplayName = $expectedTimeZone->getDisplayName();
+        $expectedTimeZoneID = $expectedTimeZone->getID();
+        $expectedTimeZoneRawOffset = $expectedTimeZone->getRawOffset();
+        $expectedTimeZoneDSTSavings = $expectedTimeZone->useDaylightTime() ? "\n    dst_savings: ".$expectedTimeZone->getDSTSavings() : '';
+
         $expectedCalendarObject = $var->getCalendarObject();
         $expectedCalendarObjectType = $expectedCalendarObject->getType();
         $expectedCalendarObjectFirstDayOfWeek = $expectedCalendarObject->getFirstDayOfWeek();
@@ -254,13 +260,7 @@ public function testCastDateFormatter()
         $expectedCalendarObjectTimeZoneDisplayName = $expectedCalendarObjectTimeZone->getDisplayName();
         $expectedCalendarObjectTimeZoneID = $expectedCalendarObjectTimeZone->getID();
         $expectedCalendarObjectTimeZoneRawOffset = $expectedCalendarObjectTimeZone->getRawOffset();
-        $expectedCalendarObjectTimeZoneDSTSavings = $expectedCalendarObjectTimeZone->getDSTSavings();
-
-        $expectedTimeZone = $var->getTimeZone();
-        $expectedTimeZoneDisplayName = $expectedTimeZone->getDisplayName();
-        $expectedTimeZoneID = $expectedTimeZone->getID();
-        $expectedTimeZoneRawOffset = $expectedTimeZone->getRawOffset();
-        $expectedTimeZoneDSTSavings = $expectedTimeZone->getDSTSavings();
+        $expectedCalendarObjectTimeZoneDSTSavings = $expectedTimeZone->useDaylightTime() ? "\n      dst_savings: ".$expectedCalendarObjectTimeZone->getDSTSavings() : '';
 
         $expected = <<<EOTXT
 IntlDateFormatter {
@@ -282,15 +282,13 @@ public function testCastDateFormatter()
     time_zone: IntlTimeZone {
       display_name: "$expectedCalendarObjectTimeZoneDisplayName"
       id: "$expectedCalendarObjectTimeZoneID"
-      raw_offset: $expectedCalendarObjectTimeZoneRawOffset
-      dst_savings: $expectedCalendarObjectTimeZoneDSTSavings
+      raw_offset: $expectedCalendarObjectTimeZoneRawOffset$expectedCalendarObjectTimeZoneDSTSavings
     }
   }
   time_zone: IntlTimeZone {
     display_name: "$expectedTimeZoneDisplayName"
     id: "$expectedTimeZoneID"
-    raw_offset: $expectedTimeZoneRawOffset
-    dst_savings: $expectedTimeZoneDSTSavings
+    raw_offset: $expectedTimeZoneRawOffset$expectedTimeZoneDSTSavings
   }
 }
 EOTXT;
