Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Enable libxml entity loader test case on Windows

diff --cc ext/libxml/tests/libxml_disable_entity_loader.phpt
index 7633a889f3e9abaae60538e32a76b32c0bf7f598,9717da9bcff08c2b7b87b918c0bd5541c25a8bc9..790a98db1603506751c6afaa9b82c784aed5a9b0
--- 1/ext/libxml/tests/libxml_disable_entity_loader.phpt
--- 2/ext/libxml/tests/libxml_disable_entity_loader.phpt
+++ b/ext/libxml/tests/libxml_disable_entity_loader.phpt
@@@ -1,10 -1,7 +1,9 @@@
  --TEST--
  libxml_disable_entity_loader()
  --SKIPIF--
 -<?php if (!extension_loaded('libxml') || !extension_loaded('dom')) die('skip'); ?>
 +<?php
 +if (!extension_loaded('libxml')) die('skip libxml extension not available');
 +if (!extension_loaded('dom')) die('skip dom extension not available');
- if (defined('PHP_WINDOWS_VERSION_MAJOR')) die('skip not for Windows'); ?>
  --FILE--
  <?php