From e8c97f3f16351b750c3395383269d6d206c7048d Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Thu, 14 May 2020 00:38:57 +0200
Subject: Fix the testsuite under php7.4

---
 src/tests/xxe/disable_xxe_dom.phpt           | 12 +++---------
 src/tests/xxe/disable_xxe_dom_disabled.phpt  |  9 +++------
 src/tests/xxe/disable_xxe_simplexml.phpt     |  9 +++------
 src/tests/xxe/disable_xxe_simplexml_oop.phpt |  9 +++------
 4 files changed, 12 insertions(+), 27 deletions(-)

(limited to 'src/tests')

diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt
index 2f45f66..58467f7 100644
--- a/src/tests/xxe/disable_xxe_dom.phpt
+++ b/src/tests/xxe/disable_xxe_dom.phpt
@@ -1,17 +1,11 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) {
-  echo "skip"; 
-} elseif (!extension_loaded("dom")) {
-	echo "skip";
-}
- ?>
---EXTENSIONS--
-dom
+<?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 59526d2..fe88d76 100644
--- a/src/tests/xxe/disable_xxe_dom_disabled.phpt
+++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt
@@ -1,14 +1,11 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) echo "skip";
- if (!extension_loaded("dom")) echo "skip";
- ?>
---extensions--
-dom
+<?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 35d79de..bbd9336 100644
--- a/src/tests/xxe/disable_xxe_simplexml.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml.phpt
@@ -1,14 +1,11 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) echo "skip";
- if (!extension_loaded("simplexml")) echo "skip";
- ?>
---EXTENSIONS--
-xml
+<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
+--EXTENSIONS--
+simplexml
 --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 33c3bb5..e11e565 100644
--- a/src/tests/xxe/disable_xxe_simplexml_oop.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
@@ -1,14 +1,11 @@
 --TEST--
 Disable XXE
 --SKIPIF--
-<?php
- if (!extension_loaded("snuffleupagus")) echo "skip";
- if (!extension_loaded("simplexml")) echo "skip";
- ?>
---EXTENSIONS--
-xml
+<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php 
 $dir = __DIR__;
-- 
cgit v1.3