From ac282a90f171431369fd508502665365b57d406c Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 22 Sep 2019 18:55:20 +0200
Subject: [PATCH] Add skip reasons

---
 ext/libxml/tests/001.phpt                                    | 2 +-
 ext/libxml/tests/002.phpt                                    | 2 +-
 ext/libxml/tests/003.phpt                                    | 2 +-
 ext/libxml/tests/004.phpt                                    | 2 +-
 ext/libxml/tests/bug42112.phpt                               | 2 +-
 ext/libxml/tests/bug61367-read.phpt                          | 2 +-
 ext/libxml/tests/bug61367-write.phpt                         | 2 +-
 ext/libxml/tests/bug63389.phpt                               | 2 +-
 ext/libxml/tests/bug76777.phpt                               | 2 +-
 ext/libxml/tests/libxml_disable_entity_loader.phpt           | 5 ++++-
 .../tests/libxml_set_external_entity_loader_basic.phpt       | 2 +-
 .../tests/libxml_set_external_entity_loader_error1.phpt      | 2 +-
 .../tests/libxml_set_external_entity_loader_variation1.phpt  | 2 +-
 .../tests/libxml_set_external_entity_loader_variation2.phpt  | 2 +-
 14 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ext/libxml/tests/001.phpt b/ext/libxml/tests/001.phpt
index 7914ef509b..9d25b0d3f4 100644
--- a/ext/libxml/tests/001.phpt
+++ b/ext/libxml/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_use_internal_errors()
 --SKIPIF--
-<?php if (!extension_loaded('libxml')) die('skip'); ?>
+<?php if (!extension_loaded('libxml')) die('skip libxml extension not available'); ?>
 --FILE--
 <?php
 
diff --git a/ext/libxml/tests/002.phpt b/ext/libxml/tests/002.phpt
index f803d7ab1b..75011462f3 100644
--- a/ext/libxml/tests/002.phpt
+++ b/ext/libxml/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_get_errors()
 --SKIPIF--
-<?php if (!extension_loaded('simplexml')) die('skip'); ?>
+<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not available'); ?>
 --FILE--
 <?php
 
diff --git a/ext/libxml/tests/003.phpt b/ext/libxml/tests/003.phpt
index c168785647..b7edac6751 100644
--- a/ext/libxml/tests/003.phpt
+++ b/ext/libxml/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_use_internal_errors() memory leaks
 --SKIPIF--
-<?php if (!extension_loaded('simplexml')) die('skip'); ?>
+<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not available'); ?>
 --FILE--
 <?php
 var_dump(libxml_use_internal_errors(true));
diff --git a/ext/libxml/tests/004.phpt b/ext/libxml/tests/004.phpt
index 01776b7d43..d02fba2f6c 100644
--- a/ext/libxml/tests/004.phpt
+++ b/ext/libxml/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_streams_context()
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not available'); ?>
 --FILE--
 <?php
 
diff --git a/ext/libxml/tests/bug42112.phpt b/ext/libxml/tests/bug42112.phpt
index b5a3f40b3e..a1b8871342 100644
--- a/ext/libxml/tests/bug42112.phpt
+++ b/ext/libxml/tests/bug42112.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42112 (deleting a node produces memory corruption)
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not available'); ?>
 --FILE--
 <?php
 $xml = <<<EOXML
diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt
index b4ecaa0324..98aad5b591 100644
--- a/ext/libxml/tests/bug61367-read.phpt
+++ b/ext/libxml/tests/bug61367-read.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61367: open_basedir bypass in libxml RSHUTDOWN: read test
 --SKIPIF--
-<?php if(!extension_loaded('dom')) echo 'skip'; ?>
+<?php if(!extension_loaded('dom')) echo 'skip dom extension not available'; ?>
 --INI--
 open_basedir=.
 error_reporting=E_ALL & ~E_NOTICE
diff --git a/ext/libxml/tests/bug61367-write.phpt b/ext/libxml/tests/bug61367-write.phpt
index 155c9aba9d..5da63d0b71 100644
--- a/ext/libxml/tests/bug61367-write.phpt
+++ b/ext/libxml/tests/bug61367-write.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61367: open_basedir bypass in libxml RSHUTDOWN: write test
 --SKIPIF--
-<?php if(!extension_loaded('dom')) echo 'skip'; ?>
+<?php if(!extension_loaded('dom')) echo 'skip dom extension not available'; ?>
 --INI--
 open_basedir=.
 --FILE--
diff --git a/ext/libxml/tests/bug63389.phpt b/ext/libxml/tests/bug63389.phpt
index df7af1b2b6..92c3e83567 100644
--- a/ext/libxml/tests/bug63389.phpt
+++ b/ext/libxml/tests/bug63389.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #63389 (Missing context check on libxml_set_streams_context() causes memleak)
 --SKIPIF--
-<?php if (!extension_loaded('libxml')) die('skip'); ?>
+<?php if (!extension_loaded('libxml')) die('skip libxml extension not available'); ?>
 --FILE--
 <?php
 $fp = fopen("php://input", "r");
diff --git a/ext/libxml/tests/bug76777.phpt b/ext/libxml/tests/bug76777.phpt
index ce111178f3..5e15024b81 100644
--- a/ext/libxml/tests/bug76777.phpt
+++ b/ext/libxml/tests/bug76777.phpt
@@ -2,7 +2,7 @@
 Bug #76777 (first parameter of libxml_set_external_entity_loader callback undefined)
 --SKIPIF--
 <?php
-if (!extension_loaded('libxml')) die('skip');
+if (!extension_loaded('libxml')) die('skip libxml extension not available');
 if (!extension_loaded('dom')) die('skip dom extension not available');
 if (getenv("SKIP_ONLINE_TESTS")) die('skip online test');
 ?>
diff --git a/ext/libxml/tests/libxml_disable_entity_loader.phpt b/ext/libxml/tests/libxml_disable_entity_loader.phpt
index 6477543fb2..7633a889f3 100644
--- a/ext/libxml/tests/libxml_disable_entity_loader.phpt
+++ b/ext/libxml/tests/libxml_disable_entity_loader.phpt
@@ -1,7 +1,10 @@
 --TEST--
 libxml_disable_entity_loader()
 --SKIPIF--
-<?php if (!extension_loaded('libxml') || !extension_loaded('dom') || defined('PHP_WINDOWS_VERSION_MAJOR')) 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
 
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_basic.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_basic.phpt
index 938229ff86..b530276016 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_basic.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() basic test
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not available'); ?>
 --FILE--
 <?php
 $xml = <<<XML
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
index 9a6826ca54..f47d7e948f 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() error: bad arguments
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not available'); ?>
 --FILE--
 <?php
 $xml = <<<XML
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
index d65f77e9f8..02f984f9bc 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() variation: resolve externals and entities
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not available'); ?>
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
index e51869cf47..8b909c1567 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() variation: restore original handler; returning NULL
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not available'); ?>
 --CLEAN--
 <?php
 @unlink(__DIR__ . "/foobar.dtd");
-- 
2.49.0