Make encoding explicit in XMLDocument

Author: nielsdos

ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_01.phpt

@@ -22,7 +22,7 @@ echo $html->saveHTML(), "\n";
 
 ?>
 --EXPECT--
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="some:ns" xmlns:bar="another:ns" xmlns:foo="http://foo/" foo:bar="value"><child xmlns="some:ns2"/></container>
 --- After import into HTML ---
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_02.phpt

@@ -21,7 +21,7 @@ echo $html->saveHTML(), "\n";
 
 ?>
 --EXPECT--
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>

ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_03.phpt

@@ -21,7 +21,7 @@ echo $html->saveHTML(), "\n";
 
 ?>
 --EXPECT--
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>

ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_04.phpt

@@ -21,7 +21,7 @@ echo $html->saveHTML(), "\n";
 
 ?>
 --EXPECT--
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>

ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_05.phpt

@@ -21,7 +21,7 @@ echo $html->saveHTML(), "\n";
 
 ?>
 --EXPECT--
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>

ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_06.phpt

@@ -21,7 +21,7 @@ echo $html->saveHTML(), "\n";
 
 ?>
 --EXPECT--
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>

ext/dom/tests/modern/xml/XMLDocument_createFromFile_override_encoding.phpt

@@ -25,6 +25,6 @@ var_dump($dom->encoding);
 --EXPECT--
 DOM\XMLDocument::createFromFile(): Argument #3 ($overrideEncoding) must be a valid document encoding
 string(2) "é"
-NULL
+string(5) "UTF-8"
 string(4) "é"
-NULL
+string(12) "Windows-1252"

ext/dom/tests/modern/xml/XMLDocument_createFromString_override_encoding.phpt

@@ -25,6 +25,6 @@ var_dump($dom->encoding);
 --EXPECT--
 DOM\XMLDocument::createFromString(): Argument #3 ($overrideEncoding) must be a valid document encoding
 string(2) "é"
-NULL
+string(5) "UTF-8"
 string(4) "é"
-NULL
+string(12) "Windows-1252"

ext/dom/tests/modern/xml/XMLDocument_fromFile_04.phpt

@@ -10,7 +10,7 @@ echo $dom->saveXML();
 
 ?>
 --EXPECT--
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <books>
  <book>
   <title>The Grapes of Wrath</title>

ext/dom/tests/modern/xml/XMLDocument_fromString_02.phpt

@@ -10,6 +10,6 @@ var_dump($dom->saveXMLFile("php://stdout"));
 
 ?>
 --EXPECT--
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <container/>
-int(35)
+int(52)

ext/dom/tests/modern/xml/XMLDocument_node_ownerDocument_for_XML.phpt

@@ -15,9 +15,9 @@ var_dump($element->ownerDocument);
 --EXPECTF--
 object(DOM\XMLDocument)#1 (37) {
   ["encoding"]=>
-  NULL
+  string(5) "UTF-8"
   ["xmlEncoding"]=>
-  NULL
+  string(5) "UTF-8"
   ["standalone"]=>
   bool(false)
   ["xmlStandalone"]=>

ext/dom/xml_document.c

@@ -228,6 +228,11 @@ static void load_from_helper(INTERNAL_FUNCTION_PARAMETERS, int mode)
 		}
 		RETURN_THROWS();
 	}
+	if (override_encoding) {
+		lxml_doc->encoding = xmlStrdup((const xmlChar *) override_encoding);
+	} else {
+		lxml_doc->encoding = xmlStrdup((const xmlChar *) "UTF-8");
+	}
 	dom_object *intern = php_dom_instantiate_object_helper(
 		return_value,
 		dom_xml_document_class_entry,