diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 14:19:52 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 14:19:52 +0300 |
| commit | ad863c1740fb5719efa3a3fb3a796afd40b1a50f (patch) | |
| tree | debb56987aff5260bea4fd2a56b75c554e0b594b /Zend/zend_API.c | |
| parent | bf259db82e000fcf05135245551348b5dc5cb489 (diff) | |
| download | php-git-ad863c1740fb5719efa3a3fb3a796afd40b1a50f.tar.gz | |
Convert fatal errors into EngineException
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index bc7c0ffc46..310d9fb8e1 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3119,7 +3119,7 @@ get_function_via_handler: verb = "should not"; } else { /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */ - severity = E_ERROR; //TODO: add E_EXCEPTION??? + severity = E_EXCEPTION | E_ERROR; verb = "cannot"; } if ((check_flags & IS_CALLABLE_CHECK_IS_STATIC) != 0) { @@ -3127,7 +3127,7 @@ get_function_via_handler: } if (error) { zend_spprintf(error, 0, "non-static method %s::%s() %s be called statically", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val, verb); - if (severity == E_ERROR) { + if (severity != E_DEPRECATED) { retval = 0; } } else if (retval) { |