Merge branch 'PHP-8.4'

* PHP-8.4: NEWS for GH-17485 Cherry-pick lexbor/lexbor@e58e1e8c Cherry-pick lexbor/lexbor@ae97abfb Cherry-pick lexbor/lexbor@e39083b0
php · Jan 17, 2025 · 0bed3d5 · 0bed3d5
2 parents 5471f11 + 0b04061
commit 0bed3d5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/ext/dom/lexbor/lexbor/html/tag.h b/ext/dom/lexbor/lexbor/html/tag.h
@@ -82,7 +82,6 @@ lxb_html_tag_is_void(lxb_tag_id_t tag_id)
         case LXB_TAG_INPUT:
         case LXB_TAG_LINK:
         case LXB_TAG_META:
-        case LXB_TAG_PARAM:
         case LXB_TAG_SOURCE:
         case LXB_TAG_TRACK:
         case LXB_TAG_WBR:

diff --git a/ext/dom/lexbor/lexbor/html/tree.h b/ext/dom/lexbor/lexbor/html/tree.h
@@ -333,7 +333,7 @@ lxb_html_tree_acknowledge_token_self_closing(lxb_html_tree_t *tree,
 
     bool is_void = lxb_html_tag_is_void(token->tag_id);
 
-    if (is_void) {
+    if (!is_void) {
         lxb_html_tree_parse_error(tree, token,
                                   LXB_HTML_RULES_ERROR_NOVOHTELSTTAWITRSO);
     }

diff --git a/ext/dom/lexbor/lexbor/html/tree/insertion_mode/foreign_content.c b/ext/dom/lexbor/lexbor/html/tree/insertion_mode/foreign_content.c
@@ -113,12 +113,10 @@ lxb_html_tree_insertion_mode_foreign_content_anything_else(lxb_html_tree_t *tree
     node = lxb_html_tree_current_node(tree);
 
     if (token->tag_id == LXB_TAG_SCRIPT && node->ns == LXB_NS_SVG) {
-        lxb_html_tree_acknowledge_token_self_closing(tree, token);
         return lxb_html_tree_insertion_mode_foreign_content_script_closed(tree, token);
     }
     else {
         lxb_html_tree_open_elements_pop(tree);
-        lxb_html_tree_acknowledge_token_self_closing(tree, token);
     }
 
     return true;

diff --git a/ext/dom/tests/modern/html/parser/gh17485.phpt b/ext/dom/tests/modern/html/parser/gh17485.phpt
@@ -0,0 +1,13 @@
+--TEST--
+GH-17485 (Self-closing tag on void elements shouldn't be a parse error/warning in \Dom\HTMLDocument)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$Data = "<!DOCTYPE HTML>\n<br />\n<input />";
+$Document = \Dom\HTMLDocument::createFromString( $Data );
+echo $Document->saveHTML();
+?>
+--EXPECT--
+<!DOCTYPE html><html><head></head><body><br>
+<input></body></html>