diff options
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index b851439e39..f550614130 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -692,16 +692,21 @@ ZEND_API ZEND_COLD void zend_verify_arg_error( if (zf->common.type == ZEND_USER_FUNCTION) { if (ptr && ptr->func && ZEND_USER_CODE(ptr->func->common.type)) { - zend_type_error("%s%s%s() expects argument #%d ($%s) to be of type %s, %s given, called in %s on line %d", - fclass, fsep, fname, arg_num, ZSTR_VAL(arg_info->name), ZSTR_VAL(need_msg), given_msg, - ZSTR_VAL(ptr->func->op_array.filename), ptr->opline->lineno); + zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given, called in %s on line %d", + fclass, fsep, fname, + arg_num, ZSTR_VAL(arg_info->name), + ZSTR_VAL(need_msg), given_msg, + ZSTR_VAL(ptr->func->op_array.filename), ptr->opline->lineno + ); } else { - zend_type_error("%s%s%s() expects argument #%d ($%s) to be of type %s, %s given", - fclass, fsep, fname, arg_num, ZSTR_VAL(arg_info->name), ZSTR_VAL(need_msg), given_msg); + zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given", + fclass, fsep, fname, arg_num, ZSTR_VAL(arg_info->name), ZSTR_VAL(need_msg), given_msg + ); } } else { - zend_type_error("%s%s%s() expects argument #%d ($%s) to be of type %s, %s given", - fclass, fsep, fname, arg_num, ((zend_internal_arg_info*) arg_info)->name, ZSTR_VAL(need_msg), given_msg); + zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given", + fclass, fsep, fname, arg_num, ((zend_internal_arg_info*) arg_info)->name, ZSTR_VAL(need_msg), given_msg + ); } zend_string_release(need_msg); @@ -1925,7 +1930,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_param_must_be_ref(con { const char *arg_name = get_function_arg_name(func, arg_num); - zend_error(E_WARNING, "%s%s%s() expects argument #%d%s%s%s to be passed by reference, value given", + zend_error(E_WARNING, "%s%s%s(): Argument #%d%s%s%s must be passed by reference, value given", func->common.scope ? ZSTR_VAL(func->common.scope->name) : "", func->common.scope ? "::" : "", ZSTR_VAL(func->common.function_name), @@ -2550,8 +2555,9 @@ static ZEND_COLD void ZEND_FASTCALL zend_array_key_exists_error( ZVAL_UNDEFINED_OP2(); } if (!EG(exception)) { - zend_type_error("array_key_exists() expects argument #2 ($array) to be of type array, %s given", - zend_get_type_by_const(Z_TYPE_P(subject))); + zend_type_error("array_key_exists(): Argument #2 ($array) must be of type array, %s given", + zend_get_type_by_const(Z_TYPE_P(subject)) + ); } } |