Skip to content

Commit 03a9f03

Browse files
ndosschendossche
authored
Migrate from xmlNewNode to xmlNewDocNode (php#19182)
The former is discouraged [1]. [1] https://gnome.pages.gitlab.gnome.org/libxml2/html/tree_8h.html#aa39c05fb472571ed00e38c065e67d2ec
1 parent 68fdb43 commit 03a9f03

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎ext/dom/element.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ PHP_METHOD(DOMElement, __construct)
6262
if (uri_len > 0) {
6363
errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len);
6464
if (errorcode == 0) {
65-
nodep = xmlNewNode (NULL, BAD_CAST localname);
65+
nodep = xmlNewDocNode(NULL, NULL, BAD_CAST localname, NULL);
6666
if (nodep != NULL && uri != NULL) {
6767
nsptr = dom_get_ns(nodep, uri, &errorcode, prefix);
6868
xmlSetNs(nodep, nsptr);
@@ -88,7 +88,7 @@ PHP_METHOD(DOMElement, __construct)
8888
php_dom_throw_error(NAMESPACE_ERR, true);
8989
RETURN_THROWS();
9090
}
91-
nodep = xmlNewNode(NULL, BAD_CAST name);
91+
nodep = xmlNewDocNode(NULL, NULL, BAD_CAST name, NULL);
9292
}
9393

9494
if (!nodep) {

‎ext/soap/php_encoding.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr par
598598
zval_ptr_dtor(&return_value);
599599
}
600600
if (!ret) {
601-
ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
601+
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
602602
}
603603
xmlAddChild(parent, ret);
604604
if (style == SOAP_ENCODED) {
@@ -855,7 +855,7 @@ static xmlNodePtr to_xml_string(encodeTypePtr type, zval *data, int style, xmlNo
855855
{
856856
xmlNodePtr ret, text;
857857

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

@@ -937,7 +937,7 @@ static xmlNodePtr to_xml_base64(encodeTypePtr type, zval *data, int style, xmlNo
937937
{
938938
xmlNodePtr ret, text;
939939

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

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

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

@@ -1066,7 +1066,7 @@ static xmlNodePtr to_xml_long(encodeTypePtr type, zval *data, int style, xmlNode
10661066
{
10671067
xmlNodePtr ret;
10681068

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

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

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

@@ -1141,7 +1141,7 @@ static xmlNodePtr to_xml_bool(encodeTypePtr type, zval *data, int style, xmlNode
11411141
{
11421142
xmlNodePtr ret;
11431143

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

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

1171-
ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1171+
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
11721172
xmlAddChild(parent, ret);
11731173
if (style == SOAP_ENCODED) {
11741174
set_xsi_nil(ret);
@@ -1306,12 +1306,12 @@ static void model_to_zval_object(zval *ret, sdlContentModelPtr model, xmlNodePtr
13061306
}
13071307
master_to_zval(&val, model->u.element->encode, r_node);
13081308
} else if (model->u.element->fixed) {
1309-
xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1309+
xmlNodePtr dummy = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
13101310
xmlNodeSetContent(dummy, BAD_CAST(model->u.element->fixed));
13111311
master_to_zval(&val, model->u.element->encode, dummy);
13121312
xmlFreeNode(dummy);
13131313
} else if (model->u.element->def && !model->u.element->nillable) {
1314-
xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1314+
xmlNodePtr dummy = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
13151315
xmlNodeSetContent(dummy, BAD_CAST(model->u.element->def));
13161316
master_to_zval(&val, model->u.element->encode, dummy);
13171317
xmlFreeNode(dummy);
@@ -1331,12 +1331,12 @@ static void model_to_zval_object(zval *ret, sdlContentModelPtr model, xmlNodePtr
13311331
}
13321332
master_to_zval(&val, model->u.element->encode, node);
13331333
} else if (model->u.element->fixed) {
1334-
xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1334+
xmlNodePtr dummy = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
13351335
xmlNodeSetContent(dummy, BAD_CAST(model->u.element->fixed));
13361336
master_to_zval(&val, model->u.element->encode, dummy);
13371337
xmlFreeNode(dummy);
13381338
} else if (model->u.element->def && !model->u.element->nillable) {
1339-
xmlNodePtr dummy = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1339+
xmlNodePtr dummy = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
13401340
xmlNodeSetContent(dummy, BAD_CAST(model->u.element->def));
13411341
master_to_zval(&val, model->u.element->encode, dummy);
13421342
xmlFreeNode(dummy);
@@ -1541,7 +1541,7 @@ static zval *to_zval_object_ex(zval *ret, encodeTypePtr type, xmlNodePtr data, z
15411541
xmlNodePtr dummy, text;
15421542
zval data;
15431543

1544-
dummy = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1544+
dummy = xmlNewDocNode(NULL, NULL, BAD_CAST("BOGUS"), NULL);
15451545
text = xmlNewText(BAD_CAST(str_val));
15461546
xmlAddChild(dummy, text);
15471547
ZVAL_NULL(&data);
@@ -1646,7 +1646,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
16461646
ZEND_HASH_FOREACH_VAL(ht, val) {
16471647
ZVAL_DEREF(val);
16481648
if (Z_TYPE_P(val) == IS_NULL && model->u.element->nillable) {
1649-
property = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1649+
property = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
16501650
xmlAddChild(node, property);
16511651
set_xsi_nil(property);
16521652
} else {
@@ -1666,7 +1666,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
16661666
} ZEND_HASH_FOREACH_END();
16671667
} else {
16681668
if (Z_TYPE_P(data) == IS_NULL && model->u.element->nillable) {
1669-
property = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1669+
property = xmlNewDocNode(node->doc, NULL, BAD_CAST("BOGUS"), NULL);
16701670
xmlAddChild(node, property);
16711671
set_xsi_nil(property);
16721672
} 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 *
16881688
}
16891689
return 1;
16901690
} else if (strict && model->u.element->nillable && model->min_occurs > 0) {
1691-
property = xmlNewNode(NULL, BAD_CAST(model->u.element->name));
1691+
property = xmlNewDocNode(node->doc, NULL, BAD_CAST(model->u.element->name), NULL);
16921692
xmlAddChild(node, property);
16931693
set_xsi_nil(property);
16941694
if (style == SOAP_LITERAL &&
@@ -1816,7 +1816,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
18161816
sdlTypePtr sdlType = type->sdl_type;
18171817

18181818
if (!data || Z_TYPE_P(data) == IS_NULL) {
1819-
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1819+
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
18201820
xmlAddChild(parent, xmlParam);
18211821
if (style == SOAP_ENCODED) {
18221822
set_xsi_nil(xmlParam);
@@ -1851,11 +1851,11 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
18511851
} else if (prop == NULL) {
18521852
xmlParam = master_to_xml(enc, data, style, parent);
18531853
} else {
1854-
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1854+
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
18551855
xmlAddChild(parent, xmlParam);
18561856
}
18571857
} else {
1858-
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1858+
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
18591859
xmlAddChild(parent, xmlParam);
18601860
}
18611861
} else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
@@ -1877,12 +1877,12 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
18771877
} else if (prop == NULL) {
18781878
xmlParam = master_to_xml(sdlType->encode, data, style, parent);
18791879
} else {
1880-
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1880+
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
18811881
xmlAddChild(parent, xmlParam);
18821882
}
18831883
}
18841884
} else {
1885-
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1885+
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
18861886
xmlAddChild(parent, xmlParam);
18871887
}
18881888

@@ -1903,7 +1903,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
19031903
xmlNodePtr property;
19041904
ZVAL_DEREF(val);
19051905
if (Z_TYPE_P(val) == IS_NULL && array_el->nillable) {
1906-
property = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1906+
property = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
19071907
xmlAddChild(xmlParam, property);
19081908
set_xsi_nil(property);
19091909
} else {
@@ -1959,7 +1959,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
19591959
set_ns_and_type(xmlParam, type);
19601960
}
19611961
} else {
1962-
xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
1962+
xmlParam = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
19631963
xmlAddChild(parent, xmlParam);
19641964

19651965
if (soap_check_zval_ref(data, xmlParam)) {
@@ -2159,7 +2159,7 @@ static void add_xml_array_elements(xmlNodePtr xmlParam,
21592159

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

21652165
if (type) {
@@ -2186,7 +2186,7 @@ static void add_xml_array_elements(xmlNodePtr xmlParam,
21862186
if (dimension == 1) {
21872187
xmlNodePtr xparam;
21882188

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

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

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

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

@@ -2727,9 +2727,9 @@ static xmlNodePtr to_xml_map(encodeTypePtr type, zval *data, int style, xmlNodeP
27272727
GC_TRY_PROTECT_RECURSION(Z_ARRVAL_P(data));
27282728

27292729
ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(data), int_val, key_val, temp_data) {
2730-
item = xmlNewNode(NULL, BAD_CAST("item"));
2730+
item = xmlNewDocNode(parent->doc, NULL, BAD_CAST("item"), NULL);
27312731
xmlAddChild(xmlParam, item);
2732-
key = xmlNewNode(NULL, BAD_CAST("key"));
2732+
key = xmlNewDocNode(parent->doc, NULL, BAD_CAST("key"), NULL);
27332733
xmlAddChild(item,key);
27342734
if (key_val) {
27352735
if (style == SOAP_ENCODED) {
@@ -2920,7 +2920,7 @@ static xmlNodePtr to_xml_datetime_ex(encodeTypePtr type, zval *data, char *forma
29202920

29212921
xmlNodePtr xmlParam;
29222922

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

@@ -3052,7 +3052,7 @@ static xmlNodePtr to_xml_list(encodeTypePtr enc, zval *data, int style, xmlNodeP
30523052
} ZEND_HASH_FOREACH_END();
30533053
}
30543054

3055-
ret = xmlNewNode(NULL, BAD_CAST("BOGUS"));
3055+
ret = xmlNewDocNode(parent->doc, NULL, BAD_CAST("BOGUS"), NULL);
30563056
xmlAddChild(parent, ret);
30573057
FIND_ZVAL_NULL(data, ret, style);
30583058
if (Z_TYPE_P(data) == IS_ARRAY) {

‎ext/soap/soap.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3716,7 +3716,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, const char *fu
37163716
if (version == SOAP_1_1) {
37173717
tmp = Z_FAULT_CODE_P(ret);
37183718
if (Z_TYPE_P(tmp) == IS_STRING) {
3719-
xmlNodePtr node = xmlNewNode(NULL, BAD_CAST("faultcode"));
3719+
xmlNodePtr node = xmlNewDocNode(doc, NULL, BAD_CAST("faultcode"), NULL);
37203720
zend_string *str = php_escape_html_entities((unsigned char*)Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), 0, 0, NULL);
37213721
xmlAddChild(param, node);
37223722
if (fault_ns) {
@@ -3780,7 +3780,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, const char *fu
37803780
if (Z_TYPE_P(tmp) > IS_NULL) {
37813781
detail = tmp;
37823782
}
3783-
node = xmlNewNode(NULL, BAD_CAST(detail_name));
3783+
node = xmlNewDocNode(doc, NULL, BAD_CAST(detail_name), NULL);
37843784
xmlAddChild(param, node);
37853785

37863786
zend_hash_internal_pointer_reset(fault->details);
@@ -4112,7 +4112,7 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function
41124112
h = master_to_xml(enc, data, hdr_use, head);
41134113
xmlNodeSetName(h, BAD_CAST(Z_STRVAL_P(name)));
41144114
} else {
4115-
h = xmlNewNode(NULL, BAD_CAST(Z_STRVAL_P(name)));
4115+
h = xmlNewDocNode(doc, NULL, BAD_CAST(Z_STRVAL_P(name)), NULL);
41164116
xmlAddChild(head, h);
41174117
}
41184118
nsptr = encode_add_ns(h, Z_STRVAL_P(ns));

0 commit comments

Comments
 (0)