From eb570f29daa42fd8b90ecfff75382846e51b3a15 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sat, 10 Dec 2022 12:00:36 +0100
Subject: Add support for PHP8.2

---
 src/tests/xxe/disable_xxe_dom_disabled_php8.phpt | 10 ++++------
 src/tests/xxe/disable_xxe_dom_php8.phpt          | 13 ++++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/tests/xxe')

diff --git a/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt b/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt
index 01e3349..a78fe2d 100644
--- a/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt
+++ b/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt
@@ -10,6 +10,10 @@ dom
 --FILE--
 <?php 
 $dir = __DIR__;
+// Just in case
+@unlink($dir . "/content.xml");
+@unlink($dir . "/content.txt");
+
 $content = '<content>WARNING, external entity loaded!</content>';
 file_put_contents($dir . '/content.txt', $content);
 
@@ -49,9 +53,3 @@ default setting with LIBXML_NOENT: WARNING, external entity loaded!
 default setting without LIBXML_NOENT: 
 disabled entity loader with LIBXML_NOENT: WARNING, external entity loaded!
 disabled entity loader without LIBXML_NOENT:
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . "/content.xml");
-unlink($dir . "/content.txt");
-?>
diff --git a/src/tests/xxe/disable_xxe_dom_php8.phpt b/src/tests/xxe/disable_xxe_dom_php8.phpt
index 485828f..133f87e 100644
--- a/src/tests/xxe/disable_xxe_dom_php8.phpt
+++ b/src/tests/xxe/disable_xxe_dom_php8.phpt
@@ -10,6 +10,11 @@ dom
 --FILE--
 <?php 
 $dir = __DIR__;
+
+// Just in case
+@unlink($dir . "/content.xml");
+@unlink($dir . "/content.txt");
+
 $content = '<content>WARNING, external entity loaded!</content>';
 file_put_contents($dir . '/content.txt', $content);
 
@@ -48,12 +53,6 @@ printf("disabled entity loader without LIBXML_NOENT: %s\n", $dom->getElementsByT
 default setting with LIBXML_NOENT: WARNING, external entity loaded!
 default setting without LIBXML_NOENT: 
 
-Warning: [snuffleupagus][0.0.0.0][xxe][log] A call to libxml_set_external_entity_loader was tried and nopped in %a.php on line 26
+Warning: [snuffleupagus][0.0.0.0][xxe][log] A call to libxml_set_external_entity_loader was tried and nopped in %a.php on line %d
 disabled entity loader with LIBXML_NOENT: WARNING, external entity loaded!
 disabled entity loader without LIBXML_NOENT:
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . "/content.xml");
-unlink($dir . "/content.txt");
-?>
-- 
cgit v1.3