Merge pull request #8 from nbs-system/fix_local_xxe

Fix XXE test when running without XML support

5 files changed, 17 insertions, 11 deletions

diff --git a/src/tests/disable_xxe_dom.phpt b/src/tests/disable_xxe_dom.phpt
index 8b63589..e1459e3 100644
--- a/src/tests/disable_xxe_dom.phpt
+++ b/src/tests/disable_xxe_dom.phpt
@@ -2,8 +2,11 @@
 Disable XXE
 --SKIPIF--
 <?php
- if (!extension_loaded("snuffleupagus")) die "skip";
- if (!extension_loaded("dom")) die "skip";
+ if (!extension_loaded("snuffleupagus")) {
+  echo "skip"; 
+} elseif (!extension_loaded("dom")) {
+        echo "skip";
+}
  ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
diff --git a/src/tests/disable_xxe_dom_disabled.phpt b/src/tests/disable_xxe_dom_disabled.phpt
index a7ccd60..a791ebc 100644
--- a/src/tests/disable_xxe_dom_disabled.phpt
+++ b/src/tests/disable_xxe_dom_disabled.phpt
@@ -2,8 +2,8 @@
 Disable XXE
 --SKIPIF--
 <?php
- if (!extension_loaded("snuffleupagus")) die "skip";
- if (!extension_loaded("dom")) die "skip";
+ if (!extension_loaded("snuffleupagus")) echo "skip";
+ if (!extension_loaded("dom")) echo "skip";
  ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
diff --git a/src/tests/disable_xxe_simplexml.phpt b/src/tests/disable_xxe_simplexml.phpt
index 7825167..88396c0 100644
--- a/src/tests/disable_xxe_simplexml.phpt
+++ b/src/tests/disable_xxe_simplexml.phpt
@@ -2,8 +2,8 @@
 Disable XXE
 --SKIPIF--
 <?php
- if (!extension_loaded("snuffleupagus")) die "skip";
- if (!extension_loaded("simplexml")) die "skip";
+ if (!extension_loaded("snuffleupagus")) echo "skip";
+ if (!extension_loaded("simplexml")) echo "skip";
  ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
diff --git a/src/tests/disable_xxe_simplexml_oop.phpt b/src/tests/disable_xxe_simplexml_oop.phpt
index 65e4574..43c4fbf 100644
--- a/src/tests/disable_xxe_simplexml_oop.phpt
+++ b/src/tests/disable_xxe_simplexml_oop.phpt
@@ -2,8 +2,8 @@
 Disable XXE
 --SKIPIF--
 <?php
- if (!extension_loaded("snuffleupagus")) die "skip";
- if (!extension_loaded("simplexml")) die "skip";
+ if (!extension_loaded("snuffleupagus")) echo "skip";
+ if (!extension_loaded("simplexml")) echo "skip";
  ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
diff --git a/src/tests/disable_xxe_xml_parse.phpt b/src/tests/disable_xxe_xml_parse.phpt
index 2bbf0be..ca77729 100644
--- a/src/tests/disable_xxe_xml_parse.phpt
+++ b/src/tests/disable_xxe_xml_parse.phpt
@@ -1,9 +1,12 @@
 --TEST--
-Disable XXE
+Disable XXE in xml_parse
 --SKIPIF--
 <?php
- if (!extension_loaded("snuffleupagus")) die "skip";
- if (!extension_loaded("xml")) die "skip";
+ if (!extension_loaded("snuffleupagus")) {
+  echo "skip because snuffleupagus isn't loaded";
+} elseif (!extension_loaded("xml")) {
+  echo "skip because the `xml` extension isn't loaded";
+}
  ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini