diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.2' into 4.3

Browse Source 
* 4.2:
  Fix inconsistency in json format regarding DST value
This commit is contained in:
Fabien Potencier 2019-06-04 14:23:51 +02:00
commit 33f3933a90
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Symfony/Component/VarDumper/Tests/Caster/IntlCasterTest.php
View File

@ -240,6 +240,12 @@ EOTXT;
$expectedTimeType = $var->getTimeType(); $expectedTimeType = $var->getTimeType();
$expectedDateType = $var->getDateType(); $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(); $expectedCalendarObject = $var->getCalendarObject();
$expectedCalendarObjectType = $expectedCalendarObject->getType(); $expectedCalendarObjectType = $expectedCalendarObject->getType();
$expectedCalendarObjectFirstDayOfWeek = $expectedCalendarObject->getFirstDayOfWeek(); $expectedCalendarObjectFirstDayOfWeek = $expectedCalendarObject->getFirstDayOfWeek();
@ -254,13 +260,7 @@ EOTXT;
$expectedCalendarObjectTimeZoneDisplayName = $expectedCalendarObjectTimeZone->getDisplayName(); $expectedCalendarObjectTimeZoneDisplayName = $expectedCalendarObjectTimeZone->getDisplayName();
$expectedCalendarObjectTimeZoneID = $expectedCalendarObjectTimeZone->getID(); $expectedCalendarObjectTimeZoneID = $expectedCalendarObjectTimeZone->getID();
$expectedCalendarObjectTimeZoneRawOffset = $expectedCalendarObjectTimeZone->getRawOffset(); $expectedCalendarObjectTimeZoneRawOffset = $expectedCalendarObjectTimeZone->getRawOffset();
$expectedCalendarObjectTimeZoneDSTSavings = $expectedCalendarObjectTimeZone->getDSTSavings(); $expectedCalendarObjectTimeZoneDSTSavings = $expectedTimeZone->useDaylightTime() ? "\n dst_savings: ".$expectedCalendarObjectTimeZone->getDSTSavings() : '';
$expectedTimeZone = $var->getTimeZone();
$expectedTimeZoneDisplayName = $expectedTimeZone->getDisplayName();
$expectedTimeZoneID = $expectedTimeZone->getID();
$expectedTimeZoneRawOffset = $expectedTimeZone->getRawOffset();
$expectedTimeZoneDSTSavings = $expectedTimeZone->getDSTSavings();
$expected = <<<EOTXT $expected = <<<EOTXT
IntlDateFormatter { IntlDateFormatter {
@ -282,15 +282,13 @@ IntlDateFormatter {
time_zone: IntlTimeZone { time_zone: IntlTimeZone {
display_name: "$expectedCalendarObjectTimeZoneDisplayName" display_name: "$expectedCalendarObjectTimeZoneDisplayName"
id: "$expectedCalendarObjectTimeZoneID" id: "$expectedCalendarObjectTimeZoneID"
raw_offset: $expectedCalendarObjectTimeZoneRawOffset raw_offset: $expectedCalendarObjectTimeZoneRawOffset$expectedCalendarObjectTimeZoneDSTSavings
dst_savings: $expectedCalendarObjectTimeZoneDSTSavings
} }
} }
time_zone: IntlTimeZone { time_zone: IntlTimeZone {
display_name: "$expectedTimeZoneDisplayName" display_name: "$expectedTimeZoneDisplayName"
id: "$expectedTimeZoneID" id: "$expectedTimeZoneID"
raw_offset: $expectedTimeZoneRawOffset raw_offset: $expectedTimeZoneRawOffset$expectedTimeZoneDSTSavings
dst_savings: $expectedTimeZoneDSTSavings
} }
} }
EOTXT; EOTXT;