diff options
Diffstat (limited to 'ext/dom/text.c')
| -rw-r--r-- | ext/dom/text.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/ext/dom/text.c b/ext/dom/text.c index 6e2773356f..168d06d8f4 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | 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 | @@ -62,8 +62,6 @@ const zend_function_entry php_dom_text_class_functions[] = { /* {{{ proto DOMText::__construct([string value]); */ PHP_METHOD(domtext, __construct) { - - zval *id = getThis(); xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; @@ -80,7 +78,7 @@ PHP_METHOD(domtext, __construct) RETURN_FALSE; } - intern = Z_DOMOBJ_P(id); + intern = Z_DOMOBJ_P(ZEND_THIS); if (intern != NULL) { oldnode = dom_object_get_node(intern); if (oldnode != NULL) { @@ -147,7 +145,8 @@ PHP_FUNCTION(dom_text_split_text) int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &id, dom_text_class_entry, &offset) == FAILURE) { + id = ZEND_THIS; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &offset) == FAILURE) { return; } DOM_GET_OBJ(node, id, xmlNodePtr, intern); @@ -202,7 +201,8 @@ PHP_FUNCTION(dom_text_is_whitespace_in_element_content) xmlNodePtr node; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_text_class_entry) == FAILURE) { + id = ZEND_THIS; + if (zend_parse_parameters_none() == FAILURE) { return; } DOM_GET_OBJ(node, id, xmlNodePtr, intern); @@ -226,12 +226,3 @@ PHP_FUNCTION(dom_text_replace_whole_text) /* }}} end dom_text_replace_whole_text */ #endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ |