Merge remote-tracking branch 'upstream/master'

5 files changed, 16 insertions, 19 deletions

diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt
index e1459e3..58467f7 100644
--- a/src/tests/xxe/disable_xxe_dom.phpt
+++ b/src/tests/xxe/disable_xxe_dom.phpt
@@ -1,15 +1,11 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) {
-  echo "skip"; 
-} elseif (!extension_loaded("dom")) {
-        echo "skip";
-}
- ?>
+<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("dom")) print("skip"); ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
+--EXTENSIONS--
+dom
 --FILE--
 <?php 
 $dir = __DIR__;
diff --git a/src/tests/xxe/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt
index a791ebc..fe88d76 100644
--- a/src/tests/xxe/disable_xxe_dom_disabled.phpt
+++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt
@@ -1,12 +1,11 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) echo "skip";
- if (!extension_loaded("dom")) echo "skip";
- ?>
+<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("dom")) print("skip"); ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
+--EXTENSIONS--
+dom
 --FILE--
 <?php 
 $dir = __DIR__;
diff --git a/src/tests/xxe/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt
index 88396c0..1d3ef4c 100644
--- a/src/tests/xxe/disable_xxe_simplexml.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) echo "skip";
- if (!extension_loaded("simplexml")) echo "skip";
- ?>
+<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml") || getenv('TRAVIS')) print("skip"); ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
+--EXTENSIONS--
+simplexml
+--XFAIL--
 --FILE--
 <?php 
 $dir = __DIR__;
diff --git a/src/tests/xxe/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
index 43c4fbf..e101337 100644
--- a/src/tests/xxe/disable_xxe_simplexml_oop.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) echo "skip";
- if (!extension_loaded("simplexml")) echo "skip";
- ?>
+<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml") || getenv('TRAVIS')) print("skip"); ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
+--EXTENSIONS--
+simplexml
+--XFAIL--
 --FILE--
 <?php 
 $dir = __DIR__;
diff --git a/src/tests/xxe/disable_xxe_xml_parse.phpt b/src/tests/xxe/disable_xxe_xml_parse.phpt
index ca77729..b6dec2d 100644
--- a/src/tests/xxe/disable_xxe_xml_parse.phpt
+++ b/src/tests/xxe/disable_xxe_xml_parse.phpt
@@ -8,6 +8,8 @@ Disable XXE in xml_parse
   echo "skip because the `xml` extension isn't loaded";
 }
  ?>
+--EXTENSIONS--
+xml
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --FILE--