|
 |
1ceb81 |
diff -up ./ext/date/tests/bug33414-2.phpt.datetests ./ext/date/tests/bug33414-2.phpt
|
|
|
1ceb81 |
--- ./ext/date/tests/bug33414-2.phpt.datetests 2020-04-09 14:06:11.000000000 +0200
|
|
|
1ceb81 |
+++ ./ext/date/tests/bug33414-2.phpt 2020-04-09 14:40:00.809433489 +0200
|
|
|
1ceb81 |
@@ -74,10 +74,10 @@ $strtotime_tstamp = strtotime("next Frid
|
|
|
1ceb81 |
print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
|
|
|
1ceb81 |
print "wanted=Friday 00:00:00\n\n";
|
|
|
1ceb81 |
?>
|
|
|
1ceb81 |
---EXPECT--
|
|
|
1ceb81 |
+--EXPECTF--
|
|
|
1ceb81 |
TZ=Pacific/Rarotonga - wrong day.
|
|
|
1ceb81 |
-tStamp=Thursday 1970-01-01 17:17:17 -1030 0
|
|
|
1ceb81 |
-result=Tuesday 1970-01-06 00:00:00 -1030 0
|
|
|
1ceb81 |
+tStamp=Thursday 1970-01-01 17:17:17 %s
|
|
|
1ceb81 |
+result=Tuesday 1970-01-06 00:00:00 %s
|
|
|
1ceb81 |
wanted=Tuesday 00:00:00
|
|
|
1ceb81 |
|
|
|
1ceb81 |
TZ=Atlantic/South_Georgia - wrong day.
|
|
|
1ceb81 |
@@ -91,13 +91,13 @@ result=Monday 2005-04-04 00:00:00 EDT 1
|
|
|
1ceb81 |
wanted=Monday 00:00:00
|
|
|
1ceb81 |
|
|
|
1ceb81 |
TZ=Pacific/Enderbury - wrong day, off by 2 days.
|
|
|
1ceb81 |
-tStamp=Thursday 1970-01-01 17:17:17 -12 0
|
|
|
1ceb81 |
-result=Monday 1970-01-05 00:00:00 -12 0
|
|
|
1ceb81 |
+tStamp=Thursday 1970-01-01 17:17:17 %s
|
|
|
1ceb81 |
+result=Monday 1970-01-05 00:00:00 %s
|
|
|
1ceb81 |
wanted=Monday 00:00:00
|
|
|
1ceb81 |
|
|
|
1ceb81 |
TZ=Pacific/Kiritimati - wrong day, off by 2 days.
|
|
|
1ceb81 |
-tStamp=Thursday 1970-01-01 17:17:17 -1040 0
|
|
|
1ceb81 |
-result=Monday 1970-01-05 00:00:00 -1040 0
|
|
|
1ceb81 |
+tStamp=Thursday 1970-01-01 17:17:17 %s
|
|
|
1ceb81 |
+result=Monday 1970-01-05 00:00:00 %s
|
|
|
1ceb81 |
wanted=Monday 00:00:00
|
|
|
1ceb81 |
|
|
|
1ceb81 |
TZ=America/Managua - wrong day.
|
|
|
1ceb81 |
@@ -106,13 +106,13 @@ result=Tuesday 2005-04-12 00:00:00 CDT 1
|
|
|
1ceb81 |
wanted=Tuesday 00:00:00
|
|
|
1ceb81 |
|
|
|
1ceb81 |
TZ=Pacific/Pitcairn - wrong day.
|
|
|
1ceb81 |
-tStamp=Thursday 1970-01-01 17:17:17 -0830 0
|
|
|
1ceb81 |
-result=Wednesday 1970-01-07 00:00:00 -0830 0
|
|
|
1ceb81 |
+tStamp=Thursday 1970-01-01 17:17:17 %s
|
|
|
1ceb81 |
+result=Wednesday 1970-01-07 00:00:00 %s
|
|
|
1ceb81 |
wanted=Wednesday 00:00:00
|
|
|
1ceb81 |
|
|
|
1ceb81 |
TZ=Pacific/Fakaofo - wrong day.
|
|
|
1ceb81 |
-tStamp=Thursday 1970-01-01 17:17:17 -11 0
|
|
|
1ceb81 |
-result=Saturday 1970-01-03 00:00:00 -11 0
|
|
|
1ceb81 |
+tStamp=Thursday 1970-01-01 17:17:17 %s
|
|
|
1ceb81 |
+result=Saturday 1970-01-03 00:00:00 %s
|
|
|
1ceb81 |
wanted=Saturday 00:00:00
|
|
|
1ceb81 |
|
|
|
1ceb81 |
TZ=Pacific/Johnston - wrong day.
|
|
|
1ceb81 |
diff -up ./ext/date/tests/bug66985.phpt.datetests ./ext/date/tests/bug66985.phpt
|
|
|
1ceb81 |
--- ./ext/date/tests/bug66985.phpt.datetests 2020-04-09 14:06:11.000000000 +0200
|
|
|
1ceb81 |
+++ ./ext/date/tests/bug66985.phpt 2020-04-09 14:40:37.099288185 +0200
|
|
|
1ceb81 |
@@ -3,7 +3,7 @@ Bug #66985 (Some timezones are no longer
|
|
|
1ceb81 |
--FILE--
|
|
|
1ceb81 |
|
|
|
1ceb81 |
$zones = array(
|
|
|
1ceb81 |
- "CST6CDT", "Cuba", "Egypt", "Eire", "EST5EDT", "Factory", "GB-Eire",
|
|
|
1ceb81 |
+ "CST6CDT", "Cuba", "Egypt", "Eire", "EST5EDT", "GB-Eire",
|
|
|
1ceb81 |
"GMT0", "Greenwich", "Hongkong", "Iceland", "Iran", "Israel", "Jamaica",
|
|
|
1ceb81 |
"Japan", "Kwajalein", "Libya", "MST7MDT", "Navajo", "NZ-CHAT", "Poland",
|
|
|
1ceb81 |
"Portugal", "PST8PDT", "Singapore", "Turkey", "Universal", "W-SU",
|
|
|
1ceb81 |
@@ -45,11 +45,6 @@ DateTimeZone Object
|
|
|
1ceb81 |
)
|
|
|
1ceb81 |
DateTimeZone Object
|
|
|
1ceb81 |
(
|
|
|
1ceb81 |
- [timezone_type] => 3
|
|
|
1ceb81 |
- [timezone] => Factory
|
|
|
1ceb81 |
-)
|
|
|
1ceb81 |
-DateTimeZone Object
|
|
|
1ceb81 |
-(
|
|
|
1ceb81 |
[timezone_type] => 3
|
|
|
1ceb81 |
[timezone] => GB-Eire
|
|
|
1ceb81 |
)
|
|
|
1ceb81 |
diff -up ./ext/date/tests/strtotime3-64bit.phpt.datetests ./ext/date/tests/strtotime3-64bit.phpt
|
|
|
1ceb81 |
--- ./ext/date/tests/strtotime3-64bit.phpt.datetests 2020-04-09 14:06:11.000000000 +0200
|
|
|
1ceb81 |
+++ ./ext/date/tests/strtotime3-64bit.phpt 2020-04-09 14:40:00.809433489 +0200
|
|
|
1ceb81 |
@@ -44,7 +44,7 @@ foreach ($strs as $str) {
|
|
|
1ceb81 |
}
|
|
|
1ceb81 |
|
|
|
1ceb81 |
?>
|
|
|
1ceb81 |
---EXPECT--
|
|
|
1ceb81 |
+--EXPECTF--
|
|
|
1ceb81 |
bool(false)
|
|
|
1ceb81 |
bool(false)
|
|
|
1ceb81 |
string(31) "Thu, 15 Jun 2006 00:00:00 +0100"
|
|
|
1ceb81 |
@@ -53,7 +53,7 @@ bool(false)
|
|
|
1ceb81 |
string(31) "Fri, 16 Jun 2006 23:49:12 +0100"
|
|
|
1ceb81 |
bool(false)
|
|
|
1ceb81 |
string(31) "Fri, 16 Jun 2006 02:22:00 +0100"
|
|
|
1ceb81 |
-string(31) "Sun, 16 Jun 0222 02:22:00 -0036"
|
|
|
1ceb81 |
+string(31) "Sun, 16 Jun 0222 02:22:00 %s"
|
|
|
1ceb81 |
string(31) "Fri, 16 Jun 2006 02:22:33 +0100"
|
|
|
1ceb81 |
bool(false)
|
|
|
1ceb81 |
string(31) "Tue, 02 Mar 2004 00:00:00 +0000"
|