Fix more stuff

jvoisin · Sep 20, 2023 · 83d11a5 · 83d11a5
1 parent fcb2cc5
commit 83d11a5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/tests/xxe/disable_xxe_simplexml_oop_php7.phpt b/src/tests/xxe/disable_xxe_simplexml_oop_php7.phpt
@@ -2,7 +2,7 @@
 Disable XXE
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) echo "skip"; ?>
-<?php if (PHP_VERSION_ID < 80000) print "skip"; /* broken on fedora */ ?>
+<?php if print "skip"; /* broken on fedora */ ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
 --EXTENSIONS--

diff --git a/src/tests/xxe/disable_xxe_simplexml_php8.phpt b/src/tests/xxe/disable_xxe_simplexml_php8.phpt
@@ -43,7 +43,7 @@ $doc = new SimpleXMLElement($xml);
 printf("without xxe: %s", $doc->testing);
 
 ?>
---EXPECT--
+--EXPECTF--
 Deprecated: Function libxml_disable_entity_loader() is deprecated in %a/tests/xxe/disable_xxe_simplexml_php8.php on line %d
 libxml_disable_entity to true: 
 Deprecated: Function libxml_disable_entity_loader() is deprecated in %a/tests/xxe/disable_xxe_simplexml_php8.php on line %d

diff --git a/src/tests/xxe/disable_xxe_xml_parse_php7.phpt b/src/tests/xxe/disable_xxe_xml_parse_php7.phpt
@@ -2,7 +2,7 @@
 Disable XXE in xml_parse
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print("skip"); ?>
-<?php if (PHP_VERSION_ID < 80000) print "skip"; /* broken on fedora */ ?>
+<?php print "skip"; /* broken on fedora */ ?>
 --EXTENSIONS--
 xml
 --INI--

diff --git a/src/tests/xxe/disable_xxe_xml_parse_php8.phpt b/src/tests/xxe/disable_xxe_xml_parse_php8.phpt
@@ -68,7 +68,7 @@ $doc = xml_parse($parser, $xml, true);
 xml_parser_free($parser);
 
 --EXPECTF--
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %a/tests/xxe/disable_xxe_xml_parse.php on line %d
+Deprecated: Function libxml_disable_entity_loader() is deprecated in %a/tests/xxe/disable_xxe_xml_parse_php8.php on line %d
 Warning: [snuffleupagus][0.0.0.0][xxe][log] A call to libxml_disable_entity_loader was tried and nopped in %a.php on line %d
 string(4) "TEST"
 
@@ -81,7 +81,7 @@ array(0) {
 string(7) "TESTING"
 string(4) "TEST"
 
-Deprecated: Function libxml_disable_entity_loader() is deprecated in %a/tests/xxe/disable_xxe_xml_parse.php on line %d
+Deprecated: Function libxml_disable_entity_loader() is deprecated in %a/tests/xxe/disable_xxe_xml_parse_php8.php on line %d
 Warning: [snuffleupagus][0.0.0.0][xxe][log] A call to libxml_disable_entity_loader was tried and nopped in %a.php on line %d
 string(4) "TEST"