diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-11 06:16:03 +1400 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-11 06:16:03 +1400 |
commit | e8a86b1a00d9363cbca65fdaea02a04705aa7f55 (patch) | |
tree | 4c2c035dd5497036c333eecc36c90d8308d7c51f | |
parent | bf629baa9c9d2a79e5fd5649977c7c59ecc113b5 (diff) | |
parent | bc529b92ee69f79e9cd79cf50c3c6d901367c3b9 (diff) | |
download | php-git-e8a86b1a00d9363cbca65fdaea02a04705aa7f55.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test for Windows ZTS builds
-rw-r--r-- | ext/calendar/tests/easter_date.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/calendar/tests/easter_date.phpt b/ext/calendar/tests/easter_date.phpt index 065e1478d0..4e0aaa137f 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-- |