diff options
| author | Derick Rethans <github@derickrethans.nl> | 2018-10-09 11:38:01 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2018-10-09 11:38:01 +0100 |
| commit | d21aa93dd4dee24bdfa28a55cc2f0eeb5f4fb971 (patch) | |
| tree | bdcbbe118cd081fbe8590cc315ed0725a1675f84 | |
| parent | 0ef3b125cd87054b6d5ffbce07b125f026c53bb9 (diff) | |
| parent | 1eac7c1ea3899dbb87a8c6795086a7ce6b3b39ac (diff) | |
| download | php-git-d21aa93dd4dee24bdfa28a55cc2f0eeb5f4fb971.tar.gz | |
Merge branch 'PHP-7.3'
| -rw-r--r-- | ext/date/tests/bug67253.phpt | 2 | ||||
| -rw-r--r-- | ext/date/tests/timezone_abbreviations_list_basic1.phpt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/date/tests/bug67253.phpt b/ext/date/tests/bug67253.phpt index b28cbe63c1..c7d38956ff 100644 --- a/ext/date/tests/bug67253.phpt +++ b/ext/date/tests/bug67253.phpt @@ -21,7 +21,7 @@ array(12) { ["second"]=> int(0) ["fraction"]=> - bool(false) + float(0) ["warning_count"]=> int(0) ["warnings"]=> diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt index e5f2f6d718..3c9ea1204c 100644 --- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt +++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt @@ -23,10 +23,10 @@ var_dump( $abbr["acst"] ); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- *** Testing timezone_abbreviations_list() : basic functionality *** string(5) "array" -int(142) +int(%d) -- Format a sample entry -- array(12) { |