From cece93952647bdeb6dab567bb073e7a93797f32f Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 22 Sep 2019 23:15:18 +0200 Subject: [PATCH] Cleanup ext/dom: Additional unimplemented code following 25bfac4 --- ext/dom/config.m4 | 4 +-- ext/dom/config.w32 | 4 +-- ext/dom/document.c | 17 --------- ext/dom/dom_ce.h | 2 -- ext/dom/dom_fe.h | 9 ----- ext/dom/dom_properties.h | 3 -- ext/dom/domstringlist.c | 73 -------------------------------------- ext/dom/namednodemap.c | 61 -------------------------------- ext/dom/node.c | 63 --------------------------------- ext/dom/php_dom.c | 12 ------- ext/dom/string_extend.c | 75 ---------------------------------------- ext/dom/text.c | 15 -------- 12 files changed, 4 insertions(+), 334 deletions(-) delete mode 100644 ext/dom/domstringlist.c delete mode 100644 ext/dom/string_extend.c diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 index 25290b1764..de3b54da4c 100644 --- a/ext/dom/config.m4 +++ b/ext/dom/config.m4 @@ -13,10 +13,10 @@ if test "$PHP_DOM" != "no"; then PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [ AC_DEFINE(HAVE_DOM,1,[ ]) PHP_NEW_EXTENSION(dom, [php_dom.c attr.c document.c \ - domstringlist.c domexception.c \ + domexception.c \ processinginstruction.c cdatasection.c \ documentfragment.c domimplementation.c \ - element.c node.c string_extend.c characterdata.c \ + element.c node.c characterdata.c \ documenttype.c entity.c \ nodelist.c text.c comment.c \ entityreference.c \ diff --git a/ext/dom/config.w32 b/ext/dom/config.w32 index 7fe5525cf5..cd5f5a6cb8 100644 --- a/ext/dom/config.w32 +++ b/ext/dom/config.w32 @@ -8,9 +8,9 @@ if (PHP_DOM == "yes") { CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_DOM", PHP_PHP_BUILD + "\\include\\libxml2") ) { EXTENSION("dom", "php_dom.c attr.c document.c \ - domstringlist.c domexception.c processinginstruction.c \ + domexception.c processinginstruction.c \ cdatasection.c documentfragment.c domimplementation.c element.c \ - node.c string_extend.c characterdata.c documenttype.c \ + node.c characterdata.c documenttype.c \ entity.c nodelist.c text.c comment.c \ entityreference.c \ notation.c xpath.c dom_iterators.c \ diff --git a/ext/dom/document.c b/ext/dom/document.c index 472e64673f..4b798ba868 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -109,12 +109,6 @@ ZEND_END_ARG_INFO(); ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_normalize_document, 0, 0, 0) ZEND_END_ARG_INFO(); -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_rename_node, 0, 0, 3) - ZEND_ARG_OBJ_INFO(0, node, DOMNode, 0) - ZEND_ARG_INFO(0, namespaceURI) - ZEND_ARG_INFO(0, qualifiedName) -ZEND_END_ARG_INFO(); - ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_load, 0, 0, 1) ZEND_ARG_INFO(0, source) ZEND_ARG_INFO(0, options) @@ -209,7 +203,6 @@ const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */ PHP_FALIAS(getElementById, dom_document_get_element_by_id, arginfo_dom_document_get_element_by_id) PHP_FALIAS(adoptNode, dom_document_adopt_node, arginfo_dom_document_adopt_node) PHP_FALIAS(normalizeDocument, dom_document_normalize_document, arginfo_dom_document_normalize_document) - PHP_FALIAS(renameNode, dom_document_rename_node, arginfo_dom_document_rename_node) PHP_ME(domdocument, load, arginfo_dom_document_load, ZEND_ACC_PUBLIC) PHP_FALIAS(save, dom_document_save, arginfo_dom_document_save) PHP_ME(domdocument, loadXML, arginfo_dom_document_loadxml, ZEND_ACC_PUBLIC) @@ -1262,16 +1255,6 @@ PHP_FUNCTION(dom_document_normalize_document) } /* }}} end dom_document_normalize_document */ -/* {{{ proto DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode -Since: DOM Level 3 -*/ -PHP_FUNCTION(dom_document_rename_node) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_document_rename_node */ - /* {{{ proto DOMDocument::__construct([string version], [string encoding]); */ PHP_METHOD(domdocument, __construct) { diff --git a/ext/dom/dom_ce.h b/ext/dom/dom_ce.h index 35b6e71835..450aec1133 100644 --- a/ext/dom/dom_ce.h +++ b/ext/dom/dom_ce.h @@ -22,7 +22,6 @@ extern PHP_DOM_EXPORT zend_class_entry *dom_node_class_entry; extern PHP_DOM_EXPORT zend_class_entry *dom_domexception_class_entry; -extern PHP_DOM_EXPORT zend_class_entry *dom_domstringlist_class_entry; extern PHP_DOM_EXPORT zend_class_entry *dom_domimplementation_class_entry; extern PHP_DOM_EXPORT zend_class_entry *dom_documentfragment_class_entry; 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; extern PHP_DOM_EXPORT zend_class_entry *dom_entity_class_entry; extern PHP_DOM_EXPORT zend_class_entry *dom_entityreference_class_entry; extern PHP_DOM_EXPORT zend_class_entry *dom_processinginstruction_class_entry; -extern PHP_DOM_EXPORT zend_class_entry *dom_string_extend_class_entry; #if defined(LIBXML_XPATH_ENABLED) extern PHP_DOM_EXPORT zend_class_entry *dom_xpath_class_entry; #endif diff --git a/ext/dom/dom_fe.h b/ext/dom/dom_fe.h index c22c995adc..b9d6e387c6 100644 --- a/ext/dom/dom_fe.h +++ b/ext/dom/dom_fe.h @@ -21,7 +21,6 @@ #define DOM_FE_H extern const zend_function_entry php_dom_domexception_class_functions[]; -extern const zend_function_entry php_dom_domstringlist_class_functions[]; extern const zend_function_entry php_dom_domimplementation_class_functions[]; extern const zend_function_entry php_dom_documentfragment_class_functions[]; extern const zend_function_entry php_dom_document_class_functions[]; @@ -39,7 +38,6 @@ extern const zend_function_entry php_dom_notation_class_functions[]; extern const zend_function_entry php_dom_entity_class_functions[]; extern const zend_function_entry php_dom_entityreference_class_functions[]; extern const zend_function_entry php_dom_processinginstruction_class_functions[]; -extern const zend_function_entry php_dom_string_extend_class_functions[]; extern const zend_function_entry php_dom_xpath_class_functions[]; /* domexception errors */ @@ -70,9 +68,6 @@ typedef enum { VALIDATION_ERR = 16 } dom_exception_code; -/* domstringlist methods */ -PHP_FUNCTION(dom_domstringlist_item); - /* domimplementation methods */ PHP_METHOD(domimplementation, hasFeature); PHP_METHOD(domimplementation, createDocumentType); @@ -219,10 +214,6 @@ PHP_METHOD(domentityreference, __construct); /* domprocessinginstruction methods */ PHP_METHOD(domprocessinginstruction, __construct); -/* string_extend methods */ -PHP_FUNCTION(dom_string_extend_find_offset16); -PHP_FUNCTION(dom_string_extend_find_offset32); - #if defined(LIBXML_XPATH_ENABLED) /* xpath methods */ PHP_METHOD(domxpath, __construct); diff --git a/ext/dom/dom_properties.h b/ext/dom/dom_properties.h index 9571d73c02..892137b169 100644 --- a/ext/dom/dom_properties.h +++ b/ext/dom/dom_properties.h @@ -71,9 +71,6 @@ int dom_documenttype_public_id_read(dom_object *obj, zval *retval); int dom_documenttype_system_id_read(dom_object *obj, zval *retval); int dom_documenttype_internal_subset_read(dom_object *obj, zval *retval); -/* domstringlist properties */ -int dom_domstringlist_length_read(dom_object *obj, zval *retval); - /* element properties */ int dom_element_tag_name_read(dom_object *obj, zval *retval); int dom_element_schema_type_info_read(dom_object *obj, zval *retval); diff --git a/ext/dom/domstringlist.c b/ext/dom/domstringlist.c deleted file mode 100644 index 224b924c1a..0000000000 --- a/ext/dom/domstringlist.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Christian Stocker | - | Rob Richards | - +----------------------------------------------------------------------+ -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" -#if HAVE_LIBXML && HAVE_DOM -#include "php_dom.h" - -/* {{{ arginfo */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_stringlist_item, 0, 0, 1) - ZEND_ARG_INFO(0, index) -ZEND_END_ARG_INFO(); -/* }}} */ - -/* -* class domstringlist -* -* URL: https://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList -* Since: DOM Level 3 -*/ - -const zend_function_entry php_dom_domstringlist_class_functions[] = { - PHP_FALIAS(item, dom_domstringlist_item, arginfo_dom_stringlist_item) - PHP_FE_END -}; - -/* {{{ attribute protos, not implemented yet */ - -/* {{{ length unsigned long -readonly=yes -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-length -Since: -*/ -int dom_domstringlist_length_read(dom_object *obj, zval *retval) -{ - ZVAL_STRING(retval, "TEST"); - return SUCCESS; -} - -/* }}} */ - -/* {{{ proto domstring dom_domstringlist_item(int index); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-item -Since: -*/ -PHP_FUNCTION(dom_domstringlist_item) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_domstringlist_item */ - -/* }}} */ - -#endif diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index 4b8df2734f..0c00f25748 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -30,14 +30,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item, 0, 0, 1) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO(); -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_set_named_item, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0) -ZEND_END_ARG_INFO(); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_remove_named_item, 0, 0, 0) - ZEND_ARG_INFO(0, name) -ZEND_END_ARG_INFO(); - ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_item, 0, 0, 0) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); @@ -47,15 +39,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item_ns, 0, 0, 0) ZEND_ARG_INFO(0, localName) ZEND_END_ARG_INFO(); -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_set_named_item_ns, 0, 0, 0) - ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0) -ZEND_END_ARG_INFO(); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_remove_named_item_ns, 0, 0, 0) - ZEND_ARG_INFO(0, namespaceURI) - ZEND_ARG_INFO(0, localName) -ZEND_END_ARG_INFO(); - ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_count, 0, 0, 0) ZEND_END_ARG_INFO(); /* }}} */ @@ -69,12 +52,8 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_namednodemap_class_functions[] = { /* {{{ */ PHP_FALIAS(getNamedItem, dom_namednodemap_get_named_item, arginfo_dom_namednodemap_get_named_item) - PHP_FALIAS(setNamedItem, dom_namednodemap_set_named_item, arginfo_dom_namednodemap_set_named_item) - PHP_FALIAS(removeNamedItem, dom_namednodemap_remove_named_item, arginfo_dom_namednodemap_remove_named_item) PHP_FALIAS(item, dom_namednodemap_item, arginfo_dom_namednodemap_item) PHP_FALIAS(getNamedItemNS, dom_namednodemap_get_named_item_ns, arginfo_dom_namednodemap_get_named_item_ns) - PHP_FALIAS(setNamedItemNS, dom_namednodemap_set_named_item_ns, arginfo_dom_namednodemap_set_named_item_ns) - PHP_FALIAS(removeNamedItemNS, dom_namednodemap_remove_named_item_ns, arginfo_dom_namednodemap_remove_named_item_ns) PHP_FALIAS(count, dom_namednodemap_count, arginfo_dom_namednodemap_count) PHP_FE_END }; @@ -177,26 +156,6 @@ PHP_FUNCTION(dom_namednodemap_get_named_item) } /* }}} end dom_namednodemap_get_named_item */ -/* {{{ proto DOMNode dom_namednodemap_set_named_item(DOMNode arg); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1025163788 -Since: -*/ -PHP_FUNCTION(dom_namednodemap_set_named_item) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_namednodemap_set_named_item */ - -/* {{{ proto DOMNode dom_namednodemap_remove_named_item(string name); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D58B193 -Since: -*/ -PHP_FUNCTION(dom_namednodemap_remove_named_item) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_namednodemap_remove_named_item */ - /* {{{ proto DOMNode dom_namednodemap_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9 Since: @@ -317,26 +276,6 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns) } /* }}} end dom_namednodemap_get_named_item_ns */ -/* {{{ proto DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-setNamedItemNS -Since: DOM Level 2 -*/ -PHP_FUNCTION(dom_namednodemap_set_named_item_ns) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_namednodemap_set_named_item_ns */ - -/* {{{ proto DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-removeNamedItemNS -Since: DOM Level 2 -*/ -PHP_FUNCTION(dom_namednodemap_remove_named_item_ns) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_namednodemap_remove_named_item_ns */ - /* {{{ proto int|bool dom_namednodemap_count(); */ PHP_FUNCTION(dom_namednodemap_count) diff --git a/ext/dom/node.c b/ext/dom/node.c index 51153b7a33..3fc8d9a3cd 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -82,25 +82,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1) ZEND_ARG_INFO(0, prefix) ZEND_END_ARG_INFO(); -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0) -ZEND_END_ARG_INFO(); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2) - ZEND_ARG_INFO(0, feature) - ZEND_ARG_INFO(0, version) -ZEND_END_ARG_INFO(); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3) - ZEND_ARG_INFO(0, key) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, handler) -ZEND_END_ARG_INFO(); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1) - ZEND_ARG_INFO(0, key) -ZEND_END_ARG_INFO(); - ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0) ZEND_END_ARG_INFO(); @@ -145,10 +126,6 @@ const zend_function_entry php_dom_node_class_functions[] = { /* {{{ */ PHP_FALIAS(lookupPrefix, dom_node_lookup_prefix, arginfo_dom_node_lookup_prefix) PHP_FALIAS(isDefaultNamespace, dom_node_is_default_namespace, arginfo_dom_node_is_default_namespace) PHP_FALIAS(lookupNamespaceUri, dom_node_lookup_namespace_uri, arginfo_dom_node_lookup_namespace_uri) - PHP_FALIAS(isEqualNode, dom_node_is_equal_node, arginfo_dom_node_is_equal_node) - PHP_FALIAS(getFeature, dom_node_get_feature, arginfo_dom_node_get_feature) - PHP_FALIAS(setUserData, dom_node_set_user_data, arginfo_dom_node_set_user_data) - PHP_FALIAS(getUserData, dom_node_get_user_data, arginfo_dom_node_get_user_data) PHP_ME(domnode, getNodePath, arginfo_dom_node_getNodePath, ZEND_ACC_PUBLIC) PHP_ME(domnode, getLineNo, arginfo_dom_node_getLineNo, ZEND_ACC_PUBLIC) PHP_ME(domnode, C14N, arginfo_dom_node_C14N, ZEND_ACC_PUBLIC) @@ -1654,46 +1631,6 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri) } /* }}} end dom_node_lookup_namespace_uri */ -/* {{{ proto bool dom_node_is_equal_node(DomNode arg); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isEqualNode -Since: DOM Level 3 -*/ -PHP_FUNCTION(dom_node_is_equal_node) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_node_is_equal_node */ - -/* {{{ proto DomNode dom_node_get_feature(string feature, string version); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getFeature -Since: DOM Level 3 -*/ -PHP_FUNCTION(dom_node_get_feature) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_node_get_feature */ - -/* {{{ proto mixed dom_node_set_user_data(string key, mixed data, userdatahandler handler); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData -Since: DOM Level 3 -*/ -PHP_FUNCTION(dom_node_set_user_data) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_node_set_user_data */ - -/* {{{ proto mixed dom_node_get_user_data(string key); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData -Since: DOM Level 3 -*/ -PHP_FUNCTION(dom_node_get_user_data) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_node_get_user_data */ - static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ { zval *id; diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 4c0773f186..7f3e7debdf 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -36,7 +36,6 @@ /* {{{ class entries */ PHP_DOM_EXPORT zend_class_entry *dom_node_class_entry; PHP_DOM_EXPORT zend_class_entry *dom_domexception_class_entry; -PHP_DOM_EXPORT zend_class_entry *dom_domstringlist_class_entry; PHP_DOM_EXPORT zend_class_entry *dom_domimplementation_class_entry; PHP_DOM_EXPORT zend_class_entry *dom_documentfragment_class_entry; PHP_DOM_EXPORT zend_class_entry *dom_document_class_entry; @@ -53,7 +52,6 @@ PHP_DOM_EXPORT zend_class_entry *dom_notation_class_entry; PHP_DOM_EXPORT zend_class_entry *dom_entity_class_entry; PHP_DOM_EXPORT zend_class_entry *dom_entityreference_class_entry; PHP_DOM_EXPORT zend_class_entry *dom_processinginstruction_class_entry; -PHP_DOM_EXPORT zend_class_entry *dom_string_extend_class_entry; #if defined(LIBXML_XPATH_ENABLED) PHP_DOM_EXPORT zend_class_entry *dom_xpath_class_entry; #endif @@ -68,7 +66,6 @@ zend_object_handlers dom_xpath_object_handlers; static HashTable classes; /* {{{ prop handler tables */ -static HashTable dom_domstringlist_prop_handlers; static HashTable dom_document_prop_handlers; static HashTable dom_node_prop_handlers; static HashTable dom_nodelist_prop_handlers; @@ -595,12 +592,6 @@ PHP_MINIT_FUNCTION(dom) dom_domexception_class_entry->ce_flags |= ZEND_ACC_FINAL; zend_declare_property_long(dom_domexception_class_entry, "code", sizeof("code")-1, 0, ZEND_ACC_PUBLIC); - REGISTER_DOM_CLASS(ce, "DOMStringList", NULL, php_dom_domstringlist_class_functions, dom_domstringlist_class_entry); - - zend_hash_init(&dom_domstringlist_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1); - dom_register_prop_handler(&dom_domstringlist_prop_handlers, "length", sizeof("length")-1, dom_domstringlist_length_read, NULL); - zend_hash_add_ptr(&classes, ce.name, &dom_domstringlist_prop_handlers); - REGISTER_DOM_CLASS(ce, "DOMImplementation", NULL, php_dom_domimplementation_class_functions, dom_domimplementation_class_entry); REGISTER_DOM_CLASS(ce, "DOMNode", NULL, php_dom_node_class_functions, dom_node_class_entry); @@ -768,8 +759,6 @@ PHP_MINIT_FUNCTION(dom) zend_hash_merge(&dom_processinginstruction_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0); zend_hash_add_ptr(&classes, ce.name, &dom_processinginstruction_prop_handlers); - REGISTER_DOM_CLASS(ce, "DOMStringExtend", NULL, php_dom_string_extend_class_functions, dom_string_extend_class_entry); - #if defined(LIBXML_XPATH_ENABLED) memcpy(&dom_xpath_object_handlers, &dom_object_handlers, sizeof(zend_object_handlers)); dom_xpath_object_handlers.offset = XtOffsetOf(dom_xpath_object, dom) + XtOffsetOf(dom_object, std); @@ -867,7 +856,6 @@ PHP_MINFO_FUNCTION(dom) PHP_MSHUTDOWN_FUNCTION(dom) /* {{{ */ { - zend_hash_destroy(&dom_domstringlist_prop_handlers); zend_hash_destroy(&dom_document_prop_handlers); zend_hash_destroy(&dom_node_prop_handlers); zend_hash_destroy(&dom_namespace_node_prop_handlers); diff --git a/ext/dom/string_extend.c b/ext/dom/string_extend.c deleted file mode 100644 index ecc29b0dd6..0000000000 --- a/ext/dom/string_extend.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Christian Stocker | - | Rob Richards | - +----------------------------------------------------------------------+ -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" -#if HAVE_LIBXML && HAVE_DOM -#include "php_dom.h" - -/* {{{ arginfo */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset16, 0, 0, 1) - ZEND_ARG_INFO(0, offset32) -ZEND_END_ARG_INFO(); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset32, 0, 0, 1) - ZEND_ARG_INFO(0, offset16) -ZEND_END_ARG_INFO(); -/* }}} */ - -/* -* class domstringextend -* -* URL: https://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend -* Since: -*/ - -const zend_function_entry php_dom_string_extend_class_functions[] = { - PHP_FALIAS(findOffset16, dom_string_extend_find_offset16, arginfo_dom_string_extend_find_offset16) - PHP_FALIAS(findOffset32, dom_string_extend_find_offset32, arginfo_dom_string_extend_find_offset32) - PHP_FE_END -}; - -/* {{{ attribute protos, not implemented yet */ - -/* {{{ proto int dom_string_extend_find_offset16(int offset32); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset16 -Since: -*/ -PHP_FUNCTION(dom_string_extend_find_offset16) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_string_extend_find_offset16 */ - -/* {{{ proto int dom_string_extend_find_offset32(int offset16); -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset32 -Since: -*/ -PHP_FUNCTION(dom_string_extend_find_offset32) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_string_extend_find_offset32 */ - -/* }}} */ - -#endif diff --git a/ext/dom/text.c b/ext/dom/text.c index 168d06d8f4..8cae93da6e 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -34,10 +34,6 @@ ZEND_END_ARG_INFO(); ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_is_whitespace_in_element_content, 0, 0, 0) ZEND_END_ARG_INFO(); -ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_replace_whole_text, 0, 0, 1) - ZEND_ARG_INFO(0, content) -ZEND_END_ARG_INFO(); - ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_construct, 0, 0, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO(); @@ -54,7 +50,6 @@ const zend_function_entry php_dom_text_class_functions[] = { PHP_FALIAS(splitText, dom_text_split_text, arginfo_dom_text_split_text) PHP_FALIAS(isWhitespaceInElementContent, dom_text_is_whitespace_in_element_content, arginfo_dom_text_is_whitespace_in_element_content) PHP_FALIAS(isElementContentWhitespace, dom_text_is_whitespace_in_element_content, arginfo_dom_text_is_whitespace_in_element_content) - PHP_FALIAS(replaceWholeText, dom_text_replace_whole_text, arginfo_dom_text_replace_whole_text) PHP_ME(domtext, __construct, arginfo_dom_text_construct, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -215,14 +210,4 @@ PHP_FUNCTION(dom_text_is_whitespace_in_element_content) } /* }}} end dom_text_is_whitespace_in_element_content */ -/* {{{ proto DOMText dom_text_replace_whole_text(string content) -URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-replaceWholeText -Since: DOM Level 3 -*/ -PHP_FUNCTION(dom_text_replace_whole_text) -{ - DOM_NOT_IMPLEMENTED(); -} -/* }}} end dom_text_replace_whole_text */ - #endif -- 2.49.0