From 3e2b6545b623f0ba1b016c03b43d999cfcbc8d2f Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 1 May 2020 19:50:56 +0200
Subject: Make the testsuite work on php7.4

Before php7.4, it seems that the curl module was loaded by default, but since
it's no the case anymore, it has to be manually specified in the testsuite.
Interestingly, Php's testsuite mechanism is running snippets to determine some
runtime parameters like the extension directory. Unfortunately,it tries to run
them with Snuffleupagus loaded, resulting in an error, since no configuration
file is passed.
---
 src/tests/xxe/disable_xxe_dom.phpt           | 2 ++
 src/tests/xxe/disable_xxe_dom_disabled.phpt  | 2 ++
 src/tests/xxe/disable_xxe_simplexml.phpt     | 2 ++
 src/tests/xxe/disable_xxe_simplexml_oop.phpt | 2 ++
 src/tests/xxe/disable_xxe_xml_parse.phpt     | 2 ++
 5 files changed, 10 insertions(+)

(limited to 'src/tests/xxe')

diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt
index e1459e3..2f45f66 100644
--- a/src/tests/xxe/disable_xxe_dom.phpt
+++ b/src/tests/xxe/disable_xxe_dom.phpt
@@ -8,6 +8,8 @@ Disable XXE
 	echo "skip";
 }
  ?>
+--EXTENSIONS--
+dom
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --FILE--
diff --git a/src/tests/xxe/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt
index a791ebc..59526d2 100644
--- a/src/tests/xxe/disable_xxe_dom_disabled.phpt
+++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt
@@ -5,6 +5,8 @@ Disable XXE
  if (!extension_loaded("snuffleupagus")) echo "skip";
  if (!extension_loaded("dom")) echo "skip";
  ?>
+--extensions--
+dom
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
 --FILE--
diff --git a/src/tests/xxe/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt
index 88396c0..35d79de 100644
--- a/src/tests/xxe/disable_xxe_simplexml.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml.phpt
@@ -5,6 +5,8 @@ Disable XXE
  if (!extension_loaded("snuffleupagus")) echo "skip";
  if (!extension_loaded("simplexml")) echo "skip";
  ?>
+--EXTENSIONS--
+xml
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --FILE--
diff --git a/src/tests/xxe/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
index 43c4fbf..33c3bb5 100644
--- a/src/tests/xxe/disable_xxe_simplexml_oop.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
@@ -5,6 +5,8 @@ Disable XXE
  if (!extension_loaded("snuffleupagus")) echo "skip";
  if (!extension_loaded("simplexml")) echo "skip";
  ?>
+--EXTENSIONS--
+xml
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --FILE--
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--
-- 
cgit v1.3