From 8e4f1fe359e847c4826589c8ecd7c2803b32870a Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Mon, 29 Apr 2024 19:58:44 +0200
Subject: [PATCH] Use fast ZPP in very commonly used DOM functions

Start using fast ZPP in very commonly used DOM functions, and also try
to unify some branches by using RETURN_BOOL where appropriate.
---
 ext/dom/document.c | 19 +++++++++----------
 ext/dom/node.c     | 46 +++++++++++-----------------------------------
 2 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/ext/dom/document.c b/ext/dom/document.c
index f6a778f086dd..e432d27959a1 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -525,19 +525,17 @@ PHP_METHOD(DOMDocument, createDocumentFragment)
 */
 PHP_METHOD(DOMDocument, createTextNode)
 {
-	zval *id;
 	xmlNode *node;
 	xmlDocPtr docp;
 	size_t value_len;
 	dom_object *intern;
 	char *value;
 
-	id = ZEND_THIS;
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &value, &value_len) == FAILURE) {
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STRING(value, value_len)
+	ZEND_PARSE_PARAMETERS_END();
 
-	DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
+	DOM_GET_OBJ(docp, ZEND_THIS, xmlDocPtr, intern);
 
 	node = xmlNewDocText(docp, BAD_CAST value);
 	if (!node) {
@@ -899,11 +897,12 @@ PHP_METHOD(DOM_Document, createElementNS)
 {
 	xmlDocPtr docp;
 	dom_object *intern;
-	zend_string *name = NULL, *uri;
+	zend_string *name, *uri;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S!S", &uri, &name) == FAILURE) {
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_STR_OR_NULL(uri)
+		Z_PARAM_STR(name)
+	ZEND_PARSE_PARAMETERS_END();
 
 	DOM_GET_OBJ(docp, ZEND_THIS, xmlDocPtr, intern);
 
diff --git a/ext/dom/node.c b/ext/dom/node.c
index 86585c085deb..fca91c8f9ca6 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -1218,16 +1218,15 @@ PHP_METHOD(DOM_Node, replaceChild)
 */
 static void dom_node_remove_child(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *node_ce)
 {
-	zval *id, *node;
+	zval *node;
 	xmlNodePtr child, nodep;
 	dom_object *intern, *childobj;
 
-	id = ZEND_THIS;
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &node, node_ce) == FAILURE) {
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_OBJECT_OF_CLASS(node, node_ce)
+	ZEND_PARSE_PARAMETERS_END();
 
-	DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
+	DOM_GET_OBJ(nodep, ZEND_THIS, xmlNodePtr, intern);
 
 	if (!dom_node_children_valid(nodep)) {
 		RETURN_FALSE;
@@ -1420,26 +1419,14 @@ PHP_METHOD(DOM_Node, appendChild)
 */
 PHP_METHOD(DOMNode, hasChildNodes)
 {
-	zval *id;
 	xmlNode *nodep;
 	dom_object *intern;
 
-	id = ZEND_THIS;
-	if (zend_parse_parameters_none() == FAILURE) {
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_NONE();
 
-	DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
-
-	if (!dom_node_children_valid(nodep)) {
-		RETURN_FALSE;
-	}
+	DOM_GET_OBJ(nodep, ZEND_THIS, xmlNodePtr, intern);
 
-	if (nodep->children) {
-		RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
+	RETURN_BOOL(dom_node_children_valid(nodep) && nodep->children != NULL);
 }
 /* }}} end dom_node_has_child_nodes */
 
@@ -1552,25 +1539,14 @@ Since: DOM Level 2
 */
 PHP_METHOD(DOMNode, hasAttributes)
 {
-	zval *id;
 	xmlNode *nodep;
 	dom_object *intern;
 
-	id = ZEND_THIS;
-	if (zend_parse_parameters_none() == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
+	ZEND_PARSE_PARAMETERS_NONE();
 
-	if (nodep->type != XML_ELEMENT_NODE)
-		RETURN_FALSE;
+	DOM_GET_OBJ(nodep, ZEND_THIS, xmlNodePtr, intern);
 
-	if (nodep->properties) {
-		RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
+	RETURN_BOOL(nodep->type == XML_ELEMENT_NODE && nodep->properties != NULL);
 }
 /* }}} end dom_node_has_attributes */