From: Ard Biesheuvel Date: Wed, 31 Mar 2004 10:31:43 +0000 (+0000) Subject: MFH X-Git-Tag: php-4.3.6RC1~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea3c36078c3969769f1f792d2c8984fa29452e41;p=php MFH --- diff --git a/ext/standard/tests/time/003.phpt b/ext/standard/tests/time/003.phpt index 2da8121b6a..90855f08ef 100644 --- a/ext/standard/tests/time/003.phpt +++ b/ext/standard/tests/time/003.phpt @@ -15,7 +15,7 @@ Check for mktime with out-of-range parameters echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2001)) ."\n"; echo date("Y-m-d", mktime( 12, 0, 0, 0, 0, 2000)) ."\n"; - putenv("TZ=GST-1GDT"); + putenv("TZ=Europe/London"); echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,-1))."\n"; echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,0))."\n"; echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,1))."\n"; diff --git a/ext/standard/tests/time/bug27719.phpt b/ext/standard/tests/time/bug27719.phpt index 75d628920d..2484356aaa 100644 --- a/ext/standard/tests/time/bug27719.phpt +++ b/ext/standard/tests/time/bug27719.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #27719: mktime returns incorrect timestamp for dst days --FILE-- - ---EXPECT-- -1081054800 04/04/04 12:00:00 +--EXPECTF-- 1081054800 04/04/04 12:00:00 +%s 1081054800 04/04/04 12:00:00 1075870800 02/04/04 12:00:00 diff --git a/ext/standard/tests/time/mktime.phpt b/ext/standard/tests/time/mktime.phpt index e0b1fd3f9f..8914ea0787 100644 --- a/ext/standard/tests/time/mktime.phpt +++ b/ext/standard/tests/time/mktime.phpt @@ -1,10 +1,10 @@ --TEST-- mktime() --FILE-- - ---EXPECT-- +--EXPECTF-- int(1009843200) int(1009843200) int(1009843200) -int(1009843200) -int(1025481600) +int(%s) int(1025481600) int(1025481600) int(1025481600) +int(%s) +int(1009843200) +int(1009843200) +int(1009843200) int(1009839600) -int(1009839600) -int(1009839600) -int(1009836000) -int(1025474400) -int(1025474400) int(1025478000) -int(1025474400) +int(1025478000) +int(1025481600) +int(1025478000)