archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Convert fatal errors into EngineExceptions

Browse source
This commit is contained in:
Dmitry Stogov 2015-04-01 20:01:57 +03:00
parent 0295d89d45
commit ec760d8fff
9 changed files with 132 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_objects.c
View file

@ -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 : "",