From d89b65f98503bbe99ee7810a97b2c0a16da2651c Mon Sep 17 00:00:00 2001 From: Anatoliy Belsky Date: Tue, 10 Apr 2012 11:03:41 +0200 Subject: [PATCH] Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails The behaviour on windows is to select an arbitrary timezone from the current system settings. This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is parametrized so there is no hardcoded timezone data. The original test made to be skipped on windows and a duplicate was made for windows. --- .../date_default_timezone_get-1-win32.phpt | 24 +++++++++++++++++++ .../tests/date_default_timezone_get-1.phpt | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 ext/date/tests/date_default_timezone_get-1-win32.phpt diff --git a/ext/date/tests/date_default_timezone_get-1-win32.phpt b/ext/date/tests/date_default_timezone_get-1-win32.phpt new file mode 100644 index 0000000000..a12418f701 --- /dev/null +++ b/ext/date/tests/date_default_timezone_get-1-win32.phpt @@ -0,0 +1,24 @@ +--TEST-- +date_default_timezone_get() function [1] +--SKIPIF-- + +--INI-- +date.timezone= +--FILE-- + +--EXPECTF-- +Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected '%s' for '%s' instead in %sdate_default_timezone_get-1-win32.php on line 3 +%s + +Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected '%s' for '%s' instead in %sdate_default_timezone_get-1-win32.php on line 4 +%s diff --git a/ext/date/tests/date_default_timezone_get-1.phpt b/ext/date/tests/date_default_timezone_get-1.phpt index 383394a955..5d17a25caf 100644 --- a/ext/date/tests/date_default_timezone_get-1.phpt +++ b/ext/date/tests/date_default_timezone_get-1.phpt @@ -1,5 +1,9 @@ --TEST-- date_default_timezone_get() function [1] +--SKIPIF-- + --INI-- date.timezone= --FILE-- -- 2.40.0