Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Fix GH-11630: proc_nice_basic.phpt only works at certain nice levels Fix GH-11629: bug77020.phpt tries to send mail Fix GH-11625: DOMElement::replaceWith() doesn't replace node with DOMDocumentFragment but just deletes node or causes wrapping <></> depending on libxml2 version
php · Jul 10, 2023 · 57ff1c3 · 57ff1c3
2 parents 3ee2ade + c408a8b
commit 57ff1c3
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 8 deletions.
diff --git a/NEWS b/NEWS
@@ -21,6 +21,11 @@ PHP                                                                        NEWS
 - Date:
   . Fixed bug GH-11368 (Date modify returns invalid datetime). (Derick)
 
+- DOM:
+  . Fixed bug GH-11625 (DOMElement::replaceWith() doesn't replace node with
+    DOMDocumentFragment but just deletes node or causes wrapping <></>
+    depending on libxml2 version). (nielsdos)
+
 - Fileinfo:
   . Fixed bug GH-11298 (finfo returns wrong mime type for xz files). (Anatol)
 

diff --git a/ext/dom/parentnode.c b/ext/dom/parentnode.c
@@ -183,7 +183,15 @@ xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNod
 					goto err;
 				}
 
-				if (newNode->parent != NULL) {
+				if (newNode->type == XML_DOCUMENT_FRAG_NODE) {
+					/* Unpack document fragment nodes, the behaviour differs for different libxml2 versions. */
+					newNode = newNode->children;
+					if (UNEXPECTED(newNode == NULL)) {
+						/* No nodes to add, nothing to do here */
+						continue;
+					}
+					xmlUnlinkNode(newNode);
+				} else if (newNode->parent != NULL) {
 					xmlUnlinkNode(newNode);
 				}
 
@@ -370,7 +378,7 @@ static void dom_pre_insert(xmlNodePtr insertion_point, xmlNodePtr parentNode, xm
 			insertion_point->prev->next = newchild;
 			newchild->prev = insertion_point->prev;
 		}
-		insertion_point->prev = newchild;
+		insertion_point->prev = fragment->last;
 		if (parentNode->children == insertion_point) {
 			parentNode->children = newchild;
 		}
@@ -555,14 +563,14 @@ void dom_child_replace_with(dom_object *context, zval *nodes, int nodesc)
 	xmlNodePtr newchild = fragment->children;
 	xmlDocPtr doc = parentNode->doc;
 
+	/* Unlink and free it unless it became a part of the fragment. */
+	if (child->parent != fragment) {
+		xmlUnlinkNode(child);
+	}
+
 	if (newchild) {
 		xmlNodePtr last = fragment->last;
 
-		/* Unlink and free it unless it became a part of the fragment. */
-		if (child->parent != fragment) {
-			xmlUnlinkNode(child);
-		}
-
 		dom_pre_insert(insertion_point, parentNode, newchild, fragment);
 
 		dom_fragment_assign_parent_node(parentNode, fragment);

diff --git a/ext/dom/tests/gh11625.phpt b/ext/dom/tests/gh11625.phpt
@@ -0,0 +1,72 @@
+--TEST--
+GH-11625 (DOMElement::replaceWith() doesn't replace node with DOMDocumentFragment but just deletes node or causes wrapping <></> depending on libxml2 version)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+function test($mutator) {
+    $html = <<<XML
+    <body>
+        <div></div><div></div>
+    </body>
+    XML;
+
+    $dom = new DOMDocument();
+    $dom->loadXML($html);
+
+    $divs = iterator_to_array($dom->getElementsByTagName('div')->getIterator());
+    $i = 0;
+    foreach ($divs as $div) {
+        $mutator($dom, $div, $i);
+        echo $dom->saveHTML();
+        $i++;
+    }
+}
+
+echo "--- Single replacement ---\n";
+
+test(function($dom, $div, $i) {
+    $fragment = $dom->createDocumentFragment();
+    $fragment->appendXML("<p>Hi $i!</p>");
+    $div->replaceWith($fragment);
+});
+
+echo "--- Multiple replacement ---\n";
+
+test(function($dom, $div, $i) {
+    $fragment = $dom->createDocumentFragment();
+    $fragment->appendXML("<p>Hi $i!</p>");
+    $div->replaceWith($fragment, $dom->createElement('x'), "hello");
+});
+
+echo "--- Empty fragment replacement ---\n";
+
+test(function($dom, $div, $i) {
+    $fragment = $dom->createDocumentFragment();
+    $div->replaceWith($fragment);
+});
+
+?>
+--EXPECT--
+--- Single replacement ---
+<body>
+    <p>Hi 0!</p><div></div>
+</body>
+<body>
+    <p>Hi 0!</p><p>Hi 1!</p>
+</body>
+--- Multiple replacement ---
+<body>
+    <p>Hi 0!</p><x></x>hello<div></div>
+</body>
+<body>
+    <p>Hi 0!</p><x></x>hello<p>Hi 1!</p><x></x>hello
+</body>
+--- Empty fragment replacement ---
+<body>
+    <div></div>
+</body>
+<body>
+
+</body>
diff --git a/ext/imap/tests/bug77020.phpt b/ext/imap/tests/bug77020.phpt
@@ -2,8 +2,13 @@
 Bug #77020 (null pointer dereference in imap_mail)
 --EXTENSIONS--
 imap
+--INI--
+sendmail_path="echo >/dev/null"
 --FILE--
 <?php
+// For Windows, set it to a string of length HOST_NAME_LEN (256) so the mail is not actually sent
+ini_set("SMTP", str_repeat("A", 256));
+
 @imap_mail('1', 1, NULL);
 echo 'done'
 ?>

diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt
@@ -30,7 +30,9 @@ if ($exit_code !== 0) {
     $niceBefore = getNice($pid);
     proc_nice($delta);
     $niceAfter = getNice($pid);
-    var_dump($niceBefore == ($niceAfter - $delta));
+    // The maximum niceness level is 19, if the process is already running at a high niceness, it cannot be increased.
+    // Decreasing is only possible for superusers.
+    var_dump(min($niceBefore + $delta, 19) == $niceAfter);
 ?>
 --EXPECT--
 bool(true)