Skip to content

Migrate from xmlNewNode to xmlNewDocNode #19182

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

Merged
merged 1 commit into from
Jul 19, 2025
Merged

Migrate from xmlNewNode to xmlNewDocNode #19182

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: 2 additions & 2 deletions ext/dom/element.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ PHP_METHOD(DOMElement, __construct)
if (uri_len > 0) {
errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len);
if (errorcode == 0) {
nodep = xmlNewNode (NULL, BAD_CAST localname);
nodep = xmlNewDocNode(NULL, NULL, BAD_CAST localname, NULL);
if (nodep != NULL && uri != NULL) {
nsptr = dom_get_ns(nodep, uri, &errorcode, prefix);
xmlSetNs(nodep, nsptr);
Expand All @@ -88,7 +88,7 @@ PHP_METHOD(DOMElement, __construct)
php_dom_throw_error(NAMESPACE_ERR, true);
RETURN_THROWS();
}
nodep = xmlNewNode(NULL, BAD_CAST name);
nodep = xmlNewDocNode(NULL, NULL, BAD_CAST name, NULL);
}

if (!nodep) {
Expand Down
62 changes: 31 additions & 31 deletions ext/soap/php_encoding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr par
zval_ptr_dtor(&return_value);
}
if (!ret) {
ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
}
xmlAddChild(parent, ret);
if (style == SOAP_ENCODED) {
Expand Down Expand Up @@ -855,7 +855,7 @@ static xmlNodePtr to_xml_string(encodeTypePtr type, zval *data, int style, xmlNo
{
xmlNodePtr ret, text;

ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style);

Expand Down Expand Up @@ -937,7 +937,7 @@ static xmlNodePtr to_xml_base64(encodeTypePtr type, zval *data, int style, xmlNo
{
xmlNodePtr ret, text;

ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style);

Expand All @@ -963,7 +963,7 @@ static xmlNodePtr to_xml_hexbin(encodeTypePtr type, zval *data, int style, xmlNo
zval tmp;
size_t i, j;

ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style);

Expand Down Expand Up @@ -1066,7 +1066,7 @@ static xmlNodePtr to_xml_long(encodeTypePtr type, zval *data, int style, xmlNode
{
xmlNodePtr ret;

ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style);

Expand All @@ -1093,7 +1093,7 @@ static xmlNodePtr to_xml_double(encodeTypePtr type, zval *data, int style, xmlNo
zval tmp;
char *str;

ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style);

Expand Down Expand Up @@ -1141,7 +1141,7 @@ static xmlNodePtr to_xml_bool(encodeTypePtr type, zval *data, int style, xmlNode
{
xmlNodePtr ret;

ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style);

Expand All @@ -1168,7 +1168,7 @@ static xmlNodePtr to_xml_null(encodeTypePtr type, zval *data, int style, xmlNode
{
xmlNodePtr ret;

ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret);
if (style == SOAP_ENCODED) {
set_xsi_nil(ret);
Expand Down Expand Up @@ -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);
} 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));
master_to_zval(&val, model->u.element->encode, dummy);
xmlFreeNode(dummy);
} 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));
master_to_zval(&val, model->u.element->encode, dummy);
xmlFreeNode(dummy);
Expand All @@ -1331,12 +1331,12 @@ static void model_to_zval_object(zval *ret, sdlContentModelPtr model, xmlNodePtr
}
master_to_zval(&val, model->u.element->encode, node);
} 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));
master_to_zval(&val, model->u.element->encode, dummy);
xmlFreeNode(dummy);
} 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));
master_to_zval(&val, model->u.element->encode, dummy);
xmlFreeNode(dummy);
Expand Down Expand Up @@ -1541,7 +1541,7 @@ static zval *to_zval_object_ex(zval *ret, encodeTypePtr type, xmlNodePtr data, z
xmlNodePtr dummy, text;
zval data;

dummy = xmlNewNode(NULL, BAD_CAST("BOGUS"));
dummy = xmlNewDocNode(NULL, NULL, BAD_CAST("BOGUS"), NULL);
text = xmlNewText(BAD_CAST(str_val));
xmlAddChild(dummy, text);
ZVAL_NULL(&data);
Expand Down Expand Up @@ -1646,7 +1646,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
ZEND_HASH_FOREACH_VAL(ht, val) {
ZVAL_DEREF(val);
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);
set_xsi_nil(property);
} else {
Expand All @@ -1666,7 +1666,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
} ZEND_HASH_FOREACH_END();
} else {
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);
set_xsi_nil(property);
} else if (Z_TYPE_P(data) == IS_NULL && model->min_occurs == 0) {
Expand All @@ -1688,7 +1688,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
}
return 1;
} 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);
set_xsi_nil(property);
if (style == SOAP_LITERAL &&
Expand Down Expand Up @@ -1816,7 +1816,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
sdlTypePtr sdlType = type->sdl_type;

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);
if (style == SOAP_ENCODED) {
set_xsi_nil(xmlParam);
Expand Down Expand Up @@ -1851,11 +1851,11 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
} else if (prop == NULL) {
xmlParam = master_to_xml(enc, data, style, parent);
} else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam);
}
} else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam);
}
} else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
Expand All @@ -1877,12 +1877,12 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
} else if (prop == NULL) {
xmlParam = master_to_xml(sdlType->encode, data, style, parent);
} else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam);
}
}
} else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam);
}

Expand All @@ -1903,7 +1903,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
xmlNodePtr property;
ZVAL_DEREF(val);
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);
set_xsi_nil(property);
} else {
Expand Down Expand Up @@ -1959,7 +1959,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
set_ns_and_type(xmlParam, type);
}
} else {
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam);

if (soap_check_zval_ref(data, xmlParam)) {
Expand Down Expand Up @@ -2159,7 +2159,7 @@ static void add_xml_array_elements(xmlNodePtr xmlParam,

if (dimension == 1) {
while (j < dims[0]) {
xparam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xparam = xmlNewDocNode(xmlParam->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(xmlParam, xparam);

if (type) {
Expand All @@ -2186,7 +2186,7 @@ static void add_xml_array_elements(xmlNodePtr xmlParam,
if (dimension == 1) {
xmlNodePtr xparam;

xparam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xparam = xmlNewDocNode(xmlParam->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(xmlParam, xparam);
if (type) {
xmlNodeSetName(xparam, BAD_CAST(type->name));
Expand Down Expand Up @@ -2219,7 +2219,7 @@ static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNod
ZVAL_UNDEF(&array_copy);
soap_version = SOAP_GLOBAL(soap_version);

xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam);

if (!data || Z_TYPE_P(data) == IS_NULL) {
Expand Down Expand Up @@ -2714,7 +2714,7 @@ static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodeP
xmlNodePtr xparam, item;
xmlNodePtr key;

xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam);
FIND_ZVAL_NULL(data, xmlParam, style);

Expand All @@ -2727,9 +2727,9 @@ static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodeP
GC_TRY_PROTECT_RECURSION(Z_ARRVAL_P(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);
key = xmlNewNode(NULL, BAD_CAST("key"));
key = xmlNewDocNode(parent->doc, NULL, BAD_CAST("key"), NULL);
xmlAddChild(item,key);
if (key_val) {
if (style == SOAP_ENCODED) {
Expand Down Expand Up @@ -2920,7 +2920,7 @@ static xmlNodePtr to_xml_datetime_ex(encodeTypePtr type, zval *data, char *forma

xmlNodePtr xmlParam;

xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, xmlParam);
FIND_ZVAL_NULL(data, xmlParam, style);

Expand Down Expand Up @@ -3052,7 +3052,7 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP
} ZEND_HASH_FOREACH_END();
}

ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
xmlAddChild(parent, ret);
FIND_ZVAL_NULL(data, ret, style);
if (Z_TYPE_P(data) == IS_ARRAY) {
Expand Down
6 changes: 3 additions & 3 deletions ext/soap/soap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3716,7 +3716,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, const char *fu
if (version == SOAP_1_1) {
tmp = Z_FAULT_CODE_P(ret);
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);
xmlAddChild(param, node);
if (fault_ns) {
Expand Down Expand Up @@ -3780,7 +3780,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, const char *fu
if (Z_TYPE_P(tmp) > IS_NULL) {
detail = tmp;
}
node = xmlNewNode(NULL, BAD_CAST(detail_name));
node = xmlNewDocNode(doc, NULL, BAD_CAST(detail_name), NULL);
xmlAddChild(param, node);

zend_hash_internal_pointer_reset(fault->details);
Expand Down Expand Up @@ -4112,7 +4112,7 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function
h = master_to_xml(enc, data, hdr_use, head);
xmlNodeSetName(h, BAD_CAST(Z_STRVAL_P(name)));
} else {
h = xmlNewNode(NULL, BAD_CAST(Z_STRVAL_P(name)));
h = xmlNewDocNode(doc, NULL, BAD_CAST(Z_STRVAL_P(name)), NULL);
xmlAddChild(head, h);
}
nsptr = encode_add_ns(h, Z_STRVAL_P(ns));
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy