Skip to content

Commit 25bfac4

Browse files
beberleibeberlei
committed
Cleanup ext/dom: Removal of unimplemented dummy classes.
The following classes were registered in ext/dom but neither documented nor had any behavior (only test data). These classes are now removed: - DOMNameList - DomImplementationList - DOMConfiguration - DomError - DomErrorHandler - DOMImplementationSource - DOMLocator - DOMUserDataHandler - DOMTypeInfo
1 parent 07d0ebb commit 25bfac4

15 files changed

+12
-887
lines changed

‎ext/dom/config.m4

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ if test "$PHP_DOM" != "no"; then
1212

1313
PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [
1414
AC_DEFINE(HAVE_DOM,1,[ ])
15-
PHP_NEW_EXTENSION(dom, [php_dom.c attr.c document.c domerrorhandler.c \
16-
domstringlist.c domexception.c namelist.c \
15+
PHP_NEW_EXTENSION(dom, [php_dom.c attr.c document.c \
16+
domstringlist.c domexception.c \
1717
processinginstruction.c cdatasection.c \
1818
documentfragment.c domimplementation.c \
1919
element.c node.c string_extend.c characterdata.c \
20-
documenttype.c domimplementationlist.c entity.c \
21-
nodelist.c text.c comment.c domconfiguration.c \
22-
domimplementationsource.c entityreference.c \
20+
documenttype.c entity.c \
21+
nodelist.c text.c comment.c \
22+
entityreference.c \
2323
notation.c xpath.c dom_iterators.c \
24-
typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c],
24+
namednodemap.c],
2525
$ext_shared)
2626
PHP_SUBST(DOM_SHARED_LIBADD)
2727
PHP_INSTALL_HEADERS([ext/dom/xml_common.h])

‎ext/dom/config.w32

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ if (PHP_DOM == "yes") {
77
ADD_EXTENSION_DEP('dom', 'libxml') &&
88
CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_DOM", PHP_PHP_BUILD + "\\include\\libxml2")
99
) {
10-
EXTENSION("dom", "php_dom.c attr.c document.c domerrorhandler.c \
11-
domstringlist.c domexception.c namelist.c processinginstruction.c \
10+
EXTENSION("dom", "php_dom.c attr.c document.c \
11+
domstringlist.c domexception.c processinginstruction.c \
1212
cdatasection.c documentfragment.c domimplementation.c element.c \
1313
node.c string_extend.c characterdata.c documenttype.c \
14-
domimplementationlist.c entity.c nodelist.c text.c comment.c \
15-
domconfiguration.c domimplementationsource.c entityreference.c \
16-
notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \
17-
domlocator.c namednodemap.c userdatahandler.c");
14+
entity.c nodelist.c text.c comment.c \
15+
entityreference.c \
16+
notation.c xpath.c dom_iterators.c \
17+
namednodemap.c");
1818

1919
AC_DEFINE("HAVE_DOM", 1, "DOM support");
2020

‎ext/dom/dom_ce.h

-9
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
extern PHP_DOM_EXPORT zend_class_entry *dom_node_class_entry;
2424
extern PHP_DOM_EXPORT zend_class_entry *dom_domexception_class_entry;
2525
extern PHP_DOM_EXPORT zend_class_entry *dom_domstringlist_class_entry;
26-
extern PHP_DOM_EXPORT zend_class_entry *dom_namelist_class_entry;
27-
extern PHP_DOM_EXPORT zend_class_entry *dom_domimplementationlist_class_entry;
28-
extern PHP_DOM_EXPORT zend_class_entry *dom_domimplementationsource_class_entry;
2926
extern PHP_DOM_EXPORT zend_class_entry *dom_domimplementation_class_entry;
3027
extern PHP_DOM_EXPORT zend_class_entry *dom_documentfragment_class_entry;
3128
extern PHP_DOM_EXPORT zend_class_entry *dom_document_class_entry;
@@ -36,12 +33,6 @@ extern PHP_DOM_EXPORT zend_class_entry *dom_attr_class_entry;
3633
extern PHP_DOM_EXPORT zend_class_entry *dom_element_class_entry;
3734
extern PHP_DOM_EXPORT zend_class_entry *dom_text_class_entry;
3835
extern PHP_DOM_EXPORT zend_class_entry *dom_comment_class_entry;
39-
extern PHP_DOM_EXPORT zend_class_entry *dom_typeinfo_class_entry;
40-
extern PHP_DOM_EXPORT zend_class_entry *dom_userdatahandler_class_entry;
41-
extern PHP_DOM_EXPORT zend_class_entry *dom_domerror_class_entry;
42-
extern PHP_DOM_EXPORT zend_class_entry *dom_domerrorhandler_class_entry;
43-
extern PHP_DOM_EXPORT zend_class_entry *dom_domlocator_class_entry;
44-
extern PHP_DOM_EXPORT zend_class_entry *dom_domconfiguration_class_entry;
4536
extern PHP_DOM_EXPORT zend_class_entry *dom_cdatasection_class_entry;
4637
extern PHP_DOM_EXPORT zend_class_entry *dom_documenttype_class_entry;
4738
extern PHP_DOM_EXPORT zend_class_entry *dom_notation_class_entry;

‎ext/dom/dom_fe.h

-37
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222

2323
extern const zend_function_entry php_dom_domexception_class_functions[];
2424
extern const zend_function_entry php_dom_domstringlist_class_functions[];
25-
extern const zend_function_entry php_dom_namelist_class_functions[];
26-
extern const zend_function_entry php_dom_domimplementationlist_class_functions[];
27-
extern const zend_function_entry php_dom_domimplementationsource_class_functions[];
2825
extern const zend_function_entry php_dom_domimplementation_class_functions[];
2926
extern const zend_function_entry php_dom_documentfragment_class_functions[];
3027
extern const zend_function_entry php_dom_document_class_functions[];
@@ -36,12 +33,6 @@ extern const zend_function_entry php_dom_attr_class_functions[];
3633
extern const zend_function_entry php_dom_element_class_functions[];
3734
extern const zend_function_entry php_dom_text_class_functions[];
3835
extern const zend_function_entry php_dom_comment_class_functions[];
39-
extern const zend_function_entry php_dom_typeinfo_class_functions[];
40-
extern const zend_function_entry php_dom_userdatahandler_class_functions[];
41-
extern const zend_function_entry php_dom_domerror_class_functions[];
42-
extern const zend_function_entry php_dom_domerrorhandler_class_functions[];
43-
extern const zend_function_entry php_dom_domlocator_class_functions[];
44-
extern const zend_function_entry php_dom_domconfiguration_class_functions[];
4536
extern const zend_function_entry php_dom_cdatasection_class_functions[];
4637
extern const zend_function_entry php_dom_documenttype_class_functions[];
4738
extern const zend_function_entry php_dom_notation_class_functions[];
@@ -82,17 +73,6 @@ typedef enum {
8273
/* domstringlist methods */
8374
PHP_FUNCTION(dom_domstringlist_item);
8475

85-
/* domnamelist methods */
86-
PHP_FUNCTION(dom_namelist_get_name);
87-
PHP_FUNCTION(dom_namelist_get_namespace_uri);
88-
89-
/* domimplementationlist methods */
90-
PHP_FUNCTION(dom_domimplementationlist_item);
91-
92-
/* domimplementationsource methods */
93-
PHP_FUNCTION(dom_domimplementationsource_get_domimplementation);
94-
PHP_FUNCTION(dom_domimplementationsource_get_domimplementations);
95-
9676
/* domimplementation methods */
9777
PHP_METHOD(domimplementation, hasFeature);
9878
PHP_METHOD(domimplementation, createDocumentType);
@@ -224,23 +204,6 @@ PHP_METHOD(domtext, __construct);
224204
/* domcomment methods */
225205
PHP_METHOD(domcomment, __construct);
226206

227-
/* domtypeinfo methods */
228-
229-
/* domuserdatahandler methods */
230-
PHP_FUNCTION(dom_userdatahandler_handle);
231-
232-
/* domdomerror methods */
233-
234-
/* domerrorhandler methods */
235-
PHP_FUNCTION(dom_domerrorhandler_handle_error);
236-
237-
/* domlocator methods */
238-
239-
/* domconfiguration methods */
240-
PHP_FUNCTION(dom_domconfiguration_set_parameter);
241-
PHP_FUNCTION(dom_domconfiguration_get_parameter);
242-
PHP_FUNCTION(dom_domconfiguration_can_set_parameter);
243-
244207
/* domcdatasection methods */
245208
PHP_METHOD(domcdatasection, __construct);
246209

‎ext/dom/dom_properties.h

-25
Original file line numberDiff line numberDiff line change
@@ -71,24 +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-
/* domerror properties */
75-
int dom_domerror_severity_read(dom_object *obj, zval *retval);
76-
int dom_domerror_message_read(dom_object *obj, zval *retval);
77-
int dom_domerror_type_read(dom_object *obj, zval *retval);
78-
int dom_domerror_related_exception_read(dom_object *obj, zval *retval);
79-
int dom_domerror_related_data_read(dom_object *obj, zval *retval);
80-
int dom_domerror_location_read(dom_object *obj, zval *retval);
81-
82-
/* domimplementationlist properties */
83-
int dom_domimplementationlist_length_read(dom_object *obj, zval *retval);
84-
85-
/* domlocator properties */
86-
int dom_domlocator_line_number_read(dom_object *obj, zval *retval);
87-
int dom_domlocator_column_number_read(dom_object *obj, zval *retval);
88-
int dom_domlocator_offset_read(dom_object *obj, zval *retval);
89-
int dom_domlocator_related_node_read(dom_object *obj, zval *retval);
90-
int dom_domlocator_uri_read(dom_object *obj, zval *retval);
91-
9274
/* domstringlist properties */
9375
int dom_domstringlist_length_read(dom_object *obj, zval *retval);
9476

@@ -110,9 +92,6 @@ int dom_entity_version_write(dom_object *obj, zval *newval);
11092
/* namednodemap properties */
11193
int dom_namednodemap_length_read(dom_object *obj, zval *retval);
11294

113-
/* namelist properties */
114-
int dom_namelist_length_read(dom_object *obj, zval *retval);
115-
11695
/* node properties */
11796
int dom_node_node_name_read(dom_object *obj, zval *retval);
11897
int dom_node_node_value_read(dom_object *obj, zval *retval);
@@ -151,10 +130,6 @@ int dom_processinginstruction_data_write(dom_object *obj, zval *newval);
151130
/* text properties */
152131
int dom_text_whole_text_read(dom_object *obj, zval *retval);
153132

154-
/* typeinfo properties */
155-
int dom_typeinfo_type_name_read(dom_object *obj, zval *retval);
156-
int dom_typeinfo_type_namespace_read(dom_object *obj, zval *retval);
157-
158133
#if defined(LIBXML_XPATH_ENABLED)
159134
/* xpath properties */
160135
int dom_xpath_document_read(dom_object *obj, zval *retval);

‎ext/dom/domconfiguration.c

-92
This file was deleted.

‎ext/dom/domerror.c

-122
This file was deleted.

0 commit comments

Comments
 (0)