diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-01 20:01:57 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-01 20:01:57 +0300 |
| commit | ec760d8fffe7e6f56b458d477dd2dfdda73329ec (patch) | |
| tree | 77c80ced813698a78701de122aa52b115fcb2f9d /Zend/zend_objects.c | |
| parent | 0295d89d45e9f8693a11362cb993d7494edb107f (diff) | |
| download | php-git-ec760d8fffe7e6f56b458d477dd2dfdda73329ec.tar.gz | |
Convert fatal errors into EngineExceptions
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 6f95e440cc..ffdd9df573 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -84,7 +84,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object) if (object->ce != EG(scope)) { zend_class_entry *ce = object->ce; - zend_error(EG(current_execute_data) ? E_ERROR : E_WARNING, + zend_error(EG(current_execute_data) ? E_EXCEPTION | E_ERROR : E_WARNING, "Call to private %s::__destruct() from context '%s'%s", ce->name->val, EG(scope) ? EG(scope)->name->val : "", @@ -97,7 +97,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object) if (!zend_check_protected(zend_get_function_root_class(destructor), EG(scope))) { zend_class_entry *ce = object->ce; - zend_error(EG(current_execute_data) ? E_ERROR : E_WARNING, + zend_error(EG(current_execute_data) ? E_EXCEPTION | E_ERROR : E_WARNING, "Call to protected %s::__destruct() from context '%s'%s", ce->name->val, EG(scope) ? EG(scope)->name->val : "", |