Merge branch 'PHP-8.4'

Girgias · Girgias · commit 27e485d22e53 · 2025-06-20T19:09:02.000+02:00
diff --git a/ext/dom/html_document.c b/ext/dom/html_document.c
@@ -776,7 +776,7 @@ static bool dom_parse_decode_encode_finish(
 
 static bool check_options_validity(uint32_t arg_num, zend_long options)
 {
-	const zend_long VALID_OPTIONS = XML_PARSE_NOERROR | XML_PARSE_COMPACT | HTML_PARSE_NOIMPLIED | DOM_HTML_NO_DEFAULT_NS;
+	const zend_long VALID_OPTIONS = HTML_PARSE_NOERROR | HTML_PARSE_COMPACT | HTML_PARSE_NOIMPLIED | DOM_HTML_NO_DEFAULT_NS;
 	if ((options & ~VALID_OPTIONS) != 0) {
 		zend_argument_value_error(arg_num, "contains invalid flags (allowed flags: "
 										   "LIBXML_NOERROR, "

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ static bool dom_parse_decode_encode_finish(`
`776`	`776`
`777`	`777`	`static bool check_options_validity(uint32_t arg_num, zend_long options)`
`778`	`778`	`{`
`779`		`- const zend_long VALID_OPTIONS = XML_PARSE_NOERROR \| XML_PARSE_COMPACT \| HTML_PARSE_NOIMPLIED \| DOM_HTML_NO_DEFAULT_NS;`
	`779`	`+ const zend_long VALID_OPTIONS = HTML_PARSE_NOERROR \| HTML_PARSE_COMPACT \| HTML_PARSE_NOIMPLIED \| DOM_HTML_NO_DEFAULT_NS;`
`780`	`780`	`if ((options & ~VALID_OPTIONS) != 0) {`
`781`	`781`	`zend_argument_value_error(arg_num, "contains invalid flags (allowed flags: "`
`782`	`782`	`"LIBXML_NOERROR, "`