[ci-skip] Merge branch 'PHP-8.0'

Author: beberlei

ext/dom/characterdata.c

@@ -349,48 +349,16 @@ PHP_METHOD(DOMCharacterData, replaceData)
 PHP_METHOD(DOMCharacterData, remove)
 {
 	zval *id = ZEND_THIS;
-	xmlNodePtr children, child;
+	xmlNodePtr child;
 	dom_object *intern;
-	int stricterror;
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		RETURN_THROWS();
 	}
 
 	DOM_GET_OBJ(child, id, xmlNodePtr, intern);
 
-	if (dom_node_children_valid(child) == FAILURE) {
-		RETURN_NULL();
-	}
-
-	stricterror = dom_get_strict_error(intern->document);
-
-	if (dom_node_is_read_only(child) == SUCCESS ||
-		(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
-		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
-		RETURN_NULL();
-	}
-
-	if (!child->parent) {
-		php_dom_throw_error(NOT_FOUND_ERR, stricterror);
-		RETURN_NULL();
-	}
-
-	children = child->parent->children;
-	if (!children) {
-		php_dom_throw_error(NOT_FOUND_ERR, stricterror);
-		RETURN_NULL();
-	}
-
-	while (children) {
-		if (children == child) {
-			xmlUnlinkNode(child);
-			RETURN_NULL();
-		}
-		children = children->next;
-	}
-
-	php_dom_throw_error(NOT_FOUND_ERR, stricterror);
+	dom_child_node_remove(intern);
 	RETURN_NULL();
 }
 

ext/dom/parentnode.c

@@ -374,10 +374,6 @@ void dom_child_node_remove(dom_object *context)
 	xmlNodePtr children;
 	int stricterror;
 
-	if (dom_node_children_valid(child) == FAILURE) {
-		return;
-	}
-
 	stricterror = dom_get_strict_error(context->document);
 
 	if (dom_node_is_read_only(child) == SUCCESS ||
@@ -391,6 +387,10 @@ void dom_child_node_remove(dom_object *context)
 		return;
 	}
 
+	if (dom_node_children_valid(child->parent) == FAILURE) {
+		return;
+	}
+
 	children = child->parent->children;
 	if (!children) {
 		php_dom_throw_error(NOT_FOUND_ERR, stricterror);

ext/dom/tests/bug80600.phpt

@@ -0,0 +1,11 @@
+--TEST--
+dom: DOMChildNode::remove does not work on character data
+--FILE--
+<?php
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a><!-- foo --></a>');
+$doc->documentElement->firstChild->remove();
+echo $doc->saveXML($doc->documentElement);
+--EXPECTF--
+<a/>