diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2015-03-19 13:30:11 -0400 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2015-03-19 13:30:11 -0400 |
| commit | 7044f9c6df52ab37a122881c313d008aa568185a (patch) | |
| tree | 2cbec226ebaf5070a468f6e649bde3ab373b401c /Zend/zend_API.c | |
| parent | 0ef80ac351960cd0fa474f960638abc8921841d8 (diff) | |
| download | php-git-7044f9c6df52ab37a122881c313d008aa568185a.tar.gz | |
Refactor as to not use call info, but add the flag to the op_array.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index f86bb66c53..dac6f16754 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -151,7 +151,7 @@ ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array) / ZEND_API void zend_wrong_param_count(void) /* {{{ */ { - if (ZEND_CALL_INFO(EG(current_execute_data)) & ZEND_CALL_STRICT_TYPEHINTS) { + if (EX_PREV_USES_STRICT_TYPES()) { zend_wrong_param_count_ex(1); } else { zend_wrong_param_count_ex(0); @@ -802,7 +802,7 @@ ZEND_API int zend_parse_parameters_ex(int flags, int num_args, const char *type_ va_list va; int retval; - if (ZEND_CALL_INFO(EG(current_execute_data)) & ZEND_CALL_STRICT_TYPEHINTS) { + if (EX_PREV_USES_STRICT_TYPES()) { flags |= ZEND_PARSE_PARAMS_STRICT; } @@ -822,7 +822,7 @@ ZEND_API int zend_parse_parameters(int num_args, const char *type_spec, ...) /* int retval; int flags = 0; - if (ZEND_CALL_INFO(EG(current_execute_data)) & ZEND_CALL_STRICT_TYPEHINTS) { + if (EX_PREV_USES_STRICT_TYPES()) { flags |= ZEND_PARSE_PARAMS_STRICT; } @@ -851,7 +851,7 @@ ZEND_API int zend_parse_method_parameters(int num_args, zval *this_ptr, const ch * wrong branch here. */ zend_bool is_method = EG(current_execute_data)->func->common.scope != NULL; - if (ZEND_CALL_INFO(EG(current_execute_data)) & ZEND_CALL_STRICT_TYPEHINTS) { + if (EX_PREV_USES_STRICT_TYPES()) { flags |= ZEND_PARSE_PARAMS_STRICT; } @@ -891,7 +891,7 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args, zval *this zval **object; zend_class_entry *ce; - if (ZEND_CALL_INFO(EG(current_execute_data)) & ZEND_CALL_STRICT_TYPEHINTS) { + if (EX_PREV_USES_STRICT_TYPES()) { flags |= ZEND_PARSE_PARAMS_STRICT; } |