From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 3 Aug 2020 07:15:50 +0000 (+0200)
Subject: Merge branch 'PHP-7.4' into master
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24495ba7780b0656a753678c6337d7a479d35ed3;p=php

Merge branch 'PHP-7.4' into master

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

24495ba7780b0656a753678c6337d7a479d35ed3
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