archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Migrate from xmlNewNode to xmlNewDocNode (#19182)

Browse source 
The former is discouraged [1].

[1] https://gnome.pages.gitlab.gnome.org/libxml2/html/tree_8h.html#aa39c05fb472571ed00e38c065e67d2ec
This commit is contained in:
Niels Dossche 2025-07-19 23:29:04 +02:00 • committed by GitHub
parent 68fdb43573
commit 03a9f03822
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/dom/element.c
View file

@ -62,7 +62,7 @@ PHP_METHOD(DOMElement, __construct)
if (uri_len > 0) { if (uri_len > 0) {
errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len); errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len);
if (errorcode == 0) { if (errorcode == 0) {
nodep = xmlNewNode (NULL, BAD_CAST localname); nodep = xmlNewDocNode(NULL, NULL, BAD_CAST localname, NULL);
if (nodep != NULL && uri != NULL) { if (nodep != NULL && uri != NULL) {
nsptr = dom_get_ns(nodep, uri, &errorcode, prefix); nsptr = dom_get_ns(nodep, uri, &errorcode, prefix);
xmlSetNs(nodep, nsptr); xmlSetNs(nodep, nsptr);
@ -88,7 +88,7 @@ PHP_METHOD(DOMElement, __construct)
php_dom_throw_error(NAMESPACE_ERR, true); php_dom_throw_error(NAMESPACE_ERR, true);
RETURN_THROWS(); RETURN_THROWS();
} }
nodep = xmlNewNode(NULL, BAD_CAST name); nodep = xmlNewDocNode(NULL, NULL, BAD_CAST name, NULL);
} }
if (!nodep) { if (!nodep) {

62
ext/soap/php_encoding.c
View file

@ -598,7 +598,7 @@ xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr par
zval_ptr_dtor(&return_value); zval_ptr_dtor(&return_value);
} }
if (!ret) { if (!ret) {
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
} }
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
if (style == SOAP_ENCODED) { if (style == SOAP_ENCODED) {
@ -855,7 +855,7 @@ static xmlNodePtr to_xml_string(encodeTypePtr type, zval *data, int style, xmlNo
{ {
xmlNodePtr ret, text; xmlNodePtr ret, text;
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style); FIND_ZVAL_NULL(data, ret, style);
@ -937,7 +937,7 @@ static xmlNodePtr to_xml_base64(encodeTypePtr type, zval *data, int style, xmlNo
{ {
xmlNodePtr ret, text; xmlNodePtr ret, text;
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style); FIND_ZVAL_NULL(data, ret, style);
@ -963,7 +963,7 @@ static xmlNodePtr to_xml_hexbin(encodeTypePtr type, zval *data, int style, xmlNo
zval tmp; zval tmp;
size_t i, j; size_t i, j;
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style); FIND_ZVAL_NULL(data, ret, style);
@ -1066,7 +1066,7 @@ static xmlNodePtr to_xml_long(encodeTypePtr type, zval *data, int style, xmlNode
{ {
xmlNodePtr ret; xmlNodePtr ret;
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style); FIND_ZVAL_NULL(data, ret, style);
@ -1093,7 +1093,7 @@ static xmlNodePtr to_xml_double(encodeTypePtr type, zval *data, int style, xmlNo
zval tmp; zval tmp;
char *str; char *str;
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style); FIND_ZVAL_NULL(data, ret, style);
@ -1141,7 +1141,7 @@ static xmlNodePtr to_xml_bool(encodeTypePtr type, zval *data, int style, xmlNode
{ {
xmlNodePtr ret; xmlNodePtr ret;
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style); FIND_ZVAL_NULL(data, ret, style);
@ -1168,7 +1168,7 @@ static xmlNodePtr to_xml_null(encodeTypePtr type, zval *data, int style, xmlNode
{ {
xmlNodePtr ret; xmlNodePtr ret;
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
if (style == SOAP_ENCODED) { if (style == SOAP_ENCODED) {
set_xsi_nil(ret); set_xsi_nil(ret);
@ -1306,12 +1306,12 @@ static void model_to_zval_object(zval *ret, sdlContentModelPtr model, xmlNodePtr
} }
master_to_zval(&val, model->u.element->encode, r_node); master_to_zval(&val, model->u.element->encode, r_node);
} else if (model->u.element->fixed) { } else if (model->u.element->fixed) {
xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlNodePtr dummy = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlNodeSetContent(dummy, BAD_CAST(model->u.element->fixed)); xmlNodeSetContent(dummy, BAD_CAST(model->u.element->fixed));
master_to_zval(&val, model->u.element->encode, dummy); master_to_zval(&val, model->u.element->encode, dummy);
xmlFreeNode(dummy); xmlFreeNode(dummy);
} else if (model->u.element->def && !model->u.element->nillable) { } else if (model->u.element->def && !model->u.element->nillable) {
xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlNodePtr dummy = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlNodeSetContent(dummy, BAD_CAST(model->u.element->def)); xmlNodeSetContent(dummy, BAD_CAST(model->u.element->def));
master_to_zval(&val, model->u.element->encode, dummy); master_to_zval(&val, model->u.element->encode, dummy);
xmlFreeNode(dummy); xmlFreeNode(dummy);
@ -1331,12 +1331,12 @@ static void model_to_zval_object(zval *ret, sdlContentModelPtr model, xmlNodePtr
} }
master_to_zval(&val, model->u.element->encode, node); master_to_zval(&val, model->u.element->encode, node);
} else if (model->u.element->fixed) { } else if (model->u.element->fixed) {
xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlNodePtr dummy = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlNodeSetContent(dummy, BAD_CAST(model->u.element->fixed)); xmlNodeSetContent(dummy, BAD_CAST(model->u.element->fixed));
master_to_zval(&val, model->u.element->encode, dummy); master_to_zval(&val, model->u.element->encode, dummy);
xmlFreeNode(dummy); xmlFreeNode(dummy);
} else if (model->u.element->def && !model->u.element->nillable) { } else if (model->u.element->def && !model->u.element->nillable) {
xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlNodePtr dummy = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlNodeSetContent(dummy, BAD_CAST(model->u.element->def)); xmlNodeSetContent(dummy, BAD_CAST(model->u.element->def));
master_to_zval(&val, model->u.element->encode, dummy); master_to_zval(&val, model->u.element->encode, dummy);
xmlFreeNode(dummy); xmlFreeNode(dummy);
@ -1541,7 +1541,7 @@ static zval *to_zval_object_ex(zval *ret, encodeTypePtr type, xmlNodePtr data, z
xmlNodePtr dummy, text; xmlNodePtr dummy, text;
zval data; zval data;
dummy = xmlNewNode(NULL, BAD_CAST("BOGUS")); dummy = xmlNewDocNode(NULL, NULL, BAD_CAST("BOGUS"), NULL);
text = xmlNewText(BAD_CAST(str_val)); text = xmlNewText(BAD_CAST(str_val));
xmlAddChild(dummy, text); xmlAddChild(dummy, text);
ZVAL_NULL(&data); ZVAL_NULL(&data);
@ -1646,7 +1646,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
ZEND_HASH_FOREACH_VAL(ht, val) { ZEND_HASH_FOREACH_VAL(ht, val) {
ZVAL_DEREF(val); ZVAL_DEREF(val);
if (Z_TYPE_P(val) == IS_NULL && model->u.element->nillable) { if (Z_TYPE_P(val) == IS_NULL && model->u.element->nillable) {
property = xmlNewNode(NULL, BAD_CAST("BOGUS")); property = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(node, property); xmlAddChild(node, property);
set_xsi_nil(property); set_xsi_nil(property);
} else { } else {
@ -1666,7 +1666,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
} else { } else {
if (Z_TYPE_P(data) == IS_NULL && model->u.element->nillable) { if (Z_TYPE_P(data) == IS_NULL && model->u.element->nillable) {
property = xmlNewNode(NULL, BAD_CAST("BOGUS")); property = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(node, property); xmlAddChild(node, property);
set_xsi_nil(property); set_xsi_nil(property);
} else if (Z_TYPE_P(data) == IS_NULL && model->min_occurs == 0) { } else if (Z_TYPE_P(data) == IS_NULL && model->min_occurs == 0) {
@ -1688,7 +1688,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
} }
return 1; return 1;
} else if (strict && model->u.element->nillable && model->min_occurs > 0) { } else if (strict && model->u.element->nillable && model->min_occurs > 0) {
property = xmlNewNode(NULL, BAD_CAST(model->u.element->name)); property = xmlNewDocNode(node->doc, NULL, BAD_CAST(model->u.element->name), NULL);
xmlAddChild(node, property); xmlAddChild(node, property);
set_xsi_nil(property); set_xsi_nil(property);
if (style == SOAP_LITERAL && if (style == SOAP_LITERAL &&
@ -1816,7 +1816,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
sdlTypePtr sdlType = type->sdl_type; sdlTypePtr sdlType = type->sdl_type;
if (!data || Z_TYPE_P(data) == IS_NULL) { if (!data || Z_TYPE_P(data) == IS_NULL) {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
if (style == SOAP_ENCODED) { if (style == SOAP_ENCODED) {
set_xsi_nil(xmlParam); set_xsi_nil(xmlParam);
@ -1851,11 +1851,11 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
} else if (prop == NULL) { } else if (prop == NULL) {
xmlParam = master_to_xml(enc, data, style, parent); xmlParam = master_to_xml(enc, data, style, parent);
} else { } else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
} }
} else { } else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
} }
} else if (sdlType->kind == XSD_TYPEKIND_EXTENSION && } else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
@ -1877,12 +1877,12 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
} else if (prop == NULL) { } else if (prop == NULL) {
xmlParam = master_to_xml(sdlType->encode, data, style, parent); xmlParam = master_to_xml(sdlType->encode, data, style, parent);
} else { } else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
} }
} }
} else { } else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
} }
@ -1903,7 +1903,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
xmlNodePtr property; xmlNodePtr property;
ZVAL_DEREF(val); ZVAL_DEREF(val);
if (Z_TYPE_P(val) == IS_NULL && array_el->nillable) { if (Z_TYPE_P(val) == IS_NULL && array_el->nillable) {
property = xmlNewNode(NULL, BAD_CAST("BOGUS")); property = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(xmlParam, property); xmlAddChild(xmlParam, property);
set_xsi_nil(property); set_xsi_nil(property);
} else { } else {
@ -1959,7 +1959,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
set_ns_and_type(xmlParam, type); set_ns_and_type(xmlParam, type);
} }
} else { } else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
if (soap_check_zval_ref(data, xmlParam)) { if (soap_check_zval_ref(data, xmlParam)) {
@ -2159,7 +2159,7 @@ static void add_xml_array_elements(xmlNodePtr xmlParam,
if (dimension == 1) { if (dimension == 1) {
while (j < dims[0]) { while (j < dims[0]) {
xparam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xparam = xmlNewDocNode(xmlParam->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(xmlParam, xparam); xmlAddChild(xmlParam, xparam);
if (type) { if (type) {
@ -2186,7 +2186,7 @@ static void add_xml_array_elements(xmlNodePtr xmlParam,
if (dimension == 1) { if (dimension == 1) {
xmlNodePtr xparam; xmlNodePtr xparam;
xparam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xparam = xmlNewDocNode(xmlParam->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(xmlParam, xparam); xmlAddChild(xmlParam, xparam);
if (type) { if (type) {
xmlNodeSetName(xparam, BAD_CAST(type->name)); xmlNodeSetName(xparam, BAD_CAST(type->name));
@ -2219,7 +2219,7 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod
ZVAL_UNDEF(&array_copy); ZVAL_UNDEF(&array_copy);
soap_version = SOAP_GLOBAL(soap_version); soap_version = SOAP_GLOBAL(soap_version);
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
if (!data || Z_TYPE_P(data) == IS_NULL) { if (!data || Z_TYPE_P(data) == IS_NULL) {
@ -2714,7 +2714,7 @@ static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodeP
xmlNodePtr xparam, item; xmlNodePtr xparam, item;
xmlNodePtr key; xmlNodePtr key;
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
FIND_ZVAL_NULL(data, xmlParam, style); FIND_ZVAL_NULL(data, xmlParam, style);
@ -2727,9 +2727,9 @@ static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodeP
GC_TRY_PROTECT_RECURSION(Z_ARRVAL_P(data)); GC_TRY_PROTECT_RECURSION(Z_ARRVAL_P(data));
ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(data), int_val, key_val, temp_data) { ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(data), int_val, key_val, temp_data) {
item = xmlNewNode(NULL, BAD_CAST("item")); item = xmlNewDocNode(parent->doc, NULL, BAD_CAST("item"), NULL);
xmlAddChild(xmlParam, item); xmlAddChild(xmlParam, item);
key = xmlNewNode(NULL, BAD_CAST("key")); key = xmlNewDocNode(parent->doc, NULL, BAD_CAST("key"), NULL);
xmlAddChild(item,key); xmlAddChild(item,key);
if (key_val) { if (key_val) {
if (style == SOAP_ENCODED) { if (style == SOAP_ENCODED) {
@ -2920,7 +2920,7 @@ static xmlNodePtr to_xml_datetime_ex(encodeTypePtr type, zval *data, char *forma
xmlNodePtr xmlParam; xmlNodePtr xmlParam;
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam); xmlAddChild(parent, xmlParam);
FIND_ZVAL_NULL(data, xmlParam, style); FIND_ZVAL_NULL(data, xmlParam, style);
@ -3052,7 +3052,7 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
} }
ret = xmlNewNode(NULL, BAD_CAST("BOGUS")); ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret); xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style); FIND_ZVAL_NULL(data, ret, style);
if (Z_TYPE_P(data) == IS_ARRAY) { if (Z_TYPE_P(data) == IS_ARRAY) {

6
ext/soap/soap.c
View file

@ -3716,7 +3716,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, const char *fu
if (version == SOAP_1_1) { if (version == SOAP_1_1) {
tmp = Z_FAULT_CODE_P(ret); tmp = Z_FAULT_CODE_P(ret);
if (Z_TYPE_P(tmp) == IS_STRING) { if (Z_TYPE_P(tmp) == IS_STRING) {
xmlNodePtr node = xmlNewNode(NULL, BAD_CAST("faultcode")); xmlNodePtr node = xmlNewDocNode(doc, NULL, BAD_CAST("faultcode"), NULL);
zend_string *str = php_escape_html_entities((unsigned char*)Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), 0, 0, NULL); zend_string *str = php_escape_html_entities((unsigned char*)Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), 0, 0, NULL);
xmlAddChild(param, node); xmlAddChild(param, node);
if (fault_ns) { if (fault_ns) {
@ -3780,7 +3780,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, const char *fu
if (Z_TYPE_P(tmp) > IS_NULL) { if (Z_TYPE_P(tmp) > IS_NULL) {
detail = tmp; detail = tmp;
} }
node = xmlNewNode(NULL, BAD_CAST(detail_name)); node = xmlNewDocNode(doc, NULL, BAD_CAST(detail_name), NULL);
xmlAddChild(param, node); xmlAddChild(param, node);
zend_hash_internal_pointer_reset(fault->details); zend_hash_internal_pointer_reset(fault->details);
@ -4112,7 +4112,7 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function
h = master_to_xml(enc, data, hdr_use, head); h = master_to_xml(enc, data, hdr_use, head);
xmlNodeSetName(h, BAD_CAST(Z_STRVAL_P(name))); xmlNodeSetName(h, BAD_CAST(Z_STRVAL_P(name)));
} else { } else {
h = xmlNewNode(NULL, BAD_CAST(Z_STRVAL_P(name))); h = xmlNewDocNode(doc, NULL, BAD_CAST(Z_STRVAL_P(name)), NULL);
xmlAddChild(head, h); xmlAddChild(head, h);
} }
nsptr = encode_add_ns(h, Z_STRVAL_P(ns)); nsptr = encode_add_ns(h, Z_STRVAL_P(ns));