diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-01 16:48:15 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-01 16:48:15 +0300 |
| commit | 780a8123fe11ef255b264b18b3482cc1a0810d61 (patch) | |
| tree | 3259762c08b323525eb2663a3ebc0fcaf110c4f7 /Zend/zend_execute_API.c | |
| parent | 0cad725886dc620632f3aa413c1e944411465cd0 (diff) | |
| download | php-git-780a8123fe11ef255b264b18b3482cc1a0810d61.tar.gz | |
Convert fatal errors into EngineExceptions
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index dcf972b8be..fc212dbbd7 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -774,7 +774,8 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / if (func->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) { if (func->common.fn_flags & ZEND_ACC_ABSTRACT) { - zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", func->common.scope->name->val, func->common.function_name->val); + zend_error(E_EXCEPTION | E_ERROR, "Cannot call abstract method %s::%s()", func->common.scope->name->val, func->common.function_name->val); + return FAILURE; } if (func->common.fn_flags & ZEND_ACC_DEPRECATED) { zend_error(E_DEPRECATED, "Function %s%s%s() is deprecated", @@ -919,7 +920,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / fci->object->handlers->call_method(func->common.function_name, fci->object, call, fci->retval); EG(current_execute_data) = call->prev_execute_data; } else { - zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object"); + zend_error(E_EXCEPTION | E_ERROR, "Cannot call overloaded function for non-object"); } zend_vm_stack_free_args(call); |