Skip to content

Commit f7fb13e

Browse files
committed
Suppress libxml deprecations
Closes GH-20538
1 parent 599d5ae commit f7fb13e

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

ext/dom/document.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,12 +1437,16 @@ PHP_METHOD(DOMDocument, save)
14371437
doc_props = dom_get_doc_props(intern->document);
14381438
format = doc_props->formatoutput;
14391439
if (options & LIBXML_SAVE_NOEMPTYTAG) {
1440+
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
14401441
saveempty = xmlSaveNoEmptyTags;
14411442
xmlSaveNoEmptyTags = 1;
1443+
ZEND_DIAGNOSTIC_IGNORED_END
14421444
}
14431445
bytes = xmlSaveFormatFileEnc(file, docp, NULL, format);
14441446
if (options & LIBXML_SAVE_NOEMPTYTAG) {
1447+
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
14451448
xmlSaveNoEmptyTags = saveempty;
1449+
ZEND_DIAGNOSTIC_IGNORED_END
14461450
}
14471451
if (bytes == -1) {
14481452
RETURN_FALSE;
@@ -1489,12 +1493,16 @@ PHP_METHOD(DOMDocument, saveXML)
14891493
RETURN_FALSE;
14901494
}
14911495
if (options & LIBXML_SAVE_NOEMPTYTAG) {
1496+
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
14921497
saveempty = xmlSaveNoEmptyTags;
14931498
xmlSaveNoEmptyTags = 1;
1499+
ZEND_DIAGNOSTIC_IGNORED_END
14941500
}
14951501
xmlNodeDump(buf, docp, node, 0, format);
14961502
if (options & LIBXML_SAVE_NOEMPTYTAG) {
1503+
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
14971504
xmlSaveNoEmptyTags = saveempty;
1505+
ZEND_DIAGNOSTIC_IGNORED_END
14981506
}
14991507
mem = (xmlChar*) xmlBufferContent(buf);
15001508
if (!mem) {
@@ -1505,13 +1513,17 @@ PHP_METHOD(DOMDocument, saveXML)
15051513
xmlBufferFree(buf);
15061514
} else {
15071515
if (options & LIBXML_SAVE_NOEMPTYTAG) {
1516+
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
15081517
saveempty = xmlSaveNoEmptyTags;
15091518
xmlSaveNoEmptyTags = 1;
1519+
ZEND_DIAGNOSTIC_IGNORED_END
15101520
}
15111521
/* Encoding is handled from the encoding property set on the document */
15121522
xmlDocDumpFormatMemory(docp, &mem, &size, format);
15131523
if (options & LIBXML_SAVE_NOEMPTYTAG) {
1524+
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
15141525
xmlSaveNoEmptyTags = saveempty;
1526+
ZEND_DIAGNOSTIC_IGNORED_END
15151527
}
15161528
if (!size || !mem) {
15171529
RETURN_FALSE;

ext/libxml/libxml.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,11 @@ php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
429429
/* Allocate the Input buffer front-end. */
430430
ret = xmlAllocParserInputBuffer(enc);
431431
if (ret != NULL) {
432+
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
432433
ret->context = context;
433434
ret->readcallback = php_libxml_streams_IO_read;
434435
ret->closecallback = php_libxml_streams_IO_close;
436+
ZEND_DIAGNOSTIC_IGNORED_END
435437
} else
436438
php_libxml_streams_IO_close(context);
437439

@@ -679,9 +681,12 @@ static xmlParserInputPtr _php_libxml_external_entity_loader(const char *URL,
679681
} else {
680682
/* make stream not being closed when the zval is freed */
681683
GC_ADDREF(stream->res);
684+
685+
ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
682686
pib->context = stream;
683687
pib->readcallback = php_libxml_streams_IO_read;
684688
pib->closecallback = php_libxml_streams_IO_close;
689+
ZEND_DIAGNOSTIC_IGNORED_END
685690

686691
ret = xmlNewIOInputStream(context, pib, enc);
687692
if (ret == NULL) {

0 commit comments

Comments
 (0)