com php-src: Merge branch 'PHP-7.4' into master: ext/libxml/tes ts/libxml_disable_entity_loader.phpt

Commit: 24495ba7780b0656a753678c6337d7a479d35ed3 Author: Christoph M. Becker <cmbecker69@gmx.de> Mon, 3 Aug 2020 09:15:50 +0200 Parents: 7d4ae7fa235301031590a774802fc343e3e42856 d4b32e82c81073613eae4c363f9953d5fc355023 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24495ba7780b0656a753678c6337d7a479d35ed3 Log: Merge branch 'PHP-7.4' into master * PHP-7.4: Enable libxml entity loader test case on Windows Changed paths: MM ext/libxml/tests/libxml_disable_entity_loader.phpt Diff: diff --cc ext/libxml/tests/libxml_disable_entity_loader.phpt index 7633a889f3,9717da9bcf...790a98db16 --- a/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