diff options
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index f6ca285a60..f2e7ba3d6e 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -619,7 +619,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_throw_non_object_erro || opline->opcode == ZEND_POST_INC_OBJ || opline->opcode == ZEND_POST_DEC_OBJ) { zend_throw_error(NULL, - "Attempt to increment/decrement property '%s' on %s", + "Attempt to increment/decrement property \"%s\" on %s", ZSTR_VAL(property_name), zend_zval_type_name(object) ); } else if (opline->opcode == ZEND_FETCH_OBJ_W @@ -627,12 +627,12 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_throw_non_object_erro || opline->opcode == ZEND_FETCH_OBJ_FUNC_ARG || opline->opcode == ZEND_ASSIGN_OBJ_REF) { zend_throw_error(NULL, - "Attempt to modify property '%s' on %s", + "Attempt to modify property \"%s\" on %s", ZSTR_VAL(property_name), zend_zval_type_name(object) ); } else { zend_throw_error(NULL, - "Attempt to assign property '%s' on %s", + "Attempt to assign property \"%s\" on %s", ZSTR_VAL(property_name), zend_zval_type_name(object) ); } @@ -1356,7 +1356,7 @@ try_again: break; } if (type != BP_VAR_UNSET) { - zend_error(E_WARNING, "Illegal string offset '%s'", Z_STRVAL_P(dim)); + zend_error(E_WARNING, "Illegal string offset \"%s\"", Z_STRVAL_P(dim)); } break; case IS_UNDEF: @@ -1492,7 +1492,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_property_read(z { zend_string *tmp_property_name; zend_string *property_name = zval_get_tmp_string(property, &tmp_property_name); - zend_error(E_WARNING, "Attempt to read property '%s' on %s", ZSTR_VAL(property_name), zend_zval_type_name(object)); + zend_error(E_WARNING, "Attempt to read property \"%s\" on %s", ZSTR_VAL(property_name), zend_zval_type_name(object)); zend_tmp_string_release(tmp_property_name); } @@ -1517,7 +1517,7 @@ static zend_never_inline void zend_assign_to_string_offset(zval *str, zval *dim, offset = zend_check_string_offset(dim, BP_VAR_W EXECUTE_DATA_CC); if (offset < -(zend_long)Z_STRLEN_P(str)) { /* Error on negative offset */ - zend_error(E_WARNING, "Illegal string offset: " ZEND_LONG_FMT, offset); + zend_error(E_WARNING, "Illegal string offset " ZEND_LONG_FMT, offset); if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); } @@ -1898,12 +1898,12 @@ static zend_always_inline HashTable *zend_get_target_symbol_table(int fetch_type static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_offset(zend_long lval) { - zend_error(E_NOTICE, "Undefined offset: " ZEND_LONG_FMT, lval); + zend_error(E_NOTICE, "Undefined array key " ZEND_LONG_FMT, lval); } static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_index(const zend_string *offset) { - zend_error(E_NOTICE, "Undefined index: %s", ZSTR_VAL(offset)); + zend_error(E_NOTICE, "Undefined array key \"%s\"", ZSTR_VAL(offset)); } ZEND_API ZEND_COLD int ZEND_FASTCALL zend_undefined_offset_write(HashTable *ht, zend_long lval) @@ -2346,7 +2346,7 @@ try_string_offset: ZVAL_NULL(result); return; } - zend_error(E_WARNING, "Illegal string offset '%s'", Z_STRVAL_P(dim)); + zend_error(E_WARNING, "Illegal string offset \"%s\"", Z_STRVAL_P(dim)); break; case IS_UNDEF: ZVAL_UNDEFINED_OP2(); @@ -2373,7 +2373,7 @@ try_string_offset: if (UNEXPECTED(Z_STRLEN_P(container) < ((offset < 0) ? -(size_t)offset : ((size_t)offset + 1)))) { if (type != BP_VAR_IS) { - zend_error(E_WARNING, "Uninitialized string offset: " ZEND_LONG_FMT, offset); + zend_error(E_WARNING, "Uninitialized string offset " ZEND_LONG_FMT, offset); ZVAL_EMPTY_STRING(result); } else { ZVAL_NULL(result); @@ -3327,7 +3327,11 @@ static zend_never_inline void zend_fetch_this_var(int type OPLINE_DC EXECUTE_DAT static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_clone_call(zend_function *clone, zend_class_entry *scope) { - zend_throw_error(NULL, "Call to %s %s::__clone() from context '%s'", zend_visibility_string(clone->common.fn_flags), ZSTR_VAL(clone->common.scope->name), scope ? ZSTR_VAL(scope->name) : ""); + zend_throw_error(NULL, "Call to %s %s::__clone() from %s%s", + zend_visibility_string(clone->common.fn_flags), ZSTR_VAL(clone->common.scope->name), + scope ? "scope " : "global scope", + scope ? ZSTR_VAL(scope->name) : "" + ); } #if ZEND_INTENSIVE_DEBUGGING @@ -4299,7 +4303,7 @@ static zend_always_inline int _zend_quick_get_constant( if (!c) { if (!check_defined_only) { - zend_throw_error(NULL, "Undefined constant '%s'", Z_STRVAL_P(RT_CONSTANT(opline, opline->op2))); + zend_throw_error(NULL, "Undefined constant \"%s\"", Z_STRVAL_P(RT_CONSTANT(opline, opline->op2))); ZVAL_UNDEF(EX_VAR(opline->result.var)); } return FAILURE; |