Skip to content

Suppress libxml deprecations #20538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+8 −1
Open

Suppress libxml deprecations #20538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ext/dom/document.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,6 +1596,7 @@ PHP_METHOD(DOMDocument, save)

/* encoding handled by property on doc */

ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
libxml_doc_props const* doc_props = dom_get_doc_props_read_only(intern->document);
bool format = doc_props->formatoutput;
if (options & LIBXML_SAVE_NOEMPTYTAG) {
Expand All @@ -1606,6 +1607,7 @@ PHP_METHOD(DOMDocument, save)
if (options & LIBXML_SAVE_NOEMPTYTAG) {
xmlSaveNoEmptyTags = saveempty;
}
ZEND_DIAGNOSTIC_IGNORED_END
if (bytes == -1) {
RETURN_FALSE;
}
Expand Down Expand Up @@ -1634,6 +1636,7 @@ static void dom_document_save_xml(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry
libxml_doc_props const* doc_props = dom_get_doc_props_read_only(intern->document);
bool format = doc_props->formatoutput;

ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
zend_string *res;
if (nodep != NULL) {
/* Dump contents of Node */
Expand Down Expand Up @@ -1664,6 +1667,7 @@ static void dom_document_save_xml(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry
res = intern->document->handlers->dump_doc_to_str(docp, converted_options, (const char *) docp->encoding);
xmlSaveNoEmptyTags = old_xml_save_no_empty_tags;
}
ZEND_DIAGNOSTIC_IGNORED_END

if (!res) {
php_error_docref(NULL, E_WARNING, "Could not save document");
Expand Down
5 changes: 4 additions & 1 deletion ext/dom/xml_serializer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,10 @@ static int dom_xml_serialize_element_node(
/* 14. If ns is the HTML namespace, and the node's list of children is empty, and the node's localName matches
* any one of the following void elements: ... */
if (element->children == NULL) {
if (xmlSaveNoEmptyTags) {
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
int saveNoEmptyTags = xmlSaveNoEmptyTags;
ZEND_DIAGNOSTIC_IGNORED_END
if (saveNoEmptyTags) {
/* Do nothing, use the <x></x> closing style. */
} else if (php_dom_ns_is_fast(element, php_dom_ns_is_html_magic_token)) {
size_t name_length = strlen((const char *) element->name);
Expand Down