Skip to content

Commit cece939

Browse files
beberleibeberlei
committedSep 23, 2019
Cleanup ext/dom: Additional unimplemented code following 25bfac4 
1 parent 131c1a5 commit cece939

12 files changed

+4
-334
lines changed
 

‎ext/dom/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ if test "$PHP_DOM" != "no"; then
1313
PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [
1414
AC_DEFINE(HAVE_DOM,1,[ ])
1515
PHP_NEW_EXTENSION(dom, [php_dom.c attr.c document.c \
16-
domstringlist.c domexception.c \
16+
domexception.c \
1717
processinginstruction.c cdatasection.c \
1818
documentfragment.c domimplementation.c \
19-
element.c node.c string_extend.c characterdata.c \
19+
element.c node.c characterdata.c \
2020
documenttype.c entity.c \
2121
nodelist.c text.c comment.c \
2222
entityreference.c \

‎ext/dom/config.w32

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ if (PHP_DOM == "yes") {
88
CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_DOM", PHP_PHP_BUILD + "\\include\\libxml2")
99
) {
1010
EXTENSION("dom", "php_dom.c attr.c document.c \
11-
domstringlist.c domexception.c processinginstruction.c \
11+
domexception.c processinginstruction.c \
1212
cdatasection.c documentfragment.c domimplementation.c element.c \
13-
node.c string_extend.c characterdata.c documenttype.c \
13+
node.c characterdata.c documenttype.c \
1414
entity.c nodelist.c text.c comment.c \
1515
entityreference.c \
1616
notation.c xpath.c dom_iterators.c \

‎ext/dom/document.c

-17
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,6 @@ ZEND_END_ARG_INFO();
109109
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_normalize_document, 0, 0, 0)
110110
ZEND_END_ARG_INFO();
111111

112-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_rename_node, 0, 0, 3)
113-
ZEND_ARG_OBJ_INFO(0, node, DOMNode, 0)
114-
ZEND_ARG_INFO(0, namespaceURI)
115-
ZEND_ARG_INFO(0, qualifiedName)
116-
ZEND_END_ARG_INFO();
117-
118112
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_load, 0, 0, 1)
119113
ZEND_ARG_INFO(0, source)
120114
ZEND_ARG_INFO(0, options)
@@ -209,7 +203,6 @@ const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */
209203
PHP_FALIAS(getElementById, dom_document_get_element_by_id, arginfo_dom_document_get_element_by_id)
210204
PHP_FALIAS(adoptNode, dom_document_adopt_node, arginfo_dom_document_adopt_node)
211205
PHP_FALIAS(normalizeDocument, dom_document_normalize_document, arginfo_dom_document_normalize_document)
212-
PHP_FALIAS(renameNode, dom_document_rename_node, arginfo_dom_document_rename_node)
213206
PHP_ME(domdocument, load, arginfo_dom_document_load, ZEND_ACC_PUBLIC)
214207
PHP_FALIAS(save, dom_document_save, arginfo_dom_document_save)
215208
PHP_ME(domdocument, loadXML, arginfo_dom_document_loadxml, ZEND_ACC_PUBLIC)
@@ -1262,16 +1255,6 @@ PHP_FUNCTION(dom_document_normalize_document)
12621255
}
12631256
/* }}} end dom_document_normalize_document */
12641257

1265-
/* {{{ proto DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName)
1266-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode
1267-
Since: DOM Level 3
1268-
*/
1269-
PHP_FUNCTION(dom_document_rename_node)
1270-
{
1271-
DOM_NOT_IMPLEMENTED();
1272-
}
1273-
/* }}} end dom_document_rename_node */
1274-
12751258
/* {{{ proto DOMDocument::__construct([string version], [string encoding]); */
12761259
PHP_METHOD(domdocument, __construct)
12771260
{

‎ext/dom/dom_ce.h

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
extern PHP_DOM_EXPORT zend_class_entry *dom_node_class_entry;
2424
extern PHP_DOM_EXPORT zend_class_entry *dom_domexception_class_entry;
25-
extern PHP_DOM_EXPORT zend_class_entry *dom_domstringlist_class_entry;
2625
extern PHP_DOM_EXPORT zend_class_entry *dom_domimplementation_class_entry;
2726
extern PHP_DOM_EXPORT zend_class_entry *dom_documentfragment_class_entry;
2827
extern PHP_DOM_EXPORT zend_class_entry *dom_document_class_entry;
@@ -39,7 +38,6 @@ extern PHP_DOM_EXPORT zend_class_entry *dom_notation_class_entry;
3938
extern PHP_DOM_EXPORT zend_class_entry *dom_entity_class_entry;
4039
extern PHP_DOM_EXPORT zend_class_entry *dom_entityreference_class_entry;
4140
extern PHP_DOM_EXPORT zend_class_entry *dom_processinginstruction_class_entry;
42-
extern PHP_DOM_EXPORT zend_class_entry *dom_string_extend_class_entry;
4341
#if defined(LIBXML_XPATH_ENABLED)
4442
extern PHP_DOM_EXPORT zend_class_entry *dom_xpath_class_entry;
4543
#endif

‎ext/dom/dom_fe.h

-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#define DOM_FE_H
2222

2323
extern const zend_function_entry php_dom_domexception_class_functions[];
24-
extern const zend_function_entry php_dom_domstringlist_class_functions[];
2524
extern const zend_function_entry php_dom_domimplementation_class_functions[];
2625
extern const zend_function_entry php_dom_documentfragment_class_functions[];
2726
extern const zend_function_entry php_dom_document_class_functions[];
@@ -39,7 +38,6 @@ extern const zend_function_entry php_dom_notation_class_functions[];
3938
extern const zend_function_entry php_dom_entity_class_functions[];
4039
extern const zend_function_entry php_dom_entityreference_class_functions[];
4140
extern const zend_function_entry php_dom_processinginstruction_class_functions[];
42-
extern const zend_function_entry php_dom_string_extend_class_functions[];
4341
extern const zend_function_entry php_dom_xpath_class_functions[];
4442

4543
/* domexception errors */
@@ -70,9 +68,6 @@ typedef enum {
7068
VALIDATION_ERR = 16
7169
} dom_exception_code;
7270

73-
/* domstringlist methods */
74-
PHP_FUNCTION(dom_domstringlist_item);
75-
7671
/* domimplementation methods */
7772
PHP_METHOD(domimplementation, hasFeature);
7873
PHP_METHOD(domimplementation, createDocumentType);
@@ -219,10 +214,6 @@ PHP_METHOD(domentityreference, __construct);
219214
/* domprocessinginstruction methods */
220215
PHP_METHOD(domprocessinginstruction, __construct);
221216

222-
/* string_extend methods */
223-
PHP_FUNCTION(dom_string_extend_find_offset16);
224-
PHP_FUNCTION(dom_string_extend_find_offset32);
225-
226217
#if defined(LIBXML_XPATH_ENABLED)
227218
/* xpath methods */
228219
PHP_METHOD(domxpath, __construct);

‎ext/dom/dom_properties.h

-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ int dom_documenttype_public_id_read(dom_object *obj, zval *retval);
7171
int dom_documenttype_system_id_read(dom_object *obj, zval *retval);
7272
int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval);
7373

74-
/* domstringlist properties */
75-
int dom_domstringlist_length_read(dom_object *obj, zval *retval);
76-
7774
/* element properties */
7875
int dom_element_tag_name_read(dom_object *obj, zval *retval);
7976
int dom_element_schema_type_info_read(dom_object *obj, zval *retval);

‎ext/dom/domstringlist.c

-73
This file was deleted.

‎ext/dom/namednodemap.c

-61
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item, 0, 0, 1)
3030
ZEND_ARG_INFO(0, name)
3131
ZEND_END_ARG_INFO();
3232

33-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_set_named_item, 0, 0, 1)
34-
ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
35-
ZEND_END_ARG_INFO();
36-
37-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_remove_named_item, 0, 0, 0)
38-
ZEND_ARG_INFO(0, name)
39-
ZEND_END_ARG_INFO();
40-
4133
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_item, 0, 0, 0)
4234
ZEND_ARG_INFO(0, index)
4335
ZEND_END_ARG_INFO();
@@ -47,15 +39,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item_ns, 0, 0, 0)
4739
ZEND_ARG_INFO(0, localName)
4840
ZEND_END_ARG_INFO();
4941

50-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_set_named_item_ns, 0, 0, 0)
51-
ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
52-
ZEND_END_ARG_INFO();
53-
54-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_remove_named_item_ns, 0, 0, 0)
55-
ZEND_ARG_INFO(0, namespaceURI)
56-
ZEND_ARG_INFO(0, localName)
57-
ZEND_END_ARG_INFO();
58-
5942
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_count, 0, 0, 0)
6043
ZEND_END_ARG_INFO();
6144
/* }}} */
@@ -69,12 +52,8 @@ ZEND_END_ARG_INFO();
6952

7053
const zend_function_entry php_dom_namednodemap_class_functions[] = { /* {{{ */
7154
PHP_FALIAS(getNamedItem, dom_namednodemap_get_named_item, arginfo_dom_namednodemap_get_named_item)
72-
PHP_FALIAS(setNamedItem, dom_namednodemap_set_named_item, arginfo_dom_namednodemap_set_named_item)
73-
PHP_FALIAS(removeNamedItem, dom_namednodemap_remove_named_item, arginfo_dom_namednodemap_remove_named_item)
7455
PHP_FALIAS(item, dom_namednodemap_item, arginfo_dom_namednodemap_item)
7556
PHP_FALIAS(getNamedItemNS, dom_namednodemap_get_named_item_ns, arginfo_dom_namednodemap_get_named_item_ns)
76-
PHP_FALIAS(setNamedItemNS, dom_namednodemap_set_named_item_ns, arginfo_dom_namednodemap_set_named_item_ns)
77-
PHP_FALIAS(removeNamedItemNS, dom_namednodemap_remove_named_item_ns, arginfo_dom_namednodemap_remove_named_item_ns)
7857
PHP_FALIAS(count, dom_namednodemap_count, arginfo_dom_namednodemap_count)
7958
PHP_FE_END
8059
};
@@ -177,26 +156,6 @@ PHP_FUNCTION(dom_namednodemap_get_named_item)
177156
}
178157
/* }}} end dom_namednodemap_get_named_item */
179158

180-
/* {{{ proto DOMNode dom_namednodemap_set_named_item(DOMNode arg);
181-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1025163788
182-
Since:
183-
*/
184-
PHP_FUNCTION(dom_namednodemap_set_named_item)
185-
{
186-
DOM_NOT_IMPLEMENTED();
187-
}
188-
/* }}} end dom_namednodemap_set_named_item */
189-
190-
/* {{{ proto DOMNode dom_namednodemap_remove_named_item(string name);
191-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D58B193
192-
Since:
193-
*/
194-
PHP_FUNCTION(dom_namednodemap_remove_named_item)
195-
{
196-
DOM_NOT_IMPLEMENTED();
197-
}
198-
/* }}} end dom_namednodemap_remove_named_item */
199-
200159
/* {{{ proto DOMNode dom_namednodemap_item(int index);
201160
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9
202161
Since:
@@ -317,26 +276,6 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns)
317276
}
318277
/* }}} end dom_namednodemap_get_named_item_ns */
319278

320-
/* {{{ proto DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg);
321-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-setNamedItemNS
322-
Since: DOM Level 2
323-
*/
324-
PHP_FUNCTION(dom_namednodemap_set_named_item_ns)
325-
{
326-
DOM_NOT_IMPLEMENTED();
327-
}
328-
/* }}} end dom_namednodemap_set_named_item_ns */
329-
330-
/* {{{ proto DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName);
331-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-removeNamedItemNS
332-
Since: DOM Level 2
333-
*/
334-
PHP_FUNCTION(dom_namednodemap_remove_named_item_ns)
335-
{
336-
DOM_NOT_IMPLEMENTED();
337-
}
338-
/* }}} end dom_namednodemap_remove_named_item_ns */
339-
340279
/* {{{ proto int|bool dom_namednodemap_count();
341280
*/
342281
PHP_FUNCTION(dom_namednodemap_count)

‎ext/dom/node.c

-63
Original file line numberDiff line numberDiff line change
@@ -82,25 +82,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1)
8282
ZEND_ARG_INFO(0, prefix)
8383
ZEND_END_ARG_INFO();
8484

85-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1)
86-
ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
87-
ZEND_END_ARG_INFO();
88-
89-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2)
90-
ZEND_ARG_INFO(0, feature)
91-
ZEND_ARG_INFO(0, version)
92-
ZEND_END_ARG_INFO();
93-
94-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
95-
ZEND_ARG_INFO(0, key)
96-
ZEND_ARG_INFO(0, data)
97-
ZEND_ARG_INFO(0, handler)
98-
ZEND_END_ARG_INFO();
99-
100-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1)
101-
ZEND_ARG_INFO(0, key)
102-
ZEND_END_ARG_INFO();
103-
10485
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0)
10586
ZEND_END_ARG_INFO();
10687

@@ -145,10 +126,6 @@ const zend_function_entry php_dom_node_class_functions[] = { /* {{{ */
145126
PHP_FALIAS(lookupPrefix, dom_node_lookup_prefix, arginfo_dom_node_lookup_prefix)
146127
PHP_FALIAS(isDefaultNamespace, dom_node_is_default_namespace, arginfo_dom_node_is_default_namespace)
147128
PHP_FALIAS(lookupNamespaceUri, dom_node_lookup_namespace_uri, arginfo_dom_node_lookup_namespace_uri)
148-
PHP_FALIAS(isEqualNode, dom_node_is_equal_node, arginfo_dom_node_is_equal_node)
149-
PHP_FALIAS(getFeature, dom_node_get_feature, arginfo_dom_node_get_feature)
150-
PHP_FALIAS(setUserData, dom_node_set_user_data, arginfo_dom_node_set_user_data)
151-
PHP_FALIAS(getUserData, dom_node_get_user_data, arginfo_dom_node_get_user_data)
152129
PHP_ME(domnode, getNodePath, arginfo_dom_node_getNodePath, ZEND_ACC_PUBLIC)
153130
PHP_ME(domnode, getLineNo, arginfo_dom_node_getLineNo, ZEND_ACC_PUBLIC)
154131
PHP_ME(domnode, C14N, arginfo_dom_node_C14N, ZEND_ACC_PUBLIC)
@@ -1654,46 +1631,6 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri)
16541631
}
16551632
/* }}} end dom_node_lookup_namespace_uri */
16561633

1657-
/* {{{ proto bool dom_node_is_equal_node(DomNode arg);
1658-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isEqualNode
1659-
Since: DOM Level 3
1660-
*/
1661-
PHP_FUNCTION(dom_node_is_equal_node)
1662-
{
1663-
DOM_NOT_IMPLEMENTED();
1664-
}
1665-
/* }}} end dom_node_is_equal_node */
1666-
1667-
/* {{{ proto DomNode dom_node_get_feature(string feature, string version);
1668-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getFeature
1669-
Since: DOM Level 3
1670-
*/
1671-
PHP_FUNCTION(dom_node_get_feature)
1672-
{
1673-
DOM_NOT_IMPLEMENTED();
1674-
}
1675-
/* }}} end dom_node_get_feature */
1676-
1677-
/* {{{ proto mixed dom_node_set_user_data(string key, mixed data, userdatahandler handler);
1678-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData
1679-
Since: DOM Level 3
1680-
*/
1681-
PHP_FUNCTION(dom_node_set_user_data)
1682-
{
1683-
DOM_NOT_IMPLEMENTED();
1684-
}
1685-
/* }}} end dom_node_set_user_data */
1686-
1687-
/* {{{ proto mixed dom_node_get_user_data(string key);
1688-
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData
1689-
Since: DOM Level 3
1690-
*/
1691-
PHP_FUNCTION(dom_node_get_user_data)
1692-
{
1693-
DOM_NOT_IMPLEMENTED();
1694-
}
1695-
/* }}} end dom_node_get_user_data */
1696-
16971634
static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
16981635
{
16991636
zval *id;

0 commit comments

Comments
 (0)
Please sign in to comment.