Merge remote-tracking branch 'upstream/master'

3 files changed, 2 insertions, 69 deletions

diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt
deleted file mode 100644
index 58467f7..0000000
--- a/src/tests/xxe/disable_xxe_dom.phpt
+++ /dev/null
@@ -1,69 +0,0 @@
---TEST--
-Disable XXE
---SKIPIF--
-<?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__;
-$content = 'WARNING, external entity loaded!';
-file_put_contents('content.txt', $content);
-
-$xml = <<<EOD
-<?xml version="1.0"?>
-<!DOCTYPE root
-[
-<!ENTITY foo SYSTEM "file://$dir/content.txt">
-]>
-<test><testing>&foo;</testing></test>
-EOD;
-
-file_put_contents('content.xml', $xml);
-
-libxml_disable_entity_loader(true);
-$dom = new DOMDocument('1.0');
-$dom->loadXML($xml, LIBXML_DTDATTR|LIBXML_DTDLOAD|LIBXML_NOENT);
-printf("libxml_disable_entity to true: %s\n", $dom->getElementsByTagName('testing')->item(0)->nodeValue);
-
-libxml_disable_entity_loader(false);
-$dom = new DOMDocument('1.0');
-$dom->loadXML($xml, LIBXML_DTDATTR|LIBXML_DTDLOAD|LIBXML_NOENT);
-printf("libxml_disable_entity to false: %s\n", $dom->getElementsByTagName('testing')->item(0)->nodeValue);
-
-$xml = "<test><testing>foo</testing></test>";
-file_put_contents('content.xml', $xml);
-
-libxml_disable_entity_loader(false);
-$dom = new DOMDocument('1.0');
-$dom->loadXML($xml, LIBXML_DTDATTR|LIBXML_DTDLOAD|LIBXML_NOENT);
-printf("without xxe: %s", $dom->getElementsByTagName('testing')->item(0)->nodeValue);
-
-?>
---EXPECTF--
-Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "file://%a/content.txt" in %a/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): Failure to process entity foo in Entity, line: %d in %a/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: %d in %a/disable_xxe_dom.php on line %d
-
-Notice: Trying to get property %a in %a/disable_xxe_dom.php on line %d
-libxml_disable_entity to true: 
-
-Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "file://%a/content.txt" in %a/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): Failure to process entity foo in Entity, line: %d in %a/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: %d in %a/disable_xxe_dom.php on line %d
-
-Notice: Trying to get property %a in %a/disable_xxe_dom.php on line %d
-libxml_disable_entity to false: 
-without xxe: foo
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . "content.xml");
-unlink($dir . "content.txt");
-?>
diff --git a/src/tests/xxe/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt
index fe88d76..493f5a3 100644
--- a/src/tests/xxe/disable_xxe_dom_disabled.phpt
+++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt
@@ -2,6 +2,7 @@
 Disable XXE
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus") || !extension_loaded("dom")) print("skip"); ?>
+<?php if (PHP_VERSION_ID >= 80000) print "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
index b6dec2d..6b48bea 100644
--- a/src/tests/xxe/disable_xxe_xml_parse.phpt
+++ b/src/tests/xxe/disable_xxe_xml_parse.phpt
@@ -8,6 +8,7 @@ Disable XXE in xml_parse
   echo "skip because the `xml` extension isn't loaded";
 }
  ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
 --EXTENSIONS--
 xml
 --INI--