diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2015-03-19 12:26:34 -0400 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2015-03-19 12:26:34 -0400 |
| commit | 0ef80ac351960cd0fa474f960638abc8921841d8 (patch) | |
| tree | 065279a44fd4e08e5f75dc77182625ea60439bf7 /Zend/zend_API.h | |
| parent | 78d2399493f4f1128cd98a9b60fb32f078f5f609 (diff) | |
| download | php-git-0ef80ac351960cd0fa474f960638abc8921841d8.tar.gz | |
Fix severity issues with callbacks, start work porting ZEND_STRLEN opcode to work with strict mode, more refactoring to come
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index a1989d1927..810e9b850f 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -710,7 +710,7 @@ typedef enum _zend_expected_type { ZEND_API void zend_wrong_paramers_count_error(int num_args, int min_num_args, int max_num_args, zend_bool strict); ZEND_API void zend_wrong_paramer_type_error(int num, zend_expected_type expected_type, zval *arg, zend_bool strict); ZEND_API void zend_wrong_paramer_class_error(int num, char *name, zval *arg, zend_bool strict); -ZEND_API void zend_wrong_callback_error(int severity, int num, char *error); +ZEND_API void zend_wrong_callback_error(int severity, int num, char *error, zend_bool strict); #define ZPP_ERROR_OK 0 #define ZPP_ERROR_FAILURE 1 @@ -761,7 +761,7 @@ ZEND_API void zend_wrong_callback_error(int severity, int num, char *error); if (UNEXPECTED(error_code != ZPP_ERROR_OK)) { \ if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \ if (error_code == ZPP_ERROR_WRONG_CALLBACK) { \ - zend_wrong_callback_error(_strict ? E_RECOVERABLE_ERROR : E_WARNING, _i, _error); \ + zend_wrong_callback_error(E_WARNING, _i, _error, _strict); \ } else if (error_code == ZPP_ERROR_WRONG_CLASS) { \ zend_wrong_paramer_class_error(_i, _error, _arg, _strict); \ } else if (error_code == ZPP_ERROR_WRONG_ARG) { \ @@ -863,7 +863,7 @@ ZEND_API void zend_wrong_callback_error(int severity, int num, char *error); break; \ } \ } else if (UNEXPECTED(_error != NULL)) { \ - zend_wrong_callback_error(E_STRICT, _i, _error); \ + zend_wrong_callback_error(E_STRICT, _i, _error, _strict); \ } #define Z_PARAM_FUNC(dest_fci, dest_fcc) \ |