From 122d759618a42bff105971b923fbbb5be02e34b9 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 2 Apr 2015 18:52:32 +0200 Subject: Always throw TypeException on throwing zpp failures Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to report FAILURE errors using a TypeException instead of a Warning, like it would happen in strict mode. Adds a zend_parse_parameters_throw() convenience function, which invokes zpp with this flag. Converts all cases I could identify, where we currently have throwing zpp usage in constructors and replaces them with this API. Error handling is still replaced to EH_THROW in some cases to handle other, domain-specific errors in constructors. --- ext/dom/comment.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'ext/dom/comment.c') diff --git a/ext/dom/comment.c b/ext/dom/comment.c index 01ed295e47..4dc016ae3b 100644 --- a/ext/dom/comment.c +++ b/ext/dom/comment.c @@ -50,20 +50,16 @@ const zend_function_entry php_dom_comment_class_functions[] = { PHP_METHOD(domcomment, __construct) { - zval *id; + zval *id = getThis(); xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; size_t value_len; - zend_error_handling error_handling; - zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling); - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|s", &id, dom_comment_class_entry, &value, &value_len) == FAILURE) { - zend_restore_error_handling(&error_handling); + if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|s", &value, &value_len) == FAILURE) { return; } - zend_restore_error_handling(&error_handling); nodep = xmlNewComment((xmlChar *) value); if (!nodep) { -- cgit v1.2.1