summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-01-11 06:17:37 +1400
committerChristoph M. Becker <cmbecker69@gmx.de>2020-01-11 06:17:37 +1400
commitf91dbac9ae4a17dee52738fa508e5babaa7d8714 (patch)
tree3ac4a3037b660e5850eda6052b0faa45f0ecba16 /ext
parent7ce531f2c28dcfe4aeed271b55b82de65c3bca8a (diff)
parente8a86b1a00d9363cbca65fdaea02a04705aa7f55 (diff)
downloadphp-git-f91dbac9ae4a17dee52738fa508e5babaa7d8714.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix test for Windows ZTS builds
Diffstat (limited to 'ext')
-rw-r--r--ext/calendar/tests/easter_date.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/calendar/tests/easter_date.phpt b/ext/calendar/tests/easter_date.phpt
index c620e7b441..a7cdbea516 100644
--- a/ext/calendar/tests/easter_date.phpt
+++ b/ext/calendar/tests/easter_date.phpt
@@ -2,6 +2,8 @@
easter_date()
--INI--
date.timezone=UTC
+--ENV--
+TZ=UTC
--SKIPIF--
<?php include 'skipif.inc'; ?>
--FILE--