summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-10-09 14:05:23 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-10-09 14:05:23 +0200
commit229eb15f0e5c3c0b0b85bf90d85ed18316c4dad5 (patch)
tree9da3bc395daced0e2c5cb0d896c86cebc257ae4b
parent950157942ecf0f77e7f9f9539e2b930f7d5ba3b1 (diff)
parent50185814104f172f0008055237128e0b2ef8b67a (diff)
downloadphp-git-229eb15f0e5c3c0b0b85bf90d85ed18316c4dad5.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: XFAIL test broken by timelib update
-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 41ade81247..dbc1b57fd0 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--