Try to make anti-xxe work better

jvoisin · Sep 20, 2023 · 1532682 · 1532682
1 parent f672fa5
commit 1532682
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 71 deletions.
diff --git a/src/tests/xxe/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt
diff --git a/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt b/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Disable XXE (feature disabled)
 --SKIPIF--
-<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("dom")) print("skip"); ?>
+<?php if (!extension_loaded("snuffleupagus")) print("skip"); ?>
 <?php if (PHP_VERSION_ID < 80000) print "skip"; ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini

diff --git a/src/tests/xxe/disable_xxe_dom_php8.phpt b/src/tests/xxe/disable_xxe_dom_php8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Disable XXE (feature enabled)
 --SKIPIF--
-<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("dom")) print("skip"); ?>
+<?php if (!extension_loaded("snuffleupagus")) print("skip"); ?>
 <?php if (PHP_VERSION_ID < 80000) print "skip"; ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini

diff --git a/src/tests/xxe/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (!extension_loaded("snuffleupagus")) print("skip"); ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
 --EXTENSIONS--

diff --git a/src/tests/xxe/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (!extension_loaded("snuffleupagus")) echo "skip"; ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
 --EXTENSIONS--

diff --git a/src/tests/xxe/disable_xxe_xml_parse.phpt b/src/tests/xxe/disable_xxe_xml_parse.phpt
@@ -1,14 +1,7 @@
 --TEST--
 Disable XXE in xml_parse
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) {
-  echo "skip because snuffleupagus isn't loaded";
-} elseif (!extension_loaded("xml")) {
-  echo "skip because the `xml` extension isn't loaded";
-}
- ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (!extension_loaded("snuffleupagus")) print("skip"); ?>
 --EXTENSIONS--
 xml
 --INI--