From 98ed3be52fa15521ef405fc8029176279d80778e Mon Sep 17 00:00:00 2001
From: Julien Voisin
Date: Thu, 24 Dec 2020 10:32:28 +0000
Subject: Add PHP8 support

---
 src/tests/xxe/disable_xxe_dom.phpt               |  75 ----------------
 src/tests/xxe/disable_xxe_dom_disabled_php8.phpt |  60 -------------
 src/tests/xxe/disable_xxe_xml_parse_php8.phpt    | 106 -----------------------
 3 files changed, 241 deletions(-)
 delete mode 100644 src/tests/xxe/disable_xxe_dom.phpt
 delete mode 100644 src/tests/xxe/disable_xxe_dom_disabled_php8.phpt
 delete mode 100644 src/tests/xxe/disable_xxe_xml_parse_php8.phpt

(limited to 'src/tests/xxe')

diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt
deleted file mode 100644
index 99ed572..0000000
--- a/src/tests/xxe/disable_xxe_dom.phpt
+++ /dev/null
@@ -1,75 +0,0 @@
---TEST--
-Disable XXE, in php8
---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.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);
-
-?>
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . "content.xml");
-unlink($dir . "content.txt");
-?>
---EXPECTF--
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %s/tests/xxe/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "file://%s/tests/xxe/content.txt" in /var/www/html/snuffleupagus/src/tests/xxe/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): Failure to process entity foo in Entity, line: 6 in %s/tests/xxe/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: 6 in %s/tests/xxe/disable_xxe_dom.php on line %d
-
-Warning: Attempt to read property "nodeValue" on null in %s/tests/xxe/disable_xxe_dom.php on line %d
-libxml_disable_entity to true: 
-
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %s/tests/xxe/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "file://%s/tests/xxe/content.txt" in /var/www/html/snuffleupagus/src/tests/xxe/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): Failure to process entity foo in Entity, line: 6 in %s/tests/xxe/disable_xxe_dom.php on line %d
-
-Warning: DOMDocument::loadXML(): Entity 'foo' not defined in Entity, line: 6 in %s/tests/xxe/disable_xxe_dom.php on line %d
-
-Warning: Attempt to read property "nodeValue" on null in %s/tests/xxe/disable_xxe_dom.php on line %d
-libxml_disable_entity to false: 
-
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %s/tests/xxe/disable_xxe_dom.php on line %d
diff --git a/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt b/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt
deleted file mode 100644
index c0db7fc..0000000
--- a/src/tests/xxe/disable_xxe_dom_disabled_php8.phpt
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-Disable XXE in php8
---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--
-dom
---FILE--
-<?php 
-$dir = __DIR__;
-$content = '<content>WARNING, external entity loaded!</content>';
-file_put_contents($dir . '/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($dir . '/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);
-
-?>
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . "/content.xml");
-unlink($dir . "/content.txt");
-?>
---EXPECTF-- 
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %s/tests/xxe/disable_xxe_dom_disabled.php on line %d
-libxml_disable_entity to true: WARNING, external entity loaded!
-
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %s/tests/xxe/disable_xxe_dom_disabled.php on line %d
-libxml_disable_entity to false: WARNING, external entity loaded!
-
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %s/tests/xxe/disable_xxe_dom_disabled.php on line %d
-
diff --git a/src/tests/xxe/disable_xxe_xml_parse_php8.phpt b/src/tests/xxe/disable_xxe_xml_parse_php8.phpt
deleted file mode 100644
index 4a8622a..0000000
--- a/src/tests/xxe/disable_xxe_xml_parse_php8.phpt
+++ /dev/null
@@ -1,106 +0,0 @@
---TEST--
-Disable XXE in xml_parse, in php8
---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"; ?>
---EXTENSIONS--
-xml
---INI--
-sp.configuration_file={PWD}/config/disable_xxe.ini
---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);
-
-function create_parser() {
-	$parser = xml_parser_create();
-	xml_set_element_handler(
-		$parser,
-		function($parser, $name, array $attributes) {
-			var_dump($name);
-			echo "\n";
-			var_dump($attributes);
-		},
-		function($parser, $name) {
-			var_dump($name);
-		}
-	);
-
-	xml_set_character_data_handler(
-		$parser,
-		function ($parser, $text){
-			echo 'text' . $text;
-		}
-	);
-
-	return $parser;
-}
-
-libxml_disable_entity_loader(true);
-$parser = create_parser();
-$doc = xml_parse($parser, $xml, true);
-xml_parser_free($parser);
-
-libxml_disable_entity_loader(false);
-$parser = create_parser();
-$doc = xml_parse($parser, $xml, true);
-xml_parser_free($parser);
-
-$xml = "<test><testing>foo</testing></test>";
-file_put_contents('content.xml', $xml);
-$parser = create_parser();
-$doc = xml_parse($parser, $xml, true);
-xml_parser_free($parser);
-
---EXPECTF--
-	Deprecated: Function libxml_disable_entity_loader() is deprecated in %s/tests/xxe/disable_xxe_xml_parse.php on line 41
-string(4) "TEST"
-
-array(0) {
-}
-string(7) "TESTING"
-
-array(0) {
-}
-string(7) "TESTING"
-string(4) "TEST"
-
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %s/tests/xxe/disable_xxe_xml_parse.php on line 46
-string(4) "TEST"
-
-array(0) {
-}
-string(7) "TESTING"
-
-array(0) {
-}
-string(7) "TESTING"
-string(4) "TEST"
-string(4) "TEST"
-
-array(0) {
-}
-string(7) "TESTING"
-
-array(0) {
-}
-textfoostring(7) "TESTING"
-
-- 
cgit v1.3