From 7f93fa689b4aaf9d5e065c1a347d1a3b4ef6ae66 Mon Sep 17 00:00:00 2001
From: Mark Niebergall <mniebergall@i3logix.com>
Date: Fri, 27 Oct 2017 09:39:20 -0600
Subject: [PATCH 1/2] Added test for xml_parser_set_option for skipping white
 space and triggering invalid encoding value error

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

diff --git a/ext/xml/tests/xml_parser_set_option_variation4.phpt b/ext/xml/tests/xml_parser_set_option_variation4.phpt
new file mode 100644
index 0000000000..8a7f7fe7e2
--- /dev/null
+++ b/ext/xml/tests/xml_parser_set_option_variation4.phpt
@@ -0,0 +1,29 @@
+--TEST--
+xml_parser_free - Test setting skip whitespace and invalid encoding type
+--CREDIT--
+Mark Niebergall <mbniebergall@gmail.com>
+PHP TestFest 2017 - UPHPU
+--SKIPIF--
+<?php
+if (!extension_loaded("xml")) {
+    print "skip - XML extension not loaded";
+}
+?>
+--FILE--
+<?php
+
+$xmlParser = xml_parser_create();
+
+var_dump(xml_parser_set_option($xmlParser, XML_OPTION_SKIP_WHITE, 1));
+var_dump(xml_parser_set_option($xmlParser, XML_OPTION_SKIP_WHITE, 0));
+var_dump(xml_parser_set_option($xmlParser, XML_OPTION_TARGET_ENCODING, 'UTF-8'));
+var_dump(xml_parser_set_option($xmlParser, XML_OPTION_TARGET_ENCODING, 'Invalid Encoding'));
+
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)
+
+Warning: xml_parser_set_option(): Unsupported target encoding "Invalid Encoding" in %s on line %d
+bool(false)

From 4e0ba212491310424f9983a0654eb39f6469d94a Mon Sep 17 00:00:00 2001
From: Mark Niebergall <mniebergall@i3logix.com>
Date: Mon, 6 Nov 2017 08:54:09 -0700
Subject: [PATCH 2/2] test/xml_parser_set_option_whitespace_encoding removed
 tests that were doubled up

---
 ext/xml/tests/xml_parser_set_option_variation4.phpt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ext/xml/tests/xml_parser_set_option_variation4.phpt b/ext/xml/tests/xml_parser_set_option_variation4.phpt
index 8a7f7fe7e2..f3abadebe2 100644
--- a/ext/xml/tests/xml_parser_set_option_variation4.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation4.phpt
@@ -15,15 +15,11 @@ if (!extension_loaded("xml")) {
 $xmlParser = xml_parser_create();
 
 var_dump(xml_parser_set_option($xmlParser, XML_OPTION_SKIP_WHITE, 1));
-var_dump(xml_parser_set_option($xmlParser, XML_OPTION_SKIP_WHITE, 0));
-var_dump(xml_parser_set_option($xmlParser, XML_OPTION_TARGET_ENCODING, 'UTF-8'));
 var_dump(xml_parser_set_option($xmlParser, XML_OPTION_TARGET_ENCODING, 'Invalid Encoding'));
 
 ?>
 --EXPECTF--
 bool(true)
-bool(true)
-bool(true)
 
 Warning: xml_parser_set_option(): Unsupported target encoding "Invalid Encoding" in %s on line %d
 bool(false)