diff options
| author | Derick Rethans <github@derickrethans.nl> | 2017-03-27 11:28:35 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2017-03-27 11:28:35 +0100 |
| commit | f326cfc513873ac2852cb7efb94e109ffd2232ed (patch) | |
| tree | 117b97546d6293b2a8c7b34dd7793c1e6e2218c2 | |
| parent | 1f9e5cc2bc30145b10a96e831d64c1f6b6298868 (diff) | |
| parent | eb5d4bcd4f1005cc1fbe203d90b16ae43497e539 (diff) | |
| download | php-git-f326cfc513873ac2852cb7efb94e109ffd2232ed.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | ext/date/tests/bug33415-2.phpt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt index f59df64e42..61fc0fef30 100644 --- a/ext/date/tests/bug33415-2.phpt +++ b/ext/date/tests/bug33415-2.phpt @@ -116,9 +116,9 @@ print "wanted=Monday 00:00:00\n\n"; print "TZ=Africa/Monrovia - Is it OK for this to be 00:44:30 AM? yes\n"; date_default_timezone_set('Africa/Monrovia'); -$tStamp = mktime (17, 17, 17, 1, 845, 1970); +$tStamp = mktime (17, 17, 17, 1, 730, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; -$strtotime_tstamp = strtotime("next Monday", $tStamp); +$strtotime_tstamp = strtotime("next Friday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; print "wanted=Monday 00:44:30\n\n"; @@ -282,9 +282,9 @@ result=Monday 1970-01-05 00:00:00 +12 0 wanted=Monday 00:00:00 TZ=Africa/Monrovia - Is it OK for this to be 00:44:30 AM? yes -tStamp=Monday 1972-04-24 17:17:17 %s 0 -result=Monday 1972-05-01 00:44:30 GMT 0 -wanted=Monday 00:44:30 +tStamp=Friday 1971-12-31 17:17:17 MMT 0 +result=Friday 1972-01-07 00:44:30 GMT 0 +wanted=Friday 00:44:30 TZ=Asia/Katmandu - Is it OK for this to 0:15 AM?. yes tStamp=Wednesday 1985-12-25 17:17:17 +0530 0 |