]> granicus.if.org Git - php/commitdiff
Revert "Use E_ERROR | E_EXCEPTION in FAST_ZPP mode too"
authorNikita Popov <nikic@php.net>
Sun, 22 Mar 2015 08:17:42 +0000 (09:17 +0100)
committerNikita Popov <nikic@php.net>
Sun, 22 Mar 2015 08:17:42 +0000 (09:17 +0100)
This reverts commit d4da7c20d2d642a6f0f81bde836576b9970969af.

The argument passed to this function refers to the weak mode
severity, strict mode will get an exception in any case.

Zend/zend_API.h

index d97b3760deac84585e88fe7878aa6e4671db3c5d..bd90e953fef6f87a9989ebdb37a9d8e466b06faf 100644 (file)
@@ -757,7 +757,7 @@ ZEND_API void ZEND_FASTCALL zend_wrong_callback_error(int severity, int num, cha
                if (UNEXPECTED(error_code != ZPP_ERROR_OK)) { \
                        if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \
                                if (error_code == ZPP_ERROR_WRONG_CALLBACK) { \
-                                       zend_wrong_callback_error(E_ERROR | E_EXCEPTION, _i, _error); \
+                                       zend_wrong_callback_error(E_WARNING, _i, _error); \
                                } else if (error_code == ZPP_ERROR_WRONG_CLASS) { \
                                        zend_wrong_paramer_class_error(_i, _error, _arg); \
                                } else if (error_code == ZPP_ERROR_WRONG_ARG) { \