diff options
| author | Derick Rethans <github@derickrethans.nl> | 2017-03-27 18:01:30 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2017-03-27 18:01:30 +0100 |
| commit | 727b21c839a2b7e85ba432d77d6072023c76077b (patch) | |
| tree | 4eb931d0c47bfbf2935600880f777e7d0735ee84 /ext/date | |
| parent | b8714a8b37e1f68eabb4badedc95bcb7984e1f33 (diff) | |
| parent | 1f8fc0fb5618af498fd55f7c594ef9ff4b8013d9 (diff) | |
| download | php-git-727b21c839a2b7e85ba432d77d6072023c76077b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/date')
| -rw-r--r-- | ext/date/tests/bug33415-2.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt index 61fc0fef30..a78557df55 100644 --- a/ext/date/tests/bug33415-2.phpt +++ b/ext/date/tests/bug33415-2.phpt @@ -120,7 +120,7 @@ $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 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"; +print "wanted=Friday 00:44:30\n\n"; print "TZ=Asia/Katmandu - Is it OK for this to 0:15 AM?. yes\n"; date_default_timezone_set('Asia/Katmandu'); |