Test and handle manual creation better

Author: nielsdos

ext/dom/inner_html_mixin.c

@@ -351,9 +351,12 @@ zend_result dom_element_inner_html_write(dom_object *obj, zval *newval)
 		return FAILURE;
 	}
 
-	xmlNodePtr template_content = php_dom_retrieve_templated_content(php_dom_get_private_data(obj), context_node);
-	if (template_content != NULL) {
-		context_node = template_content;
+	if (php_dom_ns_is_fast(context_node, php_dom_ns_is_html_magic_token) && xmlStrEqual(context_node->name, BAD_CAST "template")) {
+		context_node = php_dom_ensure_templated_content(php_dom_get_private_data(obj), context_node);
+		if (context_node == NULL) {
+			xmlFreeNode(fragment);
+			return FAILURE;
+		}
 	}
 
 	/* We skip the steps involving the template element as context node since we don't do special handling for that. */

ext/dom/private_data.c

@@ -107,6 +107,19 @@ xmlNodePtr php_dom_retrieve_templated_content(php_dom_private_data *private_data
 	return zend_hash_index_find_ptr(private_data->template_fragments, dom_mangle_pointer_for_key(template_node));
 }
 
+xmlNodePtr php_dom_ensure_templated_content(php_dom_private_data *private_data, xmlNodePtr template_node)
+{
+	xmlNodePtr result = php_dom_retrieve_templated_content(private_data, template_node);
+	if (result == NULL) {
+		result = xmlNewDocFragment(template_node->doc);
+		if (EXPECTED(result != NULL)) {
+			result->parent = template_node;
+			php_dom_add_templated_content(private_data, template_node, result);
+		}
+	}
+	return result;
+}
+
 void php_dom_remove_templated_content(php_dom_private_data *private_data, const xmlNode *template_node)
 {
 	if (private_data->template_fragments != NULL) {

ext/dom/private_data.h

@@ -42,6 +42,7 @@ PHP_DOM_EXPORT php_dom_private_data *php_dom_private_data_create(void);
 void php_dom_private_data_destroy(php_dom_private_data *data);
 void php_dom_add_templated_content(php_dom_private_data *private_data, const xmlNode *template_node, xmlNodePtr fragment);
 xmlNodePtr php_dom_retrieve_templated_content(php_dom_private_data *private_data, const xmlNode *template_node);
+xmlNodePtr php_dom_ensure_templated_content(php_dom_private_data *private_data, xmlNodePtr template_node);
 void php_dom_remove_templated_content(php_dom_private_data *private_data, const xmlNode *template_node);
 
 #endif

ext/dom/tests/modern/common/template_manual.phpt

@@ -0,0 +1,36 @@
+--TEST--
+<template> element manual creation
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+echo "=== After creation ===\n";
+
+$dom = Dom\HTMLDocument::createEmpty();
+$template = $dom->appendChild($dom->createElement("template"));
+var_dump($template->innerHTML);
+echo $dom->saveXML(), "\n";
+echo $dom->saveHTML(), "\n";
+
+echo "=== After setting content ===\n";
+
+$template->innerHTML = "<p>hello</template></p>";
+var_dump($template->innerHTML);
+var_dump($template->firstChild);
+echo $dom->saveXML(), "\n";
+echo $dom->saveHTML(), "\n";
+
+?>
+--EXPECT--
+=== After creation ===
+string(0) ""
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<template xmlns="http://www.w3.org/1999/xhtml"></template>
+<template></template>
+=== After setting content ===
+string(12) "<p>hello</p>"
+NULL
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<template xmlns="http://www.w3.org/1999/xhtml"><p>hello</p></template>
+<template><p>hello</p></template>