From: Derick Rethans Date: Sun, 30 Jun 2019 14:50:38 +0000 (+0100) Subject: Fixed tests due to changed timezone data X-Git-Tag: php-7.4.0alpha3~116^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc3fe3bd30ecd94e7eec5075f25f7cd4c5b806e2;p=php Fixed tests due to changed timezone data --- diff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt index 7d9df074f5..0154839ae4 100644 --- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt +++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt @@ -26,20 +26,11 @@ var_dump( $abbr["acst"] ); --EXPECTF-- *** Testing DateTimeZone::listAbbreviations() : basic functionality *** string(5) "array" -int(%d) +int(144) -- Format a sample entry -- -array(12) { +array(6) { [0]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(18) "Australia/Adelaide" - } - [1]=> array(3) { ["dst"]=> bool(false) @@ -48,52 +39,7 @@ array(12) { ["timezone_id"]=> string(18) "Australia/Adelaide" } - [2]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(21) "Australia/Broken_Hill" - } - [3]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(16) "Australia/Darwin" - } - [4]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(15) "Australia/North" - } - [5]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(15) "Australia/South" - } - [6]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(20) "Australia/Yancowinna" - } - [7]=> + [1]=> array(3) { ["dst"]=> bool(false) @@ -102,7 +48,7 @@ array(12) { ["timezone_id"]=> string(21) "Australia/Broken_Hill" } - [8]=> + [2]=> array(3) { ["dst"]=> bool(false) @@ -111,7 +57,7 @@ array(12) { ["timezone_id"]=> string(16) "Australia/Darwin" } - [9]=> + [3]=> array(3) { ["dst"]=> bool(false) @@ -120,7 +66,7 @@ array(12) { ["timezone_id"]=> string(15) "Australia/North" } - [10]=> + [4]=> array(3) { ["dst"]=> bool(false) @@ -129,7 +75,7 @@ array(12) { ["timezone_id"]=> string(15) "Australia/South" } - [11]=> + [5]=> array(3) { ["dst"]=> bool(false) diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt index d44d2d7542..5232fe215f 100644 --- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt +++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt @@ -26,20 +26,11 @@ var_dump( $abbr["acst"] ); --EXPECTF-- *** Testing timezone_abbreviations_list() : basic functionality *** string(5) "array" -int(%d) +int(144) -- Format a sample entry -- -array(12) { +array(6) { [0]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(18) "Australia/Adelaide" - } - [1]=> array(3) { ["dst"]=> bool(false) @@ -48,52 +39,7 @@ array(12) { ["timezone_id"]=> string(18) "Australia/Adelaide" } - [2]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(21) "Australia/Broken_Hill" - } - [3]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(16) "Australia/Darwin" - } - [4]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(15) "Australia/North" - } - [5]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(15) "Australia/South" - } - [6]=> - array(3) { - ["dst"]=> - bool(false) - ["offset"]=> - int(32400) - ["timezone_id"]=> - string(20) "Australia/Yancowinna" - } - [7]=> + [1]=> array(3) { ["dst"]=> bool(false) @@ -102,7 +48,7 @@ array(12) { ["timezone_id"]=> string(21) "Australia/Broken_Hill" } - [8]=> + [2]=> array(3) { ["dst"]=> bool(false) @@ -111,7 +57,7 @@ array(12) { ["timezone_id"]=> string(16) "Australia/Darwin" } - [9]=> + [3]=> array(3) { ["dst"]=> bool(false) @@ -120,7 +66,7 @@ array(12) { ["timezone_id"]=> string(15) "Australia/North" } - [10]=> + [4]=> array(3) { ["dst"]=> bool(false) @@ -129,7 +75,7 @@ array(12) { ["timezone_id"]=> string(15) "Australia/South" } - [11]=> + [5]=> array(3) { ["dst"]=> bool(false)