summaryrefslogtreecommitdiff
path: root/ext/standard/tests/time
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2005-06-30 21:38:06 +0000
committerDerick Rethans <derick@php.net>2005-06-30 21:38:06 +0000
commite155585e6e1338110b0c31e1054d6b28b5bcff5b (patch)
treed6cf6de0ff527954dcacab6a9099faa23e5e4c31 /ext/standard/tests/time
parent2e794631203339035f705f81e4855642b3332f97 (diff)
downloadphp-git-e155585e6e1338110b0c31e1054d6b28b5bcff5b.tar.gz
- Reimplemented date and gmdate with new timelib code.
- Removed old date/gmdate implementations. - Moved date() related testcases to ext/date/tests. - Implemented bug #33452. - Fixed testcase for bug #27719 - there is no timezone called "EST5DST".
Diffstat (limited to 'ext/standard/tests/time')
-rw-r--r--ext/standard/tests/time/bug27719.phpt8
-rw-r--r--ext/standard/tests/time/date.phpt22
2 files changed, 4 insertions, 26 deletions
diff --git a/ext/standard/tests/time/bug27719.phpt b/ext/standard/tests/time/bug27719.phpt
index 2484356aaa..c8a51bea1e 100644
--- a/ext/standard/tests/time/bug27719.phpt
+++ b/ext/standard/tests/time/bug27719.phpt
@@ -10,7 +10,7 @@ Bug #27719: mktime returns incorrect timestamp for dst days
echo "$b ".date("m/d/y h:i:s\n",$b);
echo "$c ".date("m/d/y h:i:s\n",$c);
echo "\n";
- putenv("TZ=EST5DST"); // DST not in effect
+ putenv("TZ=EST5EDT"); // DST not in effect
$a = mktime(0, 0, 0, 2, 4, 2004, 0);
$b = mktime(0, 0, 0, 2, 4, 2004, 1);
$c = mktime(0, 0, 0, 2, 4, 2004, -1);
@@ -18,7 +18,7 @@ Bug #27719: mktime returns incorrect timestamp for dst days
echo "$b ".date("m/d/y h:i:s\n",$b);
echo "$c ".date("m/d/y h:i:s\n",$c);
echo "\n";
- putenv("TZ=EST5DST"); // Just before DST changeover
+ putenv("TZ=EST5EDT"); // Just before DST changeover
$a = mktime(0, 0, 0, 4, 4, 2004, 0);
$b = mktime(0, 0, 0, 4, 4, 2004, 1);
$c = mktime(0, 0, 0, 4, 4, 2004, -1);
@@ -26,7 +26,7 @@ Bug #27719: mktime returns incorrect timestamp for dst days
echo "$b ".date("m/d/y h:i:s\n",$b);
echo "$c ".date("m/d/y h:i:s\n",$c);
echo "\n";
- putenv("TZ=EST5DST"); // Just after DST changeover
+ putenv("TZ=EST5EDT"); // Just after DST changeover
$a = mktime(3, 0, 0, 4, 4, 2004, 0);
$b = mktime(3, 0, 0, 4, 4, 2004, 1);
$c = mktime(3, 0, 0, 4, 4, 2004, -1);
@@ -34,7 +34,7 @@ Bug #27719: mktime returns incorrect timestamp for dst days
echo "$b ".date("m/d/y h:i:s\n",$b);
echo "$c ".date("m/d/y h:i:s\n",$c);
echo "\n";
- putenv("TZ=EST5DST"); // DST in effect
+ putenv("TZ=EST5EDT"); // DST in effect
$a = mktime(0, 0, 0, 6, 4, 2004, 0);
$b = mktime(0, 0, 0, 6, 4, 2004, 1);
$c = mktime(0, 0, 0, 6, 4, 2004, -1);
diff --git a/ext/standard/tests/time/date.phpt b/ext/standard/tests/time/date.phpt
deleted file mode 100644
index 87cae0b310..0000000000
--- a/ext/standard/tests/time/date.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-date() function
---FILE--
-<?php
-$tmp = "cr";
-putenv ("TZ=GMT0");
-
-for($a = 0;$a < strlen($tmp); $a++){
- echo $tmp{$a}, ': ', date($tmp{$a}, 1043324459)."\n";
-}
-
-putenv ("TZ=MET");
-
-for($a = 0;$a < strlen($tmp); $a++){
- echo $tmp{$a}, ': ', date($tmp{$a}, 1043324459)."\n";
-}
-?>
---EXPECT--
-c: 2003-01-23T12:20:59+00:00
-r: Thu, 23 Jan 2003 12:20:59 +0000
-c: 2003-01-23T13:20:59+01:00
-r: Thu, 23 Jan 2003 13:20:59 +0100