From 3c9a09c2000b603cdde7c444dccb9b910cb0b9c5 Mon Sep 17 00:00:00 2001
From: Symeon Charalabides <symeon@systasis.com>
Date: Sat, 25 Apr 2020 01:04:35 +0100
Subject: [PATCH 1/3] Test xml_error_string() and xml_get_error_code()

---
 ext/xml/tests/xml_error_string_basic.phpt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 ext/xml/tests/xml_error_string_basic.phpt

diff --git a/ext/xml/tests/xml_error_string_basic.phpt b/ext/xml/tests/xml_error_string_basic.phpt
new file mode 100644
index 0000000000000..f75898d23e982
--- /dev/null
+++ b/ext/xml/tests/xml_error_string_basic.phpt
@@ -0,0 +1,23 @@
+--TEST--
+xml_parser_get_option() - Test parameter not set
+--SKIPIF--
+<?php
+if (!extension_loaded('xml')) {
+    exit('Skip - XML extension not loaded');
+}
+?>
+--FILE--
+<?php
+
+$xml = '<?xml?>';
+
+$xml_parser = xml_parser_create();
+
+if (!xml_parse($xml_parser, $xml, true)) {
+    var_dump(xml_get_error_code($xml_parser));
+    var_dump(xml_error_string(xml_get_error_code($xml_parser)));
+}
+?>
+--EXPECTF--
+int(64)
+string(17) "Reserved XML Name"

From 372f4d9bd64e2450abf1b007edc7270a6f7b8c9b Mon Sep 17 00:00:00 2001
From: Symeon Charalabides <symeon@systasis.com>
Date: Sat, 25 Apr 2020 01:21:25 +0100
Subject: [PATCH 2/3] Test xml_error_string() and xml_get_error_code()

---
 ext/xml/tests/xml_error_string_basic.phpt | 31 +++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/ext/xml/tests/xml_error_string_basic.phpt b/ext/xml/tests/xml_error_string_basic.phpt
index f75898d23e982..434f68997a416 100644
--- a/ext/xml/tests/xml_error_string_basic.phpt
+++ b/ext/xml/tests/xml_error_string_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-xml_parser_get_option() - Test parameter not set
+xml_error_string() - Basic test on 5 error codes
 --SKIPIF--
 <?php
 if (!extension_loaded('xml')) {
@@ -8,16 +8,31 @@ if (!extension_loaded('xml')) {
 ?>
 --FILE--
 <?php
+$xmls = array(
+    '<?xml version="1.0"?><element>',
+    '<?xml>',
+    '<?xml version="dummy">',
+    '<?xml?>',
+    '<?xml version="1.0"?><elem></element>',
+);
 
-$xml = '<?xml?>';
-
-$xml_parser = xml_parser_create();
-
-if (!xml_parse($xml_parser, $xml, true)) {
-    var_dump(xml_get_error_code($xml_parser));
-    var_dump(xml_error_string(xml_get_error_code($xml_parser)));
+foreach ($xmls as $xml) {
+    $xml_parser = xml_parser_create();
+    if (!xml_parse($xml_parser, $xml, true)) {
+        var_dump(xml_get_error_code($xml_parser));
+        var_dump(xml_error_string(xml_get_error_code($xml_parser)));
+    }
+    xml_parser_free($xml_parser);
 }
 ?>
 --EXPECTF--
+int(5)
+string(20) "Invalid document end"
+int(47)
+string(35) "Processing Instruction not finished"
+int(57)
+string(28) "XML declaration not finished"
 int(64)
 string(17) "Reserved XML Name"
+int(76)
+string(14) "Mismatched tag"

From d73338e330837ccabab850014dd8b744441d6257 Mon Sep 17 00:00:00 2001
From: Symeon Charalabides <symeon@systasis.com>
Date: Sat, 25 Apr 2020 01:24:24 +0100
Subject: [PATCH 3/3] EXPECT rather than EXPECTF (presumably faster)

---
 ext/xml/tests/xml_error_string_basic.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/xml/tests/xml_error_string_basic.phpt b/ext/xml/tests/xml_error_string_basic.phpt
index 434f68997a416..e72fa68bd1ad9 100644
--- a/ext/xml/tests/xml_error_string_basic.phpt
+++ b/ext/xml/tests/xml_error_string_basic.phpt
@@ -25,7 +25,7 @@ foreach ($xmls as $xml) {
     xml_parser_free($xml_parser);
 }
 ?>
---EXPECTF--
+--EXPECT--
 int(5)
 string(20) "Invalid document end"
 int(47)