summaryrefslogtreecommitdiff
path: root/ext/date
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-10-09 14:05:33 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-10-09 14:05:33 +0200
commitcc58347105939879f73d43db4afa7a937409f06a (patch)
tree3bc14996f48a181c12a24072aa6458effcc4537d /ext/date
parent6f888b90c589cebaf6b5367ba59dabc65f1a18d8 (diff)
parent229eb15f0e5c3c0b0b85bf90d85ed18316c4dad5 (diff)
downloadphp-git-cc58347105939879f73d43db4afa7a937409f06a.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: XFAIL test broken by timelib update
Diffstat (limited to 'ext/date')
-rw-r--r--ext/date/tests/bug48097.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/date/tests/bug48097.phpt b/ext/date/tests/bug48097.phpt
index 02f72f2f99..5d0d48dbc0 100644
--- a/ext/date/tests/bug48097.phpt
+++ b/ext/date/tests/bug48097.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #48097 (date_timezone_set function produces wrong datetime result)
+--XFAIL--
+Broken by timelib update
--INI--
date.timezone=UTC
--FILE--