From 0f8cb147843d60137d0ba631f4ed7b1a5eb61356 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 13:20:42 +0200 Subject: [PATCH 1/9] Convert notices to warnings --- Zend/zend_execute.c | 16 ++++++++-------- Zend/zend_object_handlers.c | 6 +++--- Zend/zend_operators.c | 4 ++-- Zend/zend_vm_def.h | 4 ++-- Zend/zend_vm_execute.h | 12 ++++++------ ext/opcache/jit/zend_jit_helpers.c | 20 ++++++++++---------- ext/opcache/jit/zend_jit_x86.dasc | 18 +++++++++--------- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index d180a83601223..afa8804c9bdf1 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -264,7 +264,7 @@ static zend_never_inline ZEND_COLD zval* zval_undefined_cv(uint32_t var EXECUTE_ { if (EXPECTED(EG(exception) == NULL)) { zend_string *cv = CV_DEF_OF(EX_VAR_TO_NUM(var)); - zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(cv)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(cv)); } return &EG(uninitialized_zval); } @@ -1326,7 +1326,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type case IS_NULL: case IS_FALSE: case IS_TRUE: - zend_error(E_NOTICE, "String offset cast occurred"); + zend_error(E_WARNING, "String offset cast occurred"); break; case IS_REFERENCE: dim = Z_REFVAL_P(dim); @@ -1456,7 +1456,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_NOTICE, "Trying to get property '%s' of non-object", ZSTR_VAL(property_name)); + zend_error(E_WARNING, "Trying to get property '%s' of non-object", ZSTR_VAL(property_name)); zend_tmp_string_release(tmp_property_name); } @@ -1894,7 +1894,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_cannot_add_element(vo static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_resource_as_offset(const zval *dim) { - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); } static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_new_element_for_string(void) @@ -2237,7 +2237,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z case IS_FALSE: case IS_TRUE: if (type != BP_VAR_IS) { - zend_error(E_NOTICE, "String offset cast occurred"); + zend_error(E_WARNING, "String offset cast occurred"); } break; case IS_REFERENCE: @@ -2255,7 +2255,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z if (UNEXPECTED(Z_STRLEN_P(container) < (size_t)((offset < 0) ? -offset : (offset + 1)))) { if (type != BP_VAR_IS) { - zend_error(E_NOTICE, "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); @@ -2297,7 +2297,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z ZVAL_UNDEFINED_OP2(); } if (!is_list && type != BP_VAR_IS) { - zend_error(E_NOTICE, "Trying to access array offset on value of type %s", + zend_error(E_WARNING, "Trying to access array offset on value of type %s", zend_zval_type_name(container)); } ZVAL_NULL(result); @@ -3146,7 +3146,7 @@ static zend_never_inline void zend_fetch_this_var(int type OPLINE_DC EXECUTE_DAT Z_ADDREF_P(result); } else { ZVAL_NULL(result); - zend_error(E_NOTICE,"Undefined variable: this"); + zend_error(E_WARNING, "Undefined variable: this"); } break; case BP_VAR_IS: diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index f60083d85811e..8a1898c22723d 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -777,7 +777,7 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int ZSTR_VAL(prop_info->ce->name), ZSTR_VAL(name)); } else { - zend_error(E_NOTICE,"Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); } } retval = &EG(uninitialized_zval); @@ -1009,7 +1009,7 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam UNEXPECTED((*zend_get_property_guard(zobj, name)) & IN_GET)) { if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) { ZVAL_NULL(retval); - zend_error(E_NOTICE, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); } } else { /* we do have getter - fail and let it try again with usual get/set */ @@ -1037,7 +1037,7 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam /* Notice is thrown after creation of the property, to avoid EG(std_property_info) * being overwritten in an error handler. */ if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) { - zend_error(E_NOTICE, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); } } } diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 04ee310f7a50f..7b4db44de8e2a 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -559,7 +559,7 @@ ZEND_API void ZEND_FASTCALL _convert_to_string(zval *op) /* {{{ */ break; } case IS_ARRAY: - zend_error(E_NOTICE, "Array to string conversion"); + zend_error(E_WARNING, "Array to string conversion"); zval_ptr_dtor(op); ZVAL_INTERNED_STR(op, ZSTR_KNOWN(ZEND_STR_ARRAY_CAPITALIZED)); break; @@ -869,7 +869,7 @@ static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_boo return zend_strpprintf(0, "%.*G", (int) EG(precision), Z_DVAL_P(op)); } case IS_ARRAY: - zend_error(E_NOTICE, "Array to string conversion"); + zend_error(E_WARNING, "Array to string conversion"); return (try && UNEXPECTED(EG(exception))) ? NULL : ZSTR_KNOWN(ZEND_STR_ARRAY_CAPITALIZED); case IS_OBJECT: { diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 3e83cccdf5190..6fa82545e70b5 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1779,7 +1779,7 @@ ZEND_VM_C_LABEL(fetch_this): } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval)); } else { @@ -1798,7 +1798,7 @@ ZEND_VM_C_LABEL(fetch_this): } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { ZVAL_NULL(retval); } else { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 45f2986be4414..6bd3add11c263 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -8833,7 +8833,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_ad } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval)); } else { @@ -8852,7 +8852,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_ad } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { ZVAL_NULL(retval); } else { @@ -16493,7 +16493,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_ad } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval)); } else { @@ -16512,7 +16512,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_ad } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { ZVAL_NULL(retval); } else { @@ -45818,7 +45818,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_ad } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval)); } else { @@ -45837,7 +45837,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_ad } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { ZVAL_NULL(retval); } else { diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c index c626a14ad8a4b..206066930da4d 100644 --- a/ext/opcache/jit/zend_jit_helpers.c +++ b/ext/opcache/jit/zend_jit_helpers.c @@ -220,7 +220,7 @@ static void ZEND_FASTCALL zend_jit_undefined_op_helper(uint32_t var) const zend_execute_data *execute_data = EG(current_execute_data); zend_string *cv = EX(func)->op_array.vars[EX_VAR_TO_NUM(var)]; - zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(cv)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(cv)); } static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim, zval *result) @@ -250,7 +250,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim, hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -322,7 +322,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_is_helper(zend_array *ht, zval *dim hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -391,7 +391,7 @@ static int ZEND_FASTCALL zend_jit_fetch_dim_isset_helper(zend_array *ht, zval *d hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - //zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + //zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -458,7 +458,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_rw_helper(zend_array *ht, zval *di hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -526,7 +526,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_w_helper(zend_array *ht, zval *dim hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -584,7 +584,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_str_r_helper(zval *container, zval case IS_NULL: case IS_FALSE: case IS_TRUE: - zend_error(E_NOTICE, "String offset cast occurred"); + zend_error(E_WARNING, "String offset cast occurred"); break; case IS_REFERENCE: dim = Z_REFVAL_P(dim); @@ -600,7 +600,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_str_r_helper(zval *container, zval } if (UNEXPECTED(Z_STRLEN_P(container) < (size_t)((offset < 0) ? -offset : (offset + 1)))) { - zend_error(E_NOTICE, "Uninitialized string offset: " ZEND_LONG_FMT, offset); + zend_error(E_WARNING, "Uninitialized string offset: " ZEND_LONG_FMT, offset); ZVAL_EMPTY_STRING(result); } else { zend_uchar c; @@ -731,7 +731,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type) case IS_NULL: case IS_FALSE: case IS_TRUE: - zend_error(E_NOTICE, "String offset cast occurred"); + zend_error(E_WARNING, "String offset cast occurred"); break; case IS_REFERENCE: dim = Z_REFVAL_P(dim); @@ -1424,5 +1424,5 @@ static void ZEND_FASTCALL zend_jit_only_vars_by_reference(zval *arg) static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container) { const char *type = Z_ISUNDEF_P(container) ? "null" : zend_zval_type_name(container); - zend_error(E_NOTICE, "Trying to access array offset on value of type %s", type); + zend_error(E_WARNING, "Trying to access array offset on value of type %s", type); } diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 5bda3f59807d0..ba3d4b36febf3 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -2879,7 +2879,7 @@ static int zend_jit_inc_dec(dasm_State **Dst, const zend_op *opline, zend_op_arr | SAVE_VALID_OPLINE opline if (op1_info & MAY_BE_UNDEF) { | IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >2 - | // zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 | SET_ZVAL_TYPE_INFO op1_addr, IS_NULL @@ -4373,7 +4373,7 @@ static int zend_jit_simple_assign(dasm_State **Dst, |.cold_code |1: } - | // zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); if (Z_REG(var_addr) != ZREG_FP) { | mov aword T1, Ra(Z_REG(var_addr)) // save } @@ -6014,7 +6014,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in | IF_Z_TYPE FCARG1a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -6029,7 +6029,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in | IF_Z_TYPE FCARG2a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline | mov aword T1, FCARG1a // save | mov FCARG1d, opline->op2.var @@ -6048,7 +6048,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in | IF_Z_TYPE FCARG1a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -6068,7 +6068,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in | IF_Z_TYPE FCARG2a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline | mov FCARG1d, opline->op2.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -8535,7 +8535,7 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst, const zend_op *opline, zend | SAVE_VALID_OPLINE opline if (opline->opcode != ZEND_FETCH_DIM_IS && (op1_info & MAY_BE_UNDEF)) { | IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >1 - | // zend_error(E_NOTICE, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 |1: @@ -9414,7 +9414,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, zend_op *opline, zend_op_ar |1: } |.if X64 - | mov CARG1, E_NOTICE + | mov CARG1, E_WARNING | LOAD_ADDR CARG2, "Trying to get property '%s' of non-object" | LOAD_ADDR CARG3, Z_STRVAL_P(member) | EXT_CALL zend_error, r0 @@ -9422,7 +9422,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, zend_op *opline, zend_op_ar | sub r4, 4 | push Z_STRVAL_P(member) | push "Trying to get property '%s' of non-object" - | push E_NOTICE + | push E_WARNING | EXT_CALL zend_error, r0 | add r4, 16 |.endif From 8995a27319d0344e0b615394dbd7ab0b71974cf4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 14:20:31 +0200 Subject: [PATCH 2/9] Update Zend tests --- Zend/tests/019.phpt | 216 +++++++++--------- Zend/tests/024.phpt | 32 +-- Zend/tests/026.phpt | 2 +- Zend/tests/033.phpt | 38 +-- Zend/tests/array_unpack/undef_var.phpt | 4 +- Zend/tests/arrow_functions/002.phpt | 2 +- Zend/tests/arrow_functions/003.phpt | 4 +- Zend/tests/assign_to_var_003.phpt | 2 +- Zend/tests/bug29674.phpt | 2 +- Zend/tests/bug29689.phpt | 2 +- Zend/tests/bug29883.phpt | 2 +- Zend/tests/bug29896.phpt | 2 +- Zend/tests/bug30162.phpt | 2 +- Zend/tests/bug31098.phpt | 2 +- Zend/tests/bug31720.phpt | 2 +- Zend/tests/bug39018.phpt | 40 ++-- Zend/tests/bug39036.phpt | 2 +- Zend/tests/bug39304.phpt | 2 +- Zend/tests/bug41209.phpt | 2 +- Zend/tests/bug43201.phpt | 14 +- Zend/tests/bug44660.phpt | 2 +- Zend/tests/bug44899.phpt | 2 +- Zend/tests/bug47109.phpt | 4 +- Zend/tests/bug51394.phpt | 2 +- Zend/tests/bug52001.phpt | 4 +- Zend/tests/bug52041.phpt | 26 +-- Zend/tests/bug60536_001.phpt | 2 +- Zend/tests/bug63462.phpt | 8 +- Zend/tests/bug66609.phpt | 2 +- Zend/tests/bug67314.phpt | 4 +- Zend/tests/bug69732.phpt | 2 +- Zend/tests/bug70124.phpt | 2 +- Zend/tests/bug71300.phpt | 2 +- Zend/tests/bug72944.phpt | 2 +- Zend/tests/bug74340.phpt | 4 +- Zend/tests/bug75921.phpt | 10 +- Zend/tests/bug76025.phpt | 2 +- Zend/tests/bug76667.phpt | 12 +- Zend/tests/bug76860.phpt | 6 +- Zend/tests/bug76860_2.phpt | 6 +- Zend/tests/bug77494.phpt | 2 +- Zend/tests/bug78531.phpt | 8 +- Zend/tests/call_user_func_002.phpt | 4 +- Zend/tests/call_user_func_007.phpt | 2 +- Zend/tests/cast_to_string.phpt | Bin 719 -> 727 bytes Zend/tests/class_properties_const.phpt | 6 +- Zend/tests/clone_003.phpt | 2 +- Zend/tests/closure_012.phpt | 4 +- Zend/tests/closure_027.phpt | 2 +- Zend/tests/closure_040.phpt | 2 +- Zend/tests/concat_001.phpt | 20 +- Zend/tests/dereference_002.phpt | 2 +- Zend/tests/dereference_007.phpt | 2 +- Zend/tests/dereference_010.phpt | 4 +- Zend/tests/dereference_014.phpt | 8 +- Zend/tests/dynamic_call_004.phpt | 2 +- Zend/tests/entry_block_with_predecessors.phpt | 2 +- Zend/tests/errmsg_045.phpt | 2 +- Zend/tests/error_reporting03.phpt | 2 +- Zend/tests/error_reporting04.phpt | 2 +- Zend/tests/error_reporting05.phpt | 4 +- Zend/tests/error_reporting08.phpt | 2 +- Zend/tests/error_reporting09.phpt | 4 +- Zend/tests/foreach_undefined.phpt | 2 +- Zend/tests/get_class_vars_002.phpt | 4 +- Zend/tests/globals_001.phpt | 2 +- Zend/tests/globals_002.phpt | 2 +- Zend/tests/globals_003.phpt | 2 +- Zend/tests/globals_004.phpt | 2 +- Zend/tests/indexing_001.phpt | 4 +- Zend/tests/inference_infinite_loop.phpt | 2 +- Zend/tests/isset_003.phpt | 8 +- Zend/tests/list_keyed_conversions.phpt | 2 +- Zend/tests/method_argument_binding.phpt | 2 +- Zend/tests/offset_array.phpt | 2 +- Zend/tests/offset_bool.phpt | 18 +- Zend/tests/offset_long.phpt | 18 +- Zend/tests/offset_null.phpt | 18 +- Zend/tests/offset_string.phpt | 8 +- Zend/tests/result_unused.phpt | 2 +- Zend/tests/settype_string.phpt | Bin 745 -> 747 bytes Zend/tests/str_offset_001.phpt | 8 +- Zend/tests/str_offset_003.phpt | 8 +- Zend/tests/strict_001.phpt | 2 +- Zend/tests/this_in_extract.phpt | 2 +- .../typed_properties_103.phpt | 2 +- Zend/tests/unset_cv01.phpt | 2 +- Zend/tests/unset_cv02.phpt | 2 +- Zend/tests/unset_cv03.phpt | 2 +- Zend/tests/unset_cv04.phpt | 2 +- Zend/tests/unset_cv05.phpt | 2 +- Zend/tests/unset_cv09.phpt | 2 +- Zend/tests/unset_cv10.phpt | 2 +- .../varSyntax/propertyOfStringError.phpt | 2 +- 94 files changed, 351 insertions(+), 351 deletions(-) diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index cde590734f416..819fdc2c2b920 100644 --- a/Zend/tests/019.phpt +++ b/Zend/tests/019.phpt @@ -368,7 +368,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -380,7 +380,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -392,7 +392,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -404,7 +404,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -416,7 +416,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -428,7 +428,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -440,7 +440,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -452,7 +452,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -464,7 +464,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -476,7 +476,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -488,7 +488,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -500,7 +500,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -512,7 +512,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -524,7 +524,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -536,7 +536,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -548,7 +548,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -560,7 +560,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -572,7 +572,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -584,7 +584,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -596,7 +596,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -608,7 +608,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -620,7 +620,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -632,7 +632,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -644,7 +644,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -656,7 +656,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -668,7 +668,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -680,7 +680,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -697,7 +697,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -713,18 +713,18 @@ bool(true) array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -740,18 +740,18 @@ bool(true) array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -767,18 +767,18 @@ bool(true) array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -794,18 +794,18 @@ bool(true) array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -827,13 +827,13 @@ array(3) { int(4) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(3) { [1]=> @@ -851,13 +851,13 @@ array(2) { int(4) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(2) { [2]=> @@ -871,13 +871,13 @@ array(1) { int(4) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { [3]=> @@ -887,18 +887,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -918,13 +918,13 @@ array(2) { float(5.6) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(2) { [1]=> @@ -938,13 +938,13 @@ array(1) { float(5.6) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { [2]=> @@ -954,18 +954,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -983,13 +983,13 @@ array(1) { string(3) "two" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { [2]=> @@ -999,18 +999,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -1028,13 +1028,13 @@ array(1) { string(2) "30" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { ["Age"]=> @@ -1044,18 +1044,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -1079,13 +1079,13 @@ array(4) { string(0) "" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(4) { [1]=> @@ -1107,13 +1107,13 @@ array(3) { string(0) "" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(3) { ["One"]=> @@ -1131,13 +1131,13 @@ array(2) { string(0) "" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(2) { [2]=> @@ -1151,13 +1151,13 @@ array(1) { string(0) "" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { [""]=> @@ -1167,18 +1167,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -1196,7 +1196,7 @@ bool(true) bool(false) bool(false) -Notice: Undefined variable: resource in %s on line %d +Warning: Undefined variable: resource in %s on line %d NULL -- Iteration 2 -- resource(%d) of type (stream) @@ -1209,10 +1209,10 @@ bool(true) bool(false) bool(false) -Notice: Undefined variable: resource in %s on line %d +Warning: Undefined variable: resource in %s on line %d NULL -Notice: Undefined variable: resources in %s on line %d +Warning: Undefined variable: resources in %s on line %d NULL bool(false) bool(true) @@ -1229,16 +1229,16 @@ object(Point)#%d (3) { bool(true) bool(false) -Notice: Undefined variable: lable in %s on line %d +Warning: Undefined variable: lable in %s on line %d bool(false) -Notice: Undefined variable: lable in %s on line %d +Warning: Undefined variable: lable in %s on line %d bool(true) -Notice: Undefined variable: lable in %s on line %d +Warning: Undefined variable: lable in %s on line %d bool(false) -Notice: Undefined variable: lable in %s on line %d +Warning: Undefined variable: lable in %s on line %d bool(true) object(Point)#%d (3) { ["x"]=> @@ -1263,7 +1263,7 @@ bool(false) bool(false) bool(true) -Notice: Undefined variable: point1 in %s on line %d +Warning: Undefined variable: point1 in %s on line %d NULL bool(false) bool(true) @@ -1293,7 +1293,7 @@ value of static_var before unset: 1 bool(true) bool(false) -Notice: Undefined variable: static_var in %s on line %d +Warning: Undefined variable: static_var in %s on line %d value of static_var after unset: bool(false) bool(true) @@ -1302,7 +1302,7 @@ value of static_var before unset: 2 bool(true) bool(false) -Notice: Undefined variable: static_var in %s on line %d +Warning: Undefined variable: static_var in %s on line %d value of static_var after unset: bool(false) bool(true) @@ -1311,7 +1311,7 @@ value of static_var before unset: 3 bool(true) bool(false) -Notice: Undefined variable: static_var in %s on line %d +Warning: Undefined variable: static_var in %s on line %d value of static_var after unset: bool(false) bool(true) diff --git a/Zend/tests/024.phpt b/Zend/tests/024.phpt index 9e647d4231d0a..d4e34972ee0c5 100644 --- a/Zend/tests/024.phpt +++ b/Zend/tests/024.phpt @@ -15,43 +15,43 @@ var_dump($a->$b->{$c[1]}); ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d -Notice: Undefined variable: c in %s on line %d +Warning: Undefined variable: c in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d int(1) -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d int(0) -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d NULL -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d int(1) -Notice: Trying to get property '1' of non-object in %s on line %d +Warning: Trying to get property '1' of non-object in %s on line %d NULL -Notice: Trying to get property '1' of non-object in %s on line %d +Warning: Trying to get property '1' of non-object in %s on line %d NULL -Notice: Undefined variable: c in %s on line %d +Warning: Undefined variable: c in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to get property '1' of non-object in %s on line %d +Warning: Trying to get property '1' of non-object in %s on line %d -Notice: Trying to get property '' of non-object in %s on line %d +Warning: Trying to get property '' of non-object in %s on line %d NULL diff --git a/Zend/tests/026.phpt b/Zend/tests/026.phpt index 438fe8531d987..0524487c5f463 100644 --- a/Zend/tests/026.phpt +++ b/Zend/tests/026.phpt @@ -22,7 +22,7 @@ print "ok\n"; ?> --EXPECTF-- -Notice: Trying to get property 'a' of non-object in %s on line %d +Warning: Trying to get property 'a' of non-object in %s on line %d ok Attempt to assign property 'a' of non-object ok diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt index 0435767dd5306..652db2de20760 100644 --- a/Zend/tests/033.phpt +++ b/Zend/tests/033.phpt @@ -25,42 +25,42 @@ try { ?> --EXPECTF-- -Notice: Undefined variable: arr in %s on line %d +Warning: Undefined variable: arr in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Undefined variable: arr in %s on line %d +Warning: Undefined variable: arr in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Undefined variable: arr in %s on line %d +Warning: Undefined variable: arr in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to get property 'foo' of non-object in %s on line %d +Warning: Trying to get property 'foo' of non-object in %s on line %d Attempt to assign property 'foo' of non-object Attempt to assign property 'bar' of non-object diff --git a/Zend/tests/array_unpack/undef_var.phpt b/Zend/tests/array_unpack/undef_var.phpt index fff1f6171e089..945717db76336 100644 --- a/Zend/tests/array_unpack/undef_var.phpt +++ b/Zend/tests/array_unpack/undef_var.phpt @@ -6,9 +6,9 @@ array unpacking with undefinded variable var_dump([...$arr]); --EXPECTF-- -Notice: Undefined variable: arr in %s on line %d +Warning: Undefined variable: arr in %s on line %d Fatal error: Uncaught Error: Only arrays and Traversables can be unpacked in %s:%d Stack trace: #0 {main} - thrown in %s on line %d \ No newline at end of file + thrown in %s on line %d diff --git a/Zend/tests/arrow_functions/002.phpt b/Zend/tests/arrow_functions/002.phpt index 52c8020c19565..76254fc69a693 100644 --- a/Zend/tests/arrow_functions/002.phpt +++ b/Zend/tests/arrow_functions/002.phpt @@ -9,5 +9,5 @@ var_dump((fn() => $b + $c)()); ?> --EXPECTF-- -Notice: Undefined variable: c in %s on line %d +Warning: Undefined variable: c in %s on line %d int(1) diff --git a/Zend/tests/arrow_functions/003.phpt b/Zend/tests/arrow_functions/003.phpt index 5e77743fadf11..4e6998c9d1db1 100644 --- a/Zend/tests/arrow_functions/003.phpt +++ b/Zend/tests/arrow_functions/003.phpt @@ -14,8 +14,8 @@ var_dump($fn()); ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d NULL -Notice: Undefined variable: 5 in %s on line %d +Warning: Undefined variable: 5 in %s on line %d NULL diff --git a/Zend/tests/assign_to_var_003.phpt b/Zend/tests/assign_to_var_003.phpt index bbe1b372bb624..3ecf89e172561 100644 --- a/Zend/tests/assign_to_var_003.phpt +++ b/Zend/tests/assign_to_var_003.phpt @@ -13,7 +13,7 @@ var_dump($var1); echo "Done\n"; ?> --EXPECTF-- -Notice: Trying to access array offset on value of type float in %s on line %d +Warning: Trying to access array offset on value of type float in %s on line %d NULL NULL Done diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/bug29674.phpt index 60f08a6df28c7..f1706cabb7750 100644 --- a/Zend/tests/bug29674.phpt +++ b/Zend/tests/bug29674.phpt @@ -33,7 +33,7 @@ $obj->printVars(); ===BASE=== string(4) "Base" -Notice: Undefined property: BaseClass::$private_child in %sbug29674.php on line %d +Warning: Undefined property: BaseClass::$private_child in %s on line %d NULL ===CHILD=== string(4) "Base" diff --git a/Zend/tests/bug29689.phpt b/Zend/tests/bug29689.phpt index 12b343008953a..16f80440d4352 100644 --- a/Zend/tests/bug29689.phpt +++ b/Zend/tests/bug29689.phpt @@ -52,7 +52,7 @@ $baz->printFoo(); --EXPECTF-- foo: foo foo2 bar: bar -Notice: Undefined property: bar::$foo2 in %s on line %d +Warning: Undefined property: bar::$foo2 in %s on line %d ---baz-- foo: foo foo2 diff --git a/Zend/tests/bug29883.phpt b/Zend/tests/bug29883.phpt index 4e07b02d1048a..d9e1ae43b140f 100644 --- a/Zend/tests/bug29883.phpt +++ b/Zend/tests/bug29883.phpt @@ -15,7 +15,7 @@ bool(false) bool(true) bool(true) -Notice: Uninitialized string offset: -10 in %s on line 6 +Warning: Uninitialized string offset: -10 in %s on line %d string(0) "" string(1) "u" string(1) "u" diff --git a/Zend/tests/bug29896.phpt b/Zend/tests/bug29896.phpt index d6ae8e7f7f49b..6b96ac470433a 100644 --- a/Zend/tests/bug29896.phpt +++ b/Zend/tests/bug29896.phpt @@ -22,6 +22,6 @@ function GenerateError2($A1) GenerateError2("Test2"); ?> --EXPECTF-- -#0 userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11) called at [%sbug29896.php:11] +#0 userErrorHandler(2, Undefined variable: b, %s, %d) called at [%s:%d] #1 GenerateError1(Test1) called at [%sbug29896.php:16] #2 GenerateError2(Test2) called at [%sbug29896.php:19] diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt index 55d26a3e3a33d..cd0ca4872e1c7 100644 --- a/Zend/tests/bug30162.phpt +++ b/Zend/tests/bug30162.phpt @@ -43,7 +43,7 @@ var_dump($db); ?> ===DONE=== --EXPECTF-- -Notice: Undefined variable: db in %sbug30162.php on line 35 +Warning: Undefined variable: db in %s on line %d NULL object(hariCow)#%d (2) { ["x"]=> diff --git a/Zend/tests/bug31098.phpt b/Zend/tests/bug31098.phpt index 1849528231ba8..3276782c0162b 100644 --- a/Zend/tests/bug31098.phpt +++ b/Zend/tests/bug31098.phpt @@ -44,7 +44,7 @@ ok ok ok -Notice: Trying to get property 'wrong' of non-object in %s on line %d +Warning: Trying to get property 'wrong' of non-object in %s on line %d ok Warning: Illegal string offset 'wrong' in %s on line %d diff --git a/Zend/tests/bug31720.phpt b/Zend/tests/bug31720.phpt index 9031dec030006..b5e935cd8025a 100644 --- a/Zend/tests/bug31720.phpt +++ b/Zend/tests/bug31720.phpt @@ -12,6 +12,6 @@ try { ?> ===DONE=== --EXPECTF-- -Notice: Undefined variable: nonesuchvar in %s on line %d +Warning: Undefined variable: nonesuchvar in %s on line %d array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object ===DONE=== diff --git a/Zend/tests/bug39018.phpt b/Zend/tests/bug39018.phpt index a00e1fb819de5..43198b5c859cb 100644 --- a/Zend/tests/bug39018.phpt +++ b/Zend/tests/bug39018.phpt @@ -62,44 +62,44 @@ print "\nDone\n"; ?> --EXPECTF-- -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: %s in %s on line 6 +Warning: Uninitialized string offset: %s in %s on line %d -Notice: Uninitialized string offset: 0 in %s on line %d +Warning: Uninitialized string offset: 0 in %s on line %d -Notice: Uninitialized string offset: 0 in %s on line %d +Warning: Uninitialized string offset: 0 in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: %i in %s on line %d +Warning: Uninitialized string offset: %i in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: %i in %s on line %d +Warning: Uninitialized string offset: %i in %s on line %d -Notice: Uninitialized string offset: 0 in %s on line %d +Warning: Uninitialized string offset: 0 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: 12 in %s on line %d +Warning: Uninitialized string offset: 12 in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: 12 in %s on line %d +Warning: Uninitialized string offset: 12 in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d b Done diff --git a/Zend/tests/bug39036.phpt b/Zend/tests/bug39036.phpt index 419810eaa1720..0cdd75150de07 100644 --- a/Zend/tests/bug39036.phpt +++ b/Zend/tests/bug39036.phpt @@ -14,6 +14,6 @@ var_dump($key); echo "Done\n"; ?> --EXPECTF-- -Notice: Undefined variable: key in %s on line %d +Warning: Undefined variable: key in %s on line %d NULL Done diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/bug39304.phpt index 4394cae1d48b7..dc31073eb9488 100644 --- a/Zend/tests/bug39304.phpt +++ b/Zend/tests/bug39304.phpt @@ -7,6 +7,6 @@ Bug #39304 (Segmentation fault with list unpacking of string offset) var_dump($a,$b); ?> --EXPECTF-- -Notice: Uninitialized string offset: 0 in %sbug39304.php on line %d +Warning: Uninitialized string offset: 0 in %s on line %d NULL NULL diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/bug41209.phpt index f61df73d20a6a..da9f57163d45e 100644 --- a/Zend/tests/bug41209.phpt +++ b/Zend/tests/bug41209.phpt @@ -41,6 +41,6 @@ echo "Done\n"; --EXPECTF-- Fatal error: Uncaught ErrorException: Undefined variable: id in %s:%d Stack trace: -#0 %s(%d): env::errorHandler(8, '%s', '%s', 34) +#0 %s(%d): env::errorHandler(2, 'Undefined varia...', '%s', %d) #1 {main} thrown in %s on line %d diff --git a/Zend/tests/bug43201.phpt b/Zend/tests/bug43201.phpt index 2ab26ca4b9070..fa14b162d4a2f 100644 --- a/Zend/tests/bug43201.phpt +++ b/Zend/tests/bug43201.phpt @@ -26,29 +26,29 @@ Notice: Indirect modification of overloaded property Foo::$arr has no effect in Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 14 -Notice: Undefined variable: ref in %sbug43201.php on line 14 +Warning: Undefined variable: ref in %s on line %d -Notice: Undefined variable: undef in %sbug43201.php on line 16 +Warning: Undefined variable: undef in %s on line %d Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +Warning: Undefined variable: undef in %s on line %d Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +Warning: Undefined variable: undef in %s on line %d Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +Warning: Undefined variable: undef in %s on line %d Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +Warning: Undefined variable: undef in %s on line %d Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +Warning: Undefined variable: undef in %s on line %d Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 ok diff --git a/Zend/tests/bug44660.phpt b/Zend/tests/bug44660.phpt index bc7447325b33c..fbe4a90dcdc7b 100644 --- a/Zend/tests/bug44660.phpt +++ b/Zend/tests/bug44660.phpt @@ -48,7 +48,7 @@ var_dump($a); ?> --EXPECTF-- --> read access: -Notice: Trying to get property 'p' of non-object in %s on line %d +Warning: Trying to get property 'p' of non-object in %s on line %d --> direct assignment: Attempt to assign property 'p' of non-object diff --git a/Zend/tests/bug44899.phpt b/Zend/tests/bug44899.phpt index d62033a24e478..d9c0de0ef7b79 100644 --- a/Zend/tests/bug44899.phpt +++ b/Zend/tests/bug44899.phpt @@ -34,5 +34,5 @@ echo "\n"; isset empty -Notice: Undefined property: myclass::$foo in %s on line %d +Warning: Undefined property: myclass::$foo in %s on line %d empty diff --git a/Zend/tests/bug47109.phpt b/Zend/tests/bug47109.phpt index 0b86a2bcd376e..4f8f4b9328d62 100644 --- a/Zend/tests/bug47109.phpt +++ b/Zend/tests/bug47109.phpt @@ -5,6 +5,6 @@ Bug #47109 (Memory leak on $a->{"a"."b"} when $a is not an object) $a->{"a"."b"}; ?> --EXPECTF-- -Notice: Undefined variable: a in %sbug47109.php on line 2 +Warning: Undefined variable: a in %s on line %d -Notice: Trying to get property 'ab' of non-object in %sbug47109.php on line 2 +Warning: Trying to get property 'ab' of non-object in %s on line %d diff --git a/Zend/tests/bug51394.phpt b/Zend/tests/bug51394.phpt index f91d2720a1529..e31bc230cd8a8 100644 --- a/Zend/tests/bug51394.phpt +++ b/Zend/tests/bug51394.phpt @@ -15,6 +15,6 @@ $a = $empty($b); --EXPECTF-- Fatal error: Uncaught Exception: error! in %sbug51394.php:%d Stack trace: -#0 %sbug51394.php(%d): eh(8, 'Undefined varia%s', '%s', %d) +#0 %s(%d): eh(2, 'Undefined varia...', '%s', %d) #1 {main} thrown in %sbug51394.php on line %d diff --git a/Zend/tests/bug52001.phpt b/Zend/tests/bug52001.phpt index cf55d195b939f..36170eb96bb0d 100644 --- a/Zend/tests/bug52001.phpt +++ b/Zend/tests/bug52001.phpt @@ -11,7 +11,7 @@ var_dump($temp1); function a($b,$c) {} ?> --EXPECTF-- -Notice: Undefined variable: var in %sbug52001.php on line 2 +Warning: Undefined variable: var in %s on line %d -Notice: Undefined variable: in %sbug52001.php on line 2 +Warning: Undefined variable: in %s on line %d int(1) diff --git a/Zend/tests/bug52041.phpt b/Zend/tests/bug52041.phpt index d7b2fd6cafed0..467a29fe7705b 100644 --- a/Zend/tests/bug52041.phpt +++ b/Zend/tests/bug52041.phpt @@ -47,47 +47,47 @@ foo()[0][0] += 2; var_dump(foo()); ?> --EXPECTF-- -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Attempt to assign property 'a' of non-object -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Attempt to modify property 'a' of non-object -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Attempt to increment/decrement property 'a' of non-object -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Attempt to modify property 'a' of non-object -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Attempt to assign property 'a' of non-object -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Attempt to modify property 'a' of non-object -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Notice: Undefined offset: 0 in %s on line %d -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Notice: Undefined offset: 0 in %s on line %d Notice: Undefined offset: 0 in %s on line %d -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Notice: Undefined offset: 0 in %s on line %d -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Notice: Undefined offset: 0 in %s on line %d Notice: Undefined offset: 0 in %s on line %d -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d NULL diff --git a/Zend/tests/bug60536_001.phpt b/Zend/tests/bug60536_001.phpt index 0847b81d40e27..b4630f4b876ae 100644 --- a/Zend/tests/bug60536_001.phpt +++ b/Zend/tests/bug60536_001.phpt @@ -22,5 +22,5 @@ $a->__construct(); echo "DONE"; ?> --EXPECTF-- -Notice: Undefined property: Z::$x in %s on line 14 +Warning: Undefined property: Z::$x in %s on line %d DONE diff --git a/Zend/tests/bug63462.phpt b/Zend/tests/bug63462.phpt index 45c9507bbac58..bcc2c679970b9 100644 --- a/Zend/tests/bug63462.phpt +++ b/Zend/tests/bug63462.phpt @@ -52,16 +52,16 @@ $test->privateProperty = 'value'; --EXPECTF-- __get nonExisting -Notice: Undefined property: Test::$nonExisting in %s on line %d +Warning: Undefined property: Test::$nonExisting in %s on line %d __get publicProperty -Notice: Undefined property: Test::$publicProperty in %s on line %d +Warning: Undefined property: Test::$publicProperty in %s on line %d __get protectedProperty -Notice: Undefined property: Test::$protectedProperty in %s on line %d +Warning: Undefined property: Test::$protectedProperty in %s on line %d __get privateProperty -Notice: Undefined property: Test::$privateProperty in %s on line %d +Warning: Undefined property: Test::$privateProperty in %s on line %d __isset nonExisting __isset publicProperty __isset protectedProperty diff --git a/Zend/tests/bug66609.phpt b/Zend/tests/bug66609.phpt index 206f7757d9457..880f5a58a4790 100644 --- a/Zend/tests/bug66609.phpt +++ b/Zend/tests/bug66609.phpt @@ -24,5 +24,5 @@ $foo->blah--; //crash echo "okey"; ?> --EXPECTF-- -Notice: Undefined property: Bar::$bar in %sbug66609.php on line %d +Warning: Undefined property: Bar::$bar in %s on line %d okey diff --git a/Zend/tests/bug67314.phpt b/Zend/tests/bug67314.phpt index c5b6a1293d863..3ef225de03162 100644 --- a/Zend/tests/bug67314.phpt +++ b/Zend/tests/bug67314.phpt @@ -15,8 +15,8 @@ echo "made it once\n"; crash(); echo "ok\n"; --EXPECTF-- -Notice: Undefined variable: i in %sbug67314.php on line 4 +Warning: Undefined variable: i in %s on line %d made it once -Notice: Undefined variable: i in %sbug67314.php on line 4 +Warning: Undefined variable: i in %s on line %d ok diff --git a/Zend/tests/bug69732.phpt b/Zend/tests/bug69732.phpt index f5571627fe959..578cb8d143253 100644 --- a/Zend/tests/bug69732.phpt +++ b/Zend/tests/bug69732.phpt @@ -20,7 +20,7 @@ $wpq->interesting =& ret_assoc(); $x = $wpq->interesting; printf("%s\n", $x); --EXPECTF-- -Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6 +Warning: Undefined property: wpq::$interesting in %s on line %d Notice: Indirect modification of overloaded property wpq::$interesting has no effect in %sbug69732.php on line 16 diff --git a/Zend/tests/bug70124.phpt b/Zend/tests/bug70124.phpt index f32a8613fe261..87ec4ab41d33f 100644 --- a/Zend/tests/bug70124.phpt +++ b/Zend/tests/bug70124.phpt @@ -39,7 +39,7 @@ try { } ?> --EXPECTF-- -Notice: Undefined variable: f in %sbug70124.php on line %d +Warning: Undefined variable: f in %s on line %d string(30) "Function name must be a string" string(31) "Call to undefined method A::y()" string(31) "Call to undefined method A::y()" diff --git a/Zend/tests/bug71300.phpt b/Zend/tests/bug71300.phpt index 3589c4764e852..fc4b23681af72 100644 --- a/Zend/tests/bug71300.phpt +++ b/Zend/tests/bug71300.phpt @@ -24,5 +24,5 @@ var_dump(test2()); --EXPECTF-- string(4) "test" -Notice: Array to string conversion in %sbug71300.php on line %d +Warning: Array to string conversion in %s on line %d string(9) "Arraytest" diff --git a/Zend/tests/bug72944.phpt b/Zend/tests/bug72944.phpt index 80b1544a5551d..0ddc99ff3ba07 100644 --- a/Zend/tests/bug72944.phpt +++ b/Zend/tests/bug72944.phpt @@ -7,5 +7,5 @@ define('e', 'e'); echo "OK\n"; ?> --EXPECTF-- -Notice: Undefined variable: A in %sbug72944.php on line 3 +Warning: Undefined variable: A in %s on line %d OK diff --git a/Zend/tests/bug74340.phpt b/Zend/tests/bug74340.phpt index f266dcc2366b8..64d1b91b14bfb 100644 --- a/Zend/tests/bug74340.phpt +++ b/Zend/tests/bug74340.phpt @@ -24,7 +24,7 @@ $test->test; --EXPECTF-- __get test -Notice: Undefined property: Test::$test in %s on line %d +Warning: Undefined property: Test::$test in %s on line %d __get test2 -Notice: Undefined property: Test::$test in %s on line %d +Warning: Undefined property: Test::$test in %s on line %d diff --git a/Zend/tests/bug75921.phpt b/Zend/tests/bug75921.phpt index 17cb496673bb6..a8649262b5521 100644 --- a/Zend/tests/bug75921.phpt +++ b/Zend/tests/bug75921.phpt @@ -47,21 +47,21 @@ unset($null); --EXPECTF-- Attempt to assign property 'a' of non-object -Notice: Undefined variable: null in %s on line %d +Warning: Undefined variable: null in %s on line %d NULL Attempt to modify property 'a' of non-object -Notice: Undefined variable: null in %s on line %d +Warning: Undefined variable: null in %s on line %d NULL Attempt to modify property 'a' of non-object -Notice: Undefined variable: null in %s on line %d +Warning: Undefined variable: null in %s on line %d NULL Attempt to modify property 'a' of non-object -Notice: Undefined variable: null in %s on line %d +Warning: Undefined variable: null in %s on line %d NULL Attempt to modify property 'a' of non-object -Notice: Undefined variable: null in %s on line %d +Warning: Undefined variable: null in %s on line %d NULL diff --git a/Zend/tests/bug76025.phpt b/Zend/tests/bug76025.phpt index c7958bd60e90f..903cec260753f 100644 --- a/Zend/tests/bug76025.phpt +++ b/Zend/tests/bug76025.phpt @@ -13,6 +13,6 @@ $c = $b[$a]; --EXPECTF-- Fatal error: Uncaught Exception: blah in %sbug76025.php:%d Stack trace: -#0 %sbug76025.php(%d): handleError(8, 'Undefined varia...', '%s', %d) +#0 %s(%d): handleError(2, 'Undefined varia...', '%s', %d) #1 {main} thrown in %sbug76025.php on line %d diff --git a/Zend/tests/bug76667.phpt b/Zend/tests/bug76667.phpt index 15dc34693d6c3..09f17b56c7346 100644 --- a/Zend/tests/bug76667.phpt +++ b/Zend/tests/bug76667.phpt @@ -19,20 +19,20 @@ $x = new T; $x->x = 1; ?> --EXPECTF-- -Notice: Undefined variable: undefined in %sbug76667.php on line %d +Warning: Undefined variable: undefined in %s on line %d -Notice: Trying to get property '1' of non-object in %sbug76667.php on line %d +Warning: Trying to get property '1' of non-object in %s on line %d Warning: Division by zero in %sbug76667.php on line %d -Notice: Undefined variable: undefined in %sbug76667.php on line %d +Warning: Undefined variable: undefined in %s on line %d -Notice: Trying to get property 'NAN' of non-object in %sbug76667.php on line %d +Warning: Trying to get property 'NAN' of non-object in %s on line %d Warning: Division by zero in %sbug76667.php on line %d -Notice: Undefined variable: undefined in %sbug76667.php on line %d +Warning: Undefined variable: undefined in %s on line %d -Notice: Trying to get property 'NAN' of non-object in %sbug76667.php on line %d +Warning: Trying to get property 'NAN' of non-object in %s on line %d Warning: Division by zero in %sbug76667.php on line %d diff --git a/Zend/tests/bug76860.phpt b/Zend/tests/bug76860.phpt index 046edba7f292d..67baa3996fe2c 100644 --- a/Zend/tests/bug76860.phpt +++ b/Zend/tests/bug76860.phpt @@ -17,15 +17,15 @@ new B; --EXPECTF-- Notice: Accessing static property B::$a as non static in %sbug76860.php on line 7 -Notice: Undefined property: B::$a in %sbug76860.php on line 7 +Warning: Undefined property: B::$a in %s on line %d Notice: Accessing static property B::$b as non static in %sbug76860.php on line 7 -Notice: Undefined property: B::$b in %sbug76860.php on line 7 +Warning: Undefined property: B::$b in %s on line %d Notice: Accessing static property B::$c as non static in %sbug76860.php on line 7 -Notice: Undefined property: B::$c in %sbug76860.php on line 7 +Warning: Undefined property: B::$c in %s on line %d NULL NULL NULL diff --git a/Zend/tests/bug76860_2.phpt b/Zend/tests/bug76860_2.phpt index bc92702fc1add..1ab85f69f266a 100644 --- a/Zend/tests/bug76860_2.phpt +++ b/Zend/tests/bug76860_2.phpt @@ -20,15 +20,15 @@ new B; --EXPECTF-- Notice: Accessing static property B::$a as non static in %sbug76860_2.php on line 7 -Notice: Undefined property: B::$a in %sbug76860_2.php on line 7 +Warning: Undefined property: B::$a in %s on line %d Notice: Accessing static property B::$b as non static in %sbug76860_2.php on line 7 -Notice: Undefined property: B::$b in %sbug76860_2.php on line 7 +Warning: Undefined property: B::$b in %s on line %d Notice: Accessing static property B::$c as non static in %sbug76860_2.php on line 7 -Notice: Undefined property: B::$c in %sbug76860_2.php on line 7 +Warning: Undefined property: B::$c in %s on line %d NULL NULL NULL diff --git a/Zend/tests/bug77494.phpt b/Zend/tests/bug77494.phpt index 1793f6b219d54..adab05bef74e2 100644 --- a/Zend/tests/bug77494.phpt +++ b/Zend/tests/bug77494.phpt @@ -12,5 +12,5 @@ var_dump($a->name); --EXPECTF-- Warning: CURLFile() has been disabled for security reasons in %sbug77494.php on line 2 -Notice: Undefined property: CURLFile::$name in %sbug77494.php on line 3 +Warning: Undefined property: CURLFile::$name in %s on line %d NULL diff --git a/Zend/tests/bug78531.phpt b/Zend/tests/bug78531.phpt index e8614ffd1106d..1e8f0b34d19bc 100644 --- a/Zend/tests/bug78531.phpt +++ b/Zend/tests/bug78531.phpt @@ -24,14 +24,14 @@ try { } ?> --EXPECTF-- -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d Attempt to assign property 'a' of non-object -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d Attempt to increment/decrement property 'a' of non-object -Notice: Undefined variable: u3 in %s on line %d +Warning: Undefined variable: u3 in %s on line %d Attempt to increment/decrement property 'a' of non-object -Notice: Undefined variable: u4 in %s on line %d +Warning: Undefined variable: u4 in %s on line %d Attempt to modify property 'a' of non-object diff --git a/Zend/tests/call_user_func_002.phpt b/Zend/tests/call_user_func_002.phpt index 9d007a8af35a8..cc07ffab16718 100644 --- a/Zend/tests/call_user_func_002.phpt +++ b/Zend/tests/call_user_func_002.phpt @@ -34,8 +34,8 @@ string(3) "foo" call_user_func() expects parameter 1 to be a valid callback, class 'foo' not found call_user_func() expects parameter 1 to be a valid callback, class '' not found -Notice: Undefined variable: foo in %s on line %d +Warning: Undefined variable: foo in %s on line %d call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object -Notice: Undefined variable: foo in %s on line %d +Warning: Undefined variable: foo in %s on line %d call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object diff --git a/Zend/tests/call_user_func_007.phpt b/Zend/tests/call_user_func_007.phpt index ed44320c3fd3c..d3f2747c13ef9 100644 --- a/Zend/tests/call_user_func_007.phpt +++ b/Zend/tests/call_user_func_007.phpt @@ -13,7 +13,7 @@ var_dump($a); --EXPECTF-- Notice: Undefined offset: 0 in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d Warning: Parameter 1 to foo() expected to be a reference, value given in %s on line %d array(0) { diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt index b3d245f1ed9b53634a6408d1ab802afdb8f678ea..cdff53c38f13b5ee95f25ab1b19fefea7c0dab43 100644 GIT binary patch delta 46 mcmX@ldYyH{dq(!~#G<^+y!6SIOv+68d6T1=q&c`S#7Y2smJcNW delta 41 kcmcc4dY*N|dqy_D{F2P%)X8>C%9CZ7q*1w2lk1ow0WFUW5C8xG diff --git a/Zend/tests/class_properties_const.phpt b/Zend/tests/class_properties_const.phpt index 6f5471d20a62a..72b29519b4ce2 100644 --- a/Zend/tests/class_properties_const.phpt +++ b/Zend/tests/class_properties_const.phpt @@ -13,13 +13,13 @@ var_dump($a->{1}); var_dump($a->{function(){}}); ?> --EXPECTF-- -Notice: Array to string conversion in %sclass_properties_const.php on line %d +Warning: Array to string conversion in %s on line %d runtime -Notice: Undefined property: A::$Array in %sclass_properties_const.php on line %d +Warning: Undefined property: A::$Array in %s on line %d NULL -Notice: Undefined property: A::$1 in %sclass_properties_const.php on line %d +Warning: Undefined property: A::$1 in %s on line %d NULL Fatal error: Uncaught Error: Object of class Closure could not be converted to string in %s:%d diff --git a/Zend/tests/clone_003.phpt b/Zend/tests/clone_003.phpt index 2dd376cf65c1d..02ff350ca2c22 100644 --- a/Zend/tests/clone_003.phpt +++ b/Zend/tests/clone_003.phpt @@ -7,7 +7,7 @@ $a = clone $b; ?> --EXPECTF-- -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d Fatal error: Uncaught Error: __clone method called on non-object in %s:%d Stack trace: diff --git a/Zend/tests/closure_012.phpt b/Zend/tests/closure_012.phpt index bae8f568789f6..f02045f5b1149 100644 --- a/Zend/tests/closure_012.phpt +++ b/Zend/tests/closure_012.phpt @@ -16,8 +16,8 @@ $lambda(); var_dump($i); ?> --EXPECTF-- -Notice: Undefined variable: i in %sclosure_012.php on line 2 +Warning: Undefined variable: i in %s on line %d -Notice: Undefined variable: i in %sclosure_012.php on line 7 +Warning: Undefined variable: i in %s on line %d NULL int(2) diff --git a/Zend/tests/closure_027.phpt b/Zend/tests/closure_027.phpt index 76754f9fba038..9fc29a4f18aa0 100644 --- a/Zend/tests/closure_027.phpt +++ b/Zend/tests/closure_027.phpt @@ -27,7 +27,7 @@ object(stdClass)#%d (0) { } NULL -Notice: Undefined variable: y in %s on line %d +Warning: Undefined variable: y in %s on line %d Exception: Too few arguments to function {closure}(), 0 passed in %s on line %d and exactly 1 expected Fatal error: Uncaught TypeError: Argument 1 passed to test() must be an instance of Closure, instance of stdClass given, called in %s on line %d and defined in %s:%d diff --git a/Zend/tests/closure_040.phpt b/Zend/tests/closure_040.phpt index 531ecb271a7df..a5f52e70b00f8 100644 --- a/Zend/tests/closure_040.phpt +++ b/Zend/tests/closure_040.phpt @@ -29,7 +29,7 @@ $cas->bindTo($a, 'A'); ?> --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Warning: Class 'Array' not found in %s on line %d diff --git a/Zend/tests/concat_001.phpt b/Zend/tests/concat_001.phpt index 1e657954a9264..b8fad29674a64 100644 --- a/Zend/tests/concat_001.phpt +++ b/Zend/tests/concat_001.phpt @@ -50,24 +50,24 @@ var_dump($d.$d); echo "Done\n"; ?> --EXPECTF-- -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(24) "Arraythis is test object" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(16) "Arraysome string" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(8) "Array222" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(13) "Array2323.444" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(10) "ArrayArray" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(24) "this is test objectArray" string(30) "this is test objectsome string" string(22) "this is test object222" @@ -75,20 +75,20 @@ string(27) "this is test object2323.444" string(38) "this is test objectthis is test object" string(30) "some stringthis is test object" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(16) "some stringArray" string(14) "some string222" string(19) "some string2323.444" string(22) "some stringsome string" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(8) "222Array" string(22) "222this is test object" string(14) "222some string" string(11) "2222323.444" string(6) "222222" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(13) "2323.444Array" string(27) "2323.444this is test object" string(19) "2323.444some string" diff --git a/Zend/tests/dereference_002.phpt b/Zend/tests/dereference_002.phpt index 7290df7714df2..e17e5e85b6258 100644 --- a/Zend/tests/dereference_002.phpt +++ b/Zend/tests/dereference_002.phpt @@ -70,7 +70,7 @@ array(2) { } int(1) -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL Notice: Undefined offset: 4 in %s on line %d diff --git a/Zend/tests/dereference_007.phpt b/Zend/tests/dereference_007.phpt index e7df6a422de2b..afe6e9d5b2ce5 100644 --- a/Zend/tests/dereference_007.phpt +++ b/Zend/tests/dereference_007.phpt @@ -33,5 +33,5 @@ print "ok\n"; ?> --EXPECTF-- -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d ok diff --git a/Zend/tests/dereference_010.phpt b/Zend/tests/dereference_010.phpt index c63f6acaf96e6..c916352afa4c9 100644 --- a/Zend/tests/dereference_010.phpt +++ b/Zend/tests/dereference_010.phpt @@ -21,10 +21,10 @@ var_dump(b()[1]); ?> --EXPECTF-- -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL Fatal error: Uncaught Error: Cannot use object of type stdClass as array in %s:%d diff --git a/Zend/tests/dereference_014.phpt b/Zend/tests/dereference_014.phpt index 189dca7a38961..470c233a19d85 100644 --- a/Zend/tests/dereference_014.phpt +++ b/Zend/tests/dereference_014.phpt @@ -27,12 +27,12 @@ var_dump($h); ?> --EXPECTF-- -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to get property 'a' of non-object in %s on line %d +Warning: Trying to get property 'a' of non-object in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to get property 'b' of non-object in %s on line %d +Warning: Trying to get property 'b' of non-object in %s on line %d NULL diff --git a/Zend/tests/dynamic_call_004.phpt b/Zend/tests/dynamic_call_004.phpt index 2f444b3ee6831..9028b1c801a14 100644 --- a/Zend/tests/dynamic_call_004.phpt +++ b/Zend/tests/dynamic_call_004.phpt @@ -7,7 +7,7 @@ $a::$b(); ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d Fatal error: Uncaught Error: Class name must be a valid object or a string in %s:%d Stack trace: diff --git a/Zend/tests/entry_block_with_predecessors.phpt b/Zend/tests/entry_block_with_predecessors.phpt index ffc3147f1c849..45c3302fc0ea9 100644 --- a/Zend/tests/entry_block_with_predecessors.phpt +++ b/Zend/tests/entry_block_with_predecessors.phpt @@ -28,6 +28,6 @@ test2(); ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d int(1) int(2) diff --git a/Zend/tests/errmsg_045.phpt b/Zend/tests/errmsg_045.phpt index 5a4deadb5926a..6311eb30e582d 100644 --- a/Zend/tests/errmsg_045.phpt +++ b/Zend/tests/errmsg_045.phpt @@ -17,4 +17,4 @@ eval('class A { private function __invoke() { } }'); string(76) "The magic method __invoke() must have public visibility and cannot be static" string(%d) "%s(%d) : eval()'d code" -Notice: Undefined variable: undefined in %s on line %d +Warning: Undefined variable: undefined in %s on line %d diff --git a/Zend/tests/error_reporting03.phpt b/Zend/tests/error_reporting03.phpt index f344e9557b063..b4fbbecca81c6 100644 --- a/Zend/tests/error_reporting03.phpt +++ b/Zend/tests/error_reporting03.phpt @@ -30,6 +30,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> --EXPECTF-- -Notice: Undefined variable: undef2 in %s on line %d +Warning: Undefined variable: undef2 in %s on line %d int(32767) Done diff --git a/Zend/tests/error_reporting04.phpt b/Zend/tests/error_reporting04.phpt index 5b476cdf7f543..7cd555716a4f5 100644 --- a/Zend/tests/error_reporting04.phpt +++ b/Zend/tests/error_reporting04.phpt @@ -18,6 +18,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> --EXPECTF-- -Notice: Undefined variable: undef in %s on line %d +Warning: Undefined variable: undef in %s on line %d int(32767) Done diff --git a/Zend/tests/error_reporting05.phpt b/Zend/tests/error_reporting05.phpt index 6ea76fda3eafb..9c1a7c48d672e 100644 --- a/Zend/tests/error_reporting05.phpt +++ b/Zend/tests/error_reporting05.phpt @@ -27,8 +27,8 @@ var_dump(error_reporting()); echo "Done\n"; ?> --EXPECTF-- -Notice: Undefined variable: undef_value in %s on line %d +Warning: Undefined variable: undef_value in %s on line %d -Notice: Undefined variable: undef_name in %s on line %d +Warning: Undefined variable: undef_name in %s on line %d int(32767) Done diff --git a/Zend/tests/error_reporting08.phpt b/Zend/tests/error_reporting08.phpt index 32cb6b8d16cf9..868c8791600d1 100644 --- a/Zend/tests/error_reporting08.phpt +++ b/Zend/tests/error_reporting08.phpt @@ -27,6 +27,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> --EXPECTF-- -Notice: Undefined variable: undef3 in %s on line %d +Warning: Undefined variable: undef3 in %s on line %d int(32767) Done diff --git a/Zend/tests/error_reporting09.phpt b/Zend/tests/error_reporting09.phpt index 3d723f36c06dc..287c25460f4b1 100644 --- a/Zend/tests/error_reporting09.phpt +++ b/Zend/tests/error_reporting09.phpt @@ -24,8 +24,8 @@ var_dump(error_reporting()); echo "Done\n"; ?> --EXPECTF-- -Notice: Undefined variable: blah in %s on line %d +Warning: Undefined variable: blah in %s on line %d -Notice: Undefined variable: undef2 in %s on line %d +Warning: Undefined variable: undef2 in %s on line %d int(32767) Done diff --git a/Zend/tests/foreach_undefined.phpt b/Zend/tests/foreach_undefined.phpt index aa4a160e6c70f..bc1d8bbc71519 100644 --- a/Zend/tests/foreach_undefined.phpt +++ b/Zend/tests/foreach_undefined.phpt @@ -8,7 +8,7 @@ foreach($a as $val); echo "Done\n"; ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d Warning: Invalid argument supplied for foreach() in %s on line %d Done diff --git a/Zend/tests/get_class_vars_002.phpt b/Zend/tests/get_class_vars_002.phpt index 23531e458d4cb..475545ffe7d5e 100644 --- a/Zend/tests/get_class_vars_002.phpt +++ b/Zend/tests/get_class_vars_002.phpt @@ -41,9 +41,9 @@ array(3) { int(6) } -Notice: Undefined property: C::$b in %s on line %d +Warning: Undefined property: C::$b in %s on line %d -Notice: Undefined property: C::$c in %s on line %d +Warning: Undefined property: C::$c in %s on line %d int(1) NULL NULL diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt index 9a9c5401fe27f..821f345b81f83 100644 --- a/Zend/tests/globals_001.phpt +++ b/Zend/tests/globals_001.phpt @@ -29,6 +29,6 @@ string(%d) "%s" Notice: Undefined index: PHP_SELF in %s on line %d NULL -Notice: Undefined variable: _SERVER in %s on line %d +Warning: Undefined variable: _SERVER in %s on line %d NULL Done diff --git a/Zend/tests/globals_002.phpt b/Zend/tests/globals_002.phpt index d57e350092bbd..f2f53a13f5881 100644 --- a/Zend/tests/globals_002.phpt +++ b/Zend/tests/globals_002.phpt @@ -32,6 +32,6 @@ string(%d) "%s" Notice: Undefined index: PHP_SELF in %s on line %d NULL -Notice: Undefined variable: _SERVER in %s on line %d +Warning: Undefined variable: _SERVER in %s on line %d NULL Done diff --git a/Zend/tests/globals_003.phpt b/Zend/tests/globals_003.phpt index cdd4d211afd2f..24e8edd8aaf77 100644 --- a/Zend/tests/globals_003.phpt +++ b/Zend/tests/globals_003.phpt @@ -38,6 +38,6 @@ string(%d) "%s" Notice: Undefined index: PHP_SELF in %s on line %d NULL -Notice: Undefined variable: _SERVER in %s on line %d +Warning: Undefined variable: _SERVER in %s on line %d NULL Done diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals_004.phpt index 0f2f7f0764179..9ba3866835ec8 100644 --- a/Zend/tests/globals_004.phpt +++ b/Zend/tests/globals_004.phpt @@ -23,6 +23,6 @@ string(%d) "%s" Notice: Undefined index: PHP_SELF in %s on line %d NULL -Notice: Undefined variable: _SERVER in %s on line %d +Warning: Undefined variable: _SERVER in %s on line %d NULL Done diff --git a/Zend/tests/indexing_001.phpt b/Zend/tests/indexing_001.phpt index a659d66141cc2..453b5ca86f80d 100644 --- a/Zend/tests/indexing_001.phpt +++ b/Zend/tests/indexing_001.phpt @@ -79,12 +79,12 @@ array(1) { Warning: Illegal string offset 'foo' in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(1) "A" Warning: Illegal string offset 'foo' in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(1) "A" Cannot use a scalar value as an array float(0.1) diff --git a/Zend/tests/inference_infinite_loop.phpt b/Zend/tests/inference_infinite_loop.phpt index 1e94ea8040bca..ffa5cdbf8959e 100644 --- a/Zend/tests/inference_infinite_loop.phpt +++ b/Zend/tests/inference_infinite_loop.phpt @@ -14,4 +14,4 @@ test(); ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d diff --git a/Zend/tests/isset_003.phpt b/Zend/tests/isset_003.phpt index 06cbe3d51d629..c80a174dafb5b 100644 --- a/Zend/tests/isset_003.phpt +++ b/Zend/tests/isset_003.phpt @@ -29,13 +29,13 @@ bool(true) bool(false) bool(false) -Notice: Undefined variable: c in %s on line %d +Warning: Undefined variable: c in %s on line %d -Notice: Undefined variable: d in %s on line %d +Warning: Undefined variable: d in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d -Notice: Trying to get property '' of non-object in %s on line %d +Warning: Trying to get property '' of non-object in %s on line %d bool(false) bool(true) bool(false) diff --git a/Zend/tests/list_keyed_conversions.phpt b/Zend/tests/list_keyed_conversions.phpt index bf0349b327666..1dd48de9f2ac5 100644 --- a/Zend/tests/list_keyed_conversions.phpt +++ b/Zend/tests/list_keyed_conversions.phpt @@ -29,6 +29,6 @@ int(1) int(0) int(1) -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d Notice: Undefined offset: 1 in %s on line %d diff --git a/Zend/tests/method_argument_binding.phpt b/Zend/tests/method_argument_binding.phpt index dea12621a394a..32acd93c63c0e 100644 --- a/Zend/tests/method_argument_binding.phpt +++ b/Zend/tests/method_argument_binding.phpt @@ -43,4 +43,4 @@ class E extends D { --EXPECTF-- int(2) -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/Zend/tests/offset_array.phpt b/Zend/tests/offset_array.phpt index 00e6cb05e7e23..97b6a06b1c32e 100644 --- a/Zend/tests/offset_array.phpt +++ b/Zend/tests/offset_array.phpt @@ -44,7 +44,7 @@ NULL int(2) int(1) -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d int(%d) Illegal offset type Illegal offset type diff --git a/Zend/tests/offset_bool.phpt b/Zend/tests/offset_bool.phpt index 8ed9f28e433ca..ae8df6d2b5b40 100644 --- a/Zend/tests/offset_bool.phpt +++ b/Zend/tests/offset_bool.phpt @@ -25,30 +25,30 @@ var_dump($bool[$arr]); echo "Done\n"; ?> --EXPECTF-- -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL Done diff --git a/Zend/tests/offset_long.phpt b/Zend/tests/offset_long.phpt index 4c6b3972d220e..17dfe0d29bf74 100644 --- a/Zend/tests/offset_long.phpt +++ b/Zend/tests/offset_long.phpt @@ -25,30 +25,30 @@ var_dump($long[$arr]); echo "Done\n"; ?> --EXPECTF-- -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL Done diff --git a/Zend/tests/offset_null.phpt b/Zend/tests/offset_null.phpt index ad0b1f3049129..ae02eece77ca3 100644 --- a/Zend/tests/offset_null.phpt +++ b/Zend/tests/offset_null.phpt @@ -25,30 +25,30 @@ var_dump($null[$arr]); echo "Done\n"; ?> --EXPECTF-- -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL Done diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/offset_string.phpt index 01b0815ea0bb9..1a9667cb8fbcb 100644 --- a/Zend/tests/offset_string.phpt +++ b/Zend/tests/offset_string.phpt @@ -42,10 +42,10 @@ echo "Done\n"; --EXPECTF-- string(1) "i" -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d string(1) "S" -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d string(1) "S" Warning: Illegal string offset 'run away' in %s on line %d @@ -58,10 +58,10 @@ string(1) "o" Notice: A non well formed numeric value encountered in %s on line %d string(1) "r" -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d string(1) "i" -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d string(1) "S" Illegal offset type diff --git a/Zend/tests/result_unused.phpt b/Zend/tests/result_unused.phpt index 12892e8415469..263755beb04a7 100644 --- a/Zend/tests/result_unused.phpt +++ b/Zend/tests/result_unused.phpt @@ -24,5 +24,5 @@ $x->prop; $x->y; echo "ok\n"; --EXPECTF-- -Notice: Uninitialized string offset: 3 in %sresult_unused.php on line %d +Warning: Uninitialized string offset: 3 in %s on line %d ok diff --git a/Zend/tests/settype_string.phpt b/Zend/tests/settype_string.phpt index 3a2d59ecaea256b1163df6336a86c5498d253d68..0c974500510d0f2c5dd949c70ac6b914a69214ff 100644 GIT binary patch delta 32 fcmaFK`kHkEGZTAwVo_dZUi#z!CI=2K1ZO4yw?GQ~ delta 37 kcmaFO`jT}6GZUL%eo1C>>SQh^M+DPh@?l1a$*Y(g0qcki5&!@I diff --git a/Zend/tests/str_offset_001.phpt b/Zend/tests/str_offset_001.phpt index 3317674857026..04fadd3023fe3 100644 --- a/Zend/tests/str_offset_001.phpt +++ b/Zend/tests/str_offset_001.phpt @@ -28,19 +28,19 @@ string(1) "a" string(1) "b" string(1) "c" -Notice: Uninitialized string offset: 3 in %sstr_offset_001.php on line %d +Warning: Uninitialized string offset: 3 in %s on line %d string(0) "" string(1) "b" -Notice: Uninitialized string offset: 1 in %sstr_offset_001.php on line %d +Warning: Uninitialized string offset: 1 in %s on line %d string(0) "" string(1) "a" string(1) "b" string(1) "c" -Notice: Uninitialized string offset: 3 in %sstr_offset_001.php on line %d +Warning: Uninitialized string offset: 3 in %s on line %d string(0) "" string(1) "b" -Notice: Uninitialized string offset: 1 in %sstr_offset_001.php on line %d +Warning: Uninitialized string offset: 1 in %s on line %d string(0) "" diff --git a/Zend/tests/str_offset_003.phpt b/Zend/tests/str_offset_003.phpt index e357ac0c01ed0..4101ce522ab06 100644 --- a/Zend/tests/str_offset_003.phpt +++ b/Zend/tests/str_offset_003.phpt @@ -20,18 +20,18 @@ foo($str[2][-2]); foo($str[2][-1]); ?> --EXPECTF-- -Notice: Uninitialized string offset: -10 in %sstr_offset_003.php on line %d +Warning: Uninitialized string offset: -10 in %s on line %d string(0) "" string(1) "d" -Notice: Uninitialized string offset: -2 in %sstr_offset_003.php on line %d +Warning: Uninitialized string offset: -2 in %s on line %d string(0) "" string(1) "c" -Notice: Uninitialized string offset: -10 in %sstr_offset_003.php on line %d +Warning: Uninitialized string offset: -10 in %s on line %d string(0) "" string(1) "d" -Notice: Uninitialized string offset: -2 in %sstr_offset_003.php on line %d +Warning: Uninitialized string offset: -2 in %s on line %d string(0) "" string(1) "c" diff --git a/Zend/tests/strict_001.phpt b/Zend/tests/strict_001.phpt index 3fcaa8c2bcecf..54c5a76c48cdd 100644 --- a/Zend/tests/strict_001.phpt +++ b/Zend/tests/strict_001.phpt @@ -14,6 +14,6 @@ var_dump($array[$fp]); echo "Done\n"; ?> --EXPECTF-- -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d int(%d) Done diff --git a/Zend/tests/this_in_extract.phpt b/Zend/tests/this_in_extract.phpt index 9903d7d794fcd..ef0a25a279404 100644 --- a/Zend/tests/this_in_extract.phpt +++ b/Zend/tests/this_in_extract.phpt @@ -15,5 +15,5 @@ foo(); --EXPECTF-- Cannot re-assign $this -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d NULL diff --git a/Zend/tests/type_declarations/typed_properties_103.phpt b/Zend/tests/type_declarations/typed_properties_103.phpt index 5c0fc85a99242..f3f70bfa62e8c 100644 --- a/Zend/tests/type_declarations/typed_properties_103.phpt +++ b/Zend/tests/type_declarations/typed_properties_103.phpt @@ -15,7 +15,7 @@ function foo() { foo(); ?> --EXPECTF-- -Notice: Undefined property: C::$a in %s on line %d +Warning: Undefined property: C::$a in %s on line %d object(C)#1 (1) { ["a"]=> int(2) diff --git a/Zend/tests/unset_cv01.phpt b/Zend/tests/unset_cv01.phpt index 99af118d10c24..508a0cbf3eb9d 100644 --- a/Zend/tests/unset_cv01.phpt +++ b/Zend/tests/unset_cv01.phpt @@ -10,4 +10,4 @@ echo $x; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv01.php on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/Zend/tests/unset_cv02.phpt b/Zend/tests/unset_cv02.phpt index cb2475350c226..915b165eca6f6 100644 --- a/Zend/tests/unset_cv02.phpt +++ b/Zend/tests/unset_cv02.phpt @@ -10,4 +10,4 @@ echo $x; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv02.php on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/Zend/tests/unset_cv03.phpt b/Zend/tests/unset_cv03.phpt index 221abe2d884c6..dce3fce5f13b2 100644 --- a/Zend/tests/unset_cv03.phpt +++ b/Zend/tests/unset_cv03.phpt @@ -10,4 +10,4 @@ echo $x; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv03.php on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/Zend/tests/unset_cv04.phpt b/Zend/tests/unset_cv04.phpt index 5044cb1c8d73b..816a5f9ce4a13 100644 --- a/Zend/tests/unset_cv04.phpt +++ b/Zend/tests/unset_cv04.phpt @@ -13,4 +13,4 @@ f(); --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv04.php on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/Zend/tests/unset_cv05.phpt b/Zend/tests/unset_cv05.phpt index 073ee4bee4dc3..a389d651ade7c 100644 --- a/Zend/tests/unset_cv05.phpt +++ b/Zend/tests/unset_cv05.phpt @@ -17,6 +17,6 @@ echo $_SESSION; echo "\nok\n"; ?> --EXPECTF-- -Notice: Array to string conversion in %sunset_cv05.php on line %d +Warning: Array to string conversion in %s on line %d Array ok diff --git a/Zend/tests/unset_cv09.phpt b/Zend/tests/unset_cv09.phpt index a5407ad64e939..a52062575cfec 100644 --- a/Zend/tests/unset_cv09.phpt +++ b/Zend/tests/unset_cv09.phpt @@ -10,5 +10,5 @@ echo "ok\n"; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv09.php on line %d +Warning: Undefined variable: x in %s on line %d ok diff --git a/Zend/tests/unset_cv10.phpt b/Zend/tests/unset_cv10.phpt index 335463b0ca8a9..97a79bb9737d4 100644 --- a/Zend/tests/unset_cv10.phpt +++ b/Zend/tests/unset_cv10.phpt @@ -12,5 +12,5 @@ echo "ok\n"; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv10.php on line %d +Warning: Undefined variable: x in %s on line %d ok diff --git a/Zend/tests/varSyntax/propertyOfStringError.phpt b/Zend/tests/varSyntax/propertyOfStringError.phpt index 4fa50e7df0296..446f1372cd729 100644 --- a/Zend/tests/varSyntax/propertyOfStringError.phpt +++ b/Zend/tests/varSyntax/propertyOfStringError.phpt @@ -7,4 +7,4 @@ Cannot take property of a string ?> --EXPECTF-- -Notice: Trying to get property 'bar' of non-object in %s on line %d +Warning: Trying to get property 'bar' of non-object in %s on line %d From f176c69e41408957ecf4f547df8a529c79d778cf Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 14:22:43 +0200 Subject: [PATCH 3/9] Update tests/ --- tests/basic/025.phpt | 2 +- tests/basic/enable_post_data_reading_01.phpt | 2 +- tests/basic/enable_post_data_reading_03.phpt | 2 +- tests/basic/enable_post_data_reading_04.phpt | 2 +- tests/classes/bug27468.phpt | 2 +- tests/classes/constants_basic_001.phpt | 2 +- tests/classes/constants_basic_002.phpt | 2 +- tests/classes/static_properties_003.phpt | 2 +- tests/lang/bison1.phpt | 4 +- tests/lang/bug23584.phpt | 4 +- tests/lang/bug27439.phpt | 2 +- tests/lang/foreachLoopObjects.004.phpt | 6 +- tests/lang/passByReference_003.phpt | 6 +- tests/lang/passByReference_005.phpt | 64 ++++++++++---------- tests/lang/short_tags.004.phpt | 4 +- 15 files changed, 53 insertions(+), 53 deletions(-) diff --git a/tests/basic/025.phpt b/tests/basic/025.phpt index 37561a2a2ee0c..30d50c805d43b 100644 --- a/tests/basic/025.phpt +++ b/tests/basic/025.phpt @@ -15,7 +15,7 @@ Warning: Unknown: POST Content-Length of 2050 bytes exceeds the limit of 1024 by Warning: Cannot modify header information - headers already sent in Unknown on line 0 -Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d +Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d array(0) { } NULL diff --git a/tests/basic/enable_post_data_reading_01.phpt b/tests/basic/enable_post_data_reading_01.phpt index 19ee5d583f762..d717b2b0b0ee0 100644 --- a/tests/basic/enable_post_data_reading_01.phpt +++ b/tests/basic/enable_post_data_reading_01.phpt @@ -18,7 +18,7 @@ array(0) { array(0) { } -Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d +Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d NULL string(9) "a=1&b=ZYX" string(9) "a=1&b=ZYX" diff --git a/tests/basic/enable_post_data_reading_03.phpt b/tests/basic/enable_post_data_reading_03.phpt index 6a62282ea2e56..5982f61c9193b 100644 --- a/tests/basic/enable_post_data_reading_03.phpt +++ b/tests/basic/enable_post_data_reading_03.phpt @@ -19,7 +19,7 @@ array(0) { array(0) { } -Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d +Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d NULL string(9) "a=1&b=ZYX" string(9) "a=1&b=ZYX" diff --git a/tests/basic/enable_post_data_reading_04.phpt b/tests/basic/enable_post_data_reading_04.phpt index a7c7e496d8c16..17432e929881a 100644 --- a/tests/basic/enable_post_data_reading_04.phpt +++ b/tests/basic/enable_post_data_reading_04.phpt @@ -19,7 +19,7 @@ array(0) { array(0) { } -Notice: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d +Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d NULL string(9) "a=1&b=ZYX" string(9) "a=1&b=ZYX" diff --git a/tests/classes/bug27468.phpt b/tests/classes/bug27468.phpt index 58a7b6cb16735..1c54fa61ce9e8 100644 --- a/tests/classes/bug27468.phpt +++ b/tests/classes/bug27468.phpt @@ -11,7 +11,7 @@ new foo(); echo 'OK'; ?> --EXPECTF-- -Notice: Undefined property: foo::$x in %sbug27468.php on line 4 +Warning: Undefined property: foo::$x in %s on line %d Warning: Invalid argument supplied for foreach() in %sbug27468.php on line 4 OK diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index 38da2dfde009c..af9915c2775b0 100644 --- a/tests/classes/constants_basic_001.phpt +++ b/tests/classes/constants_basic_001.phpt @@ -55,7 +55,7 @@ Class constant declarations echo "\nYou should not see this."; ?> --EXPECTF-- -Notice: Undefined variable: undef in %s on line 5 +Warning: Undefined variable: undef in %s on line %d Attempt to access various kinds of class constants: int(1) diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt index def661ec45627..88c66aaee8c29 100644 --- a/tests/classes/constants_basic_002.phpt +++ b/tests/classes/constants_basic_002.phpt @@ -23,7 +23,7 @@ string(5) "hello" Fail to read class constant from instance. -Notice: Undefined property: aclass::$myConst in %s on line 12 +Warning: Undefined property: aclass::$myConst in %s on line %d NULL Class constant not visible in object var_dump. diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt index 89c26d3dd392c..64641c47c52c9 100644 --- a/tests/classes/static_properties_003.phpt +++ b/tests/classes/static_properties_003.phpt @@ -34,7 +34,7 @@ Notice: Accessing static property C::$x as non static in %s on line 11 Notice: Accessing static property C::$x as non static in %s on line 12 -Notice: Undefined property: C::$x in %s on line 12 +Warning: Undefined property: C::$x in %s on line %d Notice: Accessing static property C::$x as non static in %s on line 13 diff --git a/tests/lang/bison1.phpt b/tests/lang/bison1.phpt index 3571576fb8347..f77cce0055545 100644 --- a/tests/lang/bison1.phpt +++ b/tests/lang/bison1.phpt @@ -2,8 +2,8 @@ Bison weirdness --FILE-- ---EXPECT-- +--EXPECTF-- +Warning: Undefined variable: foo in %s on line %d blah- diff --git a/tests/lang/bug23584.phpt b/tests/lang/bug23584.phpt index 417cfb085651a..b9dc10ac67d33 100644 --- a/tests/lang/bug23584.phpt +++ b/tests/lang/bug23584.phpt @@ -9,5 +9,5 @@ error_reporting(E_ALL); echo $foo; ?> ---EXPECTREGEX-- -Notice: Undefined variable:.*foo in .* on line 6 +--EXPECTF-- +Warning: Undefined variable: foo in %s on line 6 diff --git a/tests/lang/bug27439.phpt b/tests/lang/bug27439.phpt index 4bcadb78fd319..de4bcd05a7bc3 100644 --- a/tests/lang/bug27439.phpt +++ b/tests/lang/bug27439.phpt @@ -65,7 +65,7 @@ echo "===DONE==="; ?> --EXPECTF-- 123 -Notice: Undefined property: test::$foobar in %s on line %d +Warning: Undefined property: test::$foobar in %s on line %d Warning: Invalid argument supplied for foreach() in %s on line %d diff --git a/tests/lang/foreachLoopObjects.004.phpt b/tests/lang/foreachLoopObjects.004.phpt index 01e4e9fd9a600..283e6be90c1a0 100644 --- a/tests/lang/foreachLoopObjects.004.phpt +++ b/tests/lang/foreachLoopObjects.004.phpt @@ -34,13 +34,13 @@ Removing the current element from an iterated object. string(10) "Original a" string(10) "Original b" -Notice: Undefined property: C::$b in %s on line %d +Warning: Undefined property: C::$b in %s on line %d string(10) "Original c" -Notice: Undefined property: C::$b in %s on line %d +Warning: Undefined property: C::$b in %s on line %d string(10) "Original d" -Notice: Undefined property: C::$b in %s on line %d +Warning: Undefined property: C::$b in %s on line %d string(10) "Original e" object(C)#%d (4) { ["a"]=> diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt index ad9e1e39dec55..de9ac09d8d800 100644 --- a/tests/lang/passByReference_003.phpt +++ b/tests/lang/passByReference_003.phpt @@ -25,16 +25,16 @@ var_dump($undef2) --EXPECTF-- Passing undefined by value -Notice: Undefined variable: undef1 in %s on line %d +Warning: Undefined variable: undef1 in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d Inside passbyVal call: NULL After call -Notice: Undefined variable: undef1 in %s on line %d +Warning: Undefined variable: undef1 in %s on line %d NULL Passing undefined by reference diff --git a/tests/lang/passByReference_005.phpt b/tests/lang/passByReference_005.phpt index ffa5de589fe03..82b79b684f053 100644 --- a/tests/lang/passByReference_005.phpt +++ b/tests/lang/passByReference_005.phpt @@ -170,31 +170,31 @@ var_dump($u1, $u2); --EXPECTF-- ---- Pass by ref / pass by val: functions ---- -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d NULL NULL -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d string(11) "Ref changed" NULL string(12) "Ref1 changed" @@ -203,31 +203,31 @@ string(12) "Ref2 changed" ---- Pass by ref / pass by val: static method calls ---- -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d NULL NULL -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d string(11) "Ref changed" NULL string(12) "Ref1 changed" @@ -236,37 +236,37 @@ string(12) "Ref2 changed" ---- Pass by ref / pass by val: instance method calls ---- -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d NULL NULL -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d string(11) "Ref changed" NULL string(12) "Ref1 changed" diff --git a/tests/lang/short_tags.004.phpt b/tests/lang/short_tags.004.phpt index 6df8af1c2a698..9bf73b064b752 100644 --- a/tests/lang/short_tags.004.phpt +++ b/tests/lang/short_tags.004.phpt @@ -29,6 +29,6 @@ This gets echoed twice -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d From f349d513069428b29409adf06ccd9b3205d5de3e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 14:38:36 +0200 Subject: [PATCH 4/9] Update PCRE tests --- ext/pcre/tests/bug44925.phpt | 4 ++-- ext/pcre/tests/preg_grep_error1.phpt | 3 +-- ext/pcre/tests/preg_match_all_error1.phpt | 3 +-- ext/pcre/tests/preg_match_all_error2.phpt | 3 +-- ext/pcre/tests/preg_match_error1.phpt | 3 +-- ext/pcre/tests/preg_match_error2.phpt | 3 +-- ext/pcre/tests/preg_replace_callback2.phpt | 2 +- ext/pcre/tests/preg_replace_callback_error1.phpt | 9 ++++----- ext/pcre/tests/preg_replace_error1.phpt | 3 +-- ext/pcre/tests/preg_replace_error2.phpt | 3 +-- ext/pcre/tests/preg_split_error1.phpt | 3 +-- 11 files changed, 15 insertions(+), 24 deletions(-) diff --git a/ext/pcre/tests/bug44925.phpt b/ext/pcre/tests/bug44925.phpt index f6e0db425305e..c495331b4be47 100644 --- a/ext/pcre/tests/bug44925.phpt +++ b/ext/pcre/tests/bug44925.phpt @@ -45,11 +45,11 @@ array(9) { &string(1) "b" } -Notice: Array to string conversion in %sbug44925.php on line 9 +Warning: Array to string conversion in %s on line %d array(0) { } -Notice: Array to string conversion in %sbug44925.php on line 11 +Warning: Array to string conversion in %s on line %d array(7) { [0]=> string(1) "1" diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt index 79fcb98897da7..1bf23bb640cab 100644 --- a/ext/pcre/tests/preg_grep_error1.phpt +++ b/ext/pcre/tests/preg_grep_error1.phpt @@ -6,7 +6,6 @@ Test preg_grep() function : error conditions - bad regular expressions * proto array preg_grep(string regex, array input [, int flags]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_grep reacts to being passed bad regexes */ @@ -19,7 +18,7 @@ $values = array('abcdef', //Regex without delimiter ); $array = array(123, 'abc', 'test'); foreach($values as $value) { - print "\nArg value is $value\n"; + @print "\nArg value is $value\n"; try { var_dump(preg_grep($value, $array)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt index bd0f28c8c4b4e..6a5a0055a94cd 100644 --- a/ext/pcre/tests/preg_match_all_error1.phpt +++ b/ext/pcre/tests/preg_match_all_error1.phpt @@ -6,7 +6,6 @@ Test preg_match_all() function : error conditions - bad regular expressions * proto int preg_match_all(string pattern, string subject, array subpatterns [, int flags [, int offset]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_match_all reacts to being passed the wrong type of regex argument */ @@ -19,7 +18,7 @@ $regex_array = array('abcdef', //Regex without delimiter ); $subject = 'test'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; try { var_dump(preg_match_all($regex_value, $subject, $matches1)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_match_all_error2.phpt b/ext/pcre/tests/preg_match_all_error2.phpt index 8c52b73076cca..29762739c489b 100644 --- a/ext/pcre/tests/preg_match_all_error2.phpt +++ b/ext/pcre/tests/preg_match_all_error2.phpt @@ -6,7 +6,6 @@ Test preg_match_all() function : error conditions - wrong arg types * proto int preg_match_all(string pattern, string subject, array subpatterns [, int flags [, int offset]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_match_all reacts to being passed the wrong type of input argument */ @@ -14,7 +13,7 @@ echo "*** Testing preg_match_all() : error conditions ***\n"; $regex = '/[a-zA-Z]/'; $input = array(array('this is', 'a subarray'), 'test',); foreach($input as $value) { - print "\nArg value is: $value\n"; + @print "\nArg value is: $value\n"; try { var_dump(preg_match_all($regex, $value, $matches)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt index 23d6829c48435..2f1b39d67ffec 100644 --- a/ext/pcre/tests/preg_match_error1.phpt +++ b/ext/pcre/tests/preg_match_error1.phpt @@ -6,7 +6,6 @@ Test preg_match() function : error conditions - bad regular expressions * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_match reacts to being passed the wrong type of regex argument */ @@ -19,7 +18,7 @@ $regex_array = array('abcdef', //Regex without delimiter ); $subject = 'this is a test'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; try { var_dump(preg_match($regex_value, $subject)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_match_error2.phpt b/ext/pcre/tests/preg_match_error2.phpt index 9530983e81950..18a42c6445a15 100644 --- a/ext/pcre/tests/preg_match_error2.phpt +++ b/ext/pcre/tests/preg_match_error2.phpt @@ -6,7 +6,6 @@ Test preg_match() function : error conditions - wrong arg types * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_match reacts to being passed the wrong type of subject argument */ @@ -14,7 +13,7 @@ echo "*** Testing preg_match() : error conditions ***\n"; $regex = '/[a-zA-Z]/'; $input = array('this is a string', array('this is', 'a subarray'),); foreach($input as $value) { - print "\nArg value is: $value\n"; + @print "\nArg value is: $value\n"; try { var_dump(preg_match($regex, $value)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_replace_callback2.phpt b/ext/pcre/tests/preg_replace_callback2.phpt index 1fe78d59ee66e..6dab1a0cf20f3 100644 --- a/ext/pcre/tests/preg_replace_callback2.phpt +++ b/ext/pcre/tests/preg_replace_callback2.phpt @@ -31,7 +31,7 @@ array(3) { string(9) "'aa' 'bb'" } -Notice: Array to string conversion in %spreg_replace_callback2.php on line 17 +Warning: Array to string conversion in %s on line %d array(1) { [0]=> string(7) "'A'rray" diff --git a/ext/pcre/tests/preg_replace_callback_error1.phpt b/ext/pcre/tests/preg_replace_callback_error1.phpt index 313064eab8cf1..cf069692e8ad3 100644 --- a/ext/pcre/tests/preg_replace_callback_error1.phpt +++ b/ext/pcre/tests/preg_replace_callback_error1.phpt @@ -6,7 +6,6 @@ Test preg_replace_callback() function : error * proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_replace_callback reacts to being passed the wrong type of regex argument */ @@ -15,7 +14,7 @@ $regex_array = array('abcdef', //Regex without delimiters '/[a-zA-Z]', //Regex without closing delimiter '[a-zA-Z]/', //Regex without opening delimiter '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes -'[A-Z]', '[0-9]'), '/[a-zA-Z]/'); //Regex string +'[A-Z]', '[0-9]'), '/[0-9]/'); //Regex string $replacement = array('zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine'); function integer_word($matches) { global $replacement; @@ -23,7 +22,7 @@ function integer_word($matches) { } $subject = 'number 1.'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; var_dump(preg_replace_callback($regex_value, 'integer_word', $subject)); } ?> @@ -54,6 +53,6 @@ NULL Arg value is Array string(9) "number 1." -Arg value is /[a-zA-Z]/ -string(3) " 1." +Arg value is /[0-9]/ +string(11) "number one." ===Done=== diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt index 780556956a602..669a5c6c4e9c3 100644 --- a/ext/pcre/tests/preg_replace_error1.phpt +++ b/ext/pcre/tests/preg_replace_error1.phpt @@ -6,7 +6,6 @@ Test preg_replace() function : error - bad regular expressions * proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_replace reacts to being passed the wrong type of regex argument */ @@ -20,7 +19,7 @@ $regex_array = array('abcdef', //Regex without delimiter $replace = 1; $subject = 'a'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; var_dump(preg_replace($regex_value, $replace, $subject)); } $regex_value = new stdclass(); //Object diff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt index 0a3ba3bb46b92..eeff2fae54593 100644 --- a/ext/pcre/tests/preg_replace_error2.phpt +++ b/ext/pcre/tests/preg_replace_error2.phpt @@ -6,7 +6,6 @@ Test preg_replace() function : error conditions - wrong arg types * proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_replace reacts to being passed the wrong type of replacement argument */ @@ -15,7 +14,7 @@ $regex = '/[a-zA-Z]/'; $replace = array('this is a string', array('this is', 'a subarray'),); $subject = 'test'; foreach($replace as $value) { - print "\nArg value is: $value\n"; + @print "\nArg value is: $value\n"; try { var_dump(preg_replace($regex, $value, $subject)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_split_error1.phpt b/ext/pcre/tests/preg_split_error1.phpt index 1c1e3ec646aa4..b69caf1aed630 100644 --- a/ext/pcre/tests/preg_split_error1.phpt +++ b/ext/pcre/tests/preg_split_error1.phpt @@ -6,7 +6,6 @@ Test preg_split() function : error conditions - bad regular expressions * proto array preg_split(string pattern, string subject [, int limit [, int flags]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_split reacts to being passed the wrong type of regex argument */ @@ -19,7 +18,7 @@ $regex_array = array('abcdef', //Regex without delimiter ); $subject = '1 2 a 3 4 b 5 6'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; try { var_dump(preg_split($regex_value, $subject)); } catch (TypeError $e) { From 57ba169033dfed7c6929cc00ebaabf0b9b7b1334 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 14:52:11 +0200 Subject: [PATCH 5/9] Update other tests --- ext/date/tests/bug62500.phpt | 2 +- ext/date/tests/bug74852.phpt | 2 +- ext/date/tests/bug75232.phpt | 4 +- .../tests/DOMAttr_ownerElement_error_001.phpt | 2 +- ext/dom/tests/bug36756.phpt | 2 +- ext/dom/tests/bug67949.phpt | 4 +- .../tests/dateformat_setTimeZone_error.phpt | 2 +- ext/libxml/tests/bug61367-read.phpt | 5 +- ext/mysqli/tests/mysqli_options.phpt | 2 +- ext/pdo_mysql/tests/bug44327.phpt | 2 +- ext/pdo_sqlite/tests/bug43831.phpt | 2 +- .../ReflectionClass_constructor_002.phpt | 2 +- .../tests/ReflectionParameter_003.phpt | 2 +- .../tests/session_decode_variation3.phpt | 2 +- ext/session/tests/session_encode_error2.phpt | 2 +- .../session_set_save_handler_class_012.phpt | 2 +- .../tests/SimpleXMLElement_xpath_4.phpt | 2 +- ext/simplexml/tests/bug38406.phpt | 2 +- ext/spl/tests/SplFileObject_fputcsv_002.phpt | 2 +- .../tests/arrayObject___construct_basic2.phpt | 4 +- .../tests/arrayObject___construct_basic3.phpt | 4 +- .../arrayObject_exchangeArray_basic3.phpt | 4 +- ext/spl/tests/arrayObject_magicMethods2.phpt | 2 +- ext/spl/tests/array_026.phpt | 4 +- ext/spl/tests/bug54323.phpt | 2 +- ext/spl/tests/bug62978.phpt | 4 +- ext/spl/tests/bug72888.phpt | 2 +- ext/spl/tests/iterator_026.phpt | 4 +- ext/spl/tests/iterator_047.phpt | 8 +- .../tests/recursive_tree_iterator_001.phpt | 16 +- .../tests/recursive_tree_iterator_006.phpt | 16 +- ext/standard/tests/array/002.phpt | 44 ++-- .../tests/array/array_combine_variation4.phpt | 4 +- .../tests/array/array_diff_variation9.phpt | 28 ++- .../array/array_fill_keys_variation1.phpt | 2 +- .../array/array_fill_keys_variation4.phpt | 2 +- .../array_intersect_assoc_variation9.phpt | 24 +-- .../array/array_intersect_variation9.phpt | 80 +++---- .../tests/array/array_map_variation4.phpt | 4 +- .../array_merge_recursive_variation4.phpt | 2 +- .../tests/array/array_reverse_variation4.phpt | 4 +- .../tests/array/array_unique_variation3.phpt | 2 +- .../tests/array/array_unique_variation8.phpt | 8 +- .../tests/array/array_unshift_variation4.phpt | 4 +- ext/standard/tests/array/bug30074.phpt | 4 +- ext/standard/tests/array/bug31158.phpt | 4 +- .../tests/array/sizeof_variation4.phpt | 120 +++++------ .../get_class_methods_variation_001.phpt | 18 +- .../class_object/get_class_variation_001.phpt | 4 +- .../get_parent_class_variation_002.phpt | 18 +- .../class_object/is_a_variation_001.phpt | 4 +- .../is_subclass_of_variation_001.phpt | 18 +- .../is_subclass_of_variation_004.phpt | 18 +- .../method_exists_variation_001.phpt | 18 +- .../file/file_put_contents_variation2.phpt | 6 +- ext/standard/tests/file/fputcsv_002.phpt | 2 +- ext/standard/tests/file/fscanf_error.phpt | 2 +- .../tests/file/pathinfo_variaton.phpt | 2 +- .../tests/general_functions/bug32647.phpt | 4 +- .../tests/general_functions/bug60723.phpt | 4 +- .../general_functions/debug_zval_dump_v.phpt | 6 +- .../general_functions/error_clear_last.phpt | 2 +- .../general_functions/error_get_last.phpt | 6 +- .../gettype_settype_basic.phpt | 4 +- .../tests/general_functions/strval.phpt | 8 +- .../tests/image/getimagesize_variation2.phpt | 8 +- .../tests/math/base_convert_variation1.phpt | 2 +- .../tests/password/password_hash_error.phpt | 2 +- ext/standard/tests/serialize/bug69793.phpt | 6 +- .../serialize/serialization_objects_002.phpt | Bin 7231 -> 7233 bytes .../serialize/serialization_objects_005.phpt | 2 +- ext/standard/tests/streams/bug53903.phpt | 2 +- ext/standard/tests/streams/bug60602.phpt | 2 +- ext/standard/tests/strings/bug54238.phpt | 7 +- ext/standard/tests/strings/implode.phpt | 2 +- ext/standard/tests/strings/implode1.phpt | Bin 6034 -> 6042 bytes .../tests/strings/join_variation1.phpt | 10 +- .../tests/strings/join_variation3.phpt | 4 +- .../tests/strings/join_variation4.phpt | Bin 2318 -> 2319 bytes .../tests/strings/join_variation5.phpt | 10 +- ext/standard/tests/strings/lcfirst.phpt | Bin 5423 -> 5424 bytes .../tests/strings/print_variation1.phpt | 6 +- .../tests/strings/printf_variation1.phpt | 30 +-- .../tests/strings/printf_variation2.phpt | 22 +- .../tests/strings/sprintf_variation1.phpt | 30 +-- .../tests/strings/sprintf_variation18.phpt | 196 +++++++++++++++++- .../tests/strings/sprintf_variation2.phpt | 22 +- ext/standard/tests/strings/str_replace.phpt | 4 +- .../tests/strings/str_replace_variation3.phpt | 4 +- .../tests/strings/str_word_count1.phpt | 4 +- ext/standard/tests/strings/strcasecmp.phpt | Bin 20645 -> 20646 bytes ext/standard/tests/strings/strcmp.phpt | Bin 18460 -> 18461 bytes ext/standard/tests/strings/strlen.phpt | Bin 5900 -> 5901 bytes ext/standard/tests/strings/strpos.phpt | Bin 7939 -> 7940 bytes ext/standard/tests/strings/strstr.phpt | Bin 9539 -> 9540 bytes .../tests/strings/strtr_variation6.phpt | 6 +- ext/standard/tests/strings/strval.phpt | 2 +- .../tests/strings/strval_variation1.phpt | 6 +- ext/standard/tests/strings/ucfirst.phpt | Bin 4655 -> 4656 bytes .../tests/strings/vfprintf_error3.phpt | 2 +- .../tests/strings/vfprintf_variation20.phpt | 10 +- .../tests/strings/vfprintf_variation8.phpt | 40 +++- .../tests/strings/vprintf_variation1.phpt | 10 +- .../tests/strings/vprintf_variation8.phpt | 40 +++- .../tests/strings/vsprintf_variation1.phpt | 10 +- .../tests/strings/vsprintf_variation8.phpt | 40 +++- .../xml_parser_set_option_variation3.phpt | 15 +- ext/zip/tests/oo_properties.phpt | 2 +- 108 files changed, 759 insertions(+), 394 deletions(-) diff --git a/ext/date/tests/bug62500.phpt b/ext/date/tests/bug62500.phpt index 6952332014409..3afa7a561b5fc 100644 --- a/ext/date/tests/bug62500.phpt +++ b/ext/date/tests/bug62500.phpt @@ -23,6 +23,6 @@ try { NULL int(3) -Notice: Undefined property: Crasher::$2 in %sbug62500.php on line %d +Warning: Undefined property: Crasher::$2 in %s on line %d NULL string(%s) "DateInterval::__construct(): Unknown or bad format (blah)" diff --git a/ext/date/tests/bug74852.phpt b/ext/date/tests/bug74852.phpt index e293bef8bfe98..d5fea0ad3fd74 100644 --- a/ext/date/tests/bug74852.phpt +++ b/ext/date/tests/bug74852.phpt @@ -13,5 +13,5 @@ var_dump($interval->abcde); bool(false) bool(false) -Notice: Undefined property: DateInterval::$abcde in %s on line %d +Warning: Undefined property: DateInterval::$abcde in %s on line %d NULL diff --git a/ext/date/tests/bug75232.phpt b/ext/date/tests/bug75232.phpt index 9200f65e91b6c..cf4f289465670 100644 --- a/ext/date/tests/bug75232.phpt +++ b/ext/date/tests/bug75232.phpt @@ -14,7 +14,7 @@ echo $d2->date, "\n"; ?> --EXPECTF-- -Notice: Undefined property: DateTime::$date in %s on line %d +Warning: Undefined property: DateTime::$date in %s on line %d DateTime Object ( @@ -23,4 +23,4 @@ DateTime Object [timezone] => UTC ) -Notice: Undefined property: DateTime::$date in %s on line %d +Warning: Undefined property: DateTime::$date in %s on line %d diff --git a/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt b/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt index a7766541d5ff5..e57c3da913c1e 100644 --- a/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt +++ b/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt @@ -19,5 +19,5 @@ var_dump($attr->ownerElement); --EXPECTF-- Warning: Couldn't fetch DOMAttr. Node no longer exists in %s on line %d -Notice: Undefined property: DOMAttr::$ownerElement in %s on line %d +Warning: Undefined property: DOMAttr::$ownerElement in %s on line %d NULL diff --git a/ext/dom/tests/bug36756.phpt b/ext/dom/tests/bug36756.phpt index 4e47b86e4b008..ccf9ba5049bb1 100644 --- a/ext/dom/tests/bug36756.phpt +++ b/ext/dom/tests/bug36756.phpt @@ -31,5 +31,5 @@ child Warning: Couldn't fetch DOMElement. Node no longer exists in %sbug36756.php on line %d -Notice: Undefined property: DOMElement::$nodeType in %sbug36756.php on line %d +Warning: Undefined property: DOMElement::$nodeType in %s on line %d nodeType: diff --git a/ext/dom/tests/bug67949.phpt b/ext/dom/tests/bug67949.phpt index 304c3a91ee3b5..c49f0e4e0e3e1 100644 --- a/ext/dom/tests/bug67949.phpt +++ b/ext/dom/tests/bug67949.phpt @@ -62,7 +62,7 @@ bool(false) testing property access string(4) "data" -Notice: Trying to get property 'textContent' of non-object in %s on line %d +Warning: Trying to get property 'textContent' of non-object in %s on line %d NULL testing offset not a long array(1) { @@ -70,7 +70,7 @@ array(1) { string(4) "test" } -Notice: Trying to get property 'textContent' of non-object in %s on line %d +Warning: Trying to get property 'textContent' of non-object in %s on line %d bool(false) NULL array(1) { diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt b/ext/intl/tests/dateformat_setTimeZone_error.phpt index e5ba550910802..a3aabf1427c00 100644 --- a/ext/intl/tests/dateformat_setTimeZone_error.phpt +++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt @@ -18,7 +18,7 @@ var_dump($df->setTimeZone('non existing timezone')); ?> ==DONE== --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'Array' in %s on line %d bool(false) diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt index 98aad5b591d0e..f82ecf138a3ad 100644 --- a/ext/libxml/tests/bug61367-read.phpt +++ b/ext/libxml/tests/bug61367-read.phpt @@ -4,7 +4,6 @@ Bug #61367: open_basedir bypass in libxml RSHUTDOWN: read test --INI-- open_basedir=. -error_reporting=E_ALL & ~E_NOTICE --FILE-- diff --git a/ext/session/tests/session_encode_error2.phpt b/ext/session/tests/session_encode_error2.phpt index 4b2be79ff0bee..a947eab54e563 100644 --- a/ext/session/tests/session_encode_error2.phpt +++ b/ext/session/tests/session_encode_error2.phpt @@ -246,7 +246,7 @@ bool(true) -- Iteration 24 -- bool(true) -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d Notice: session_encode(): Skipping numeric key %d in %s on line %d bool(false) diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt index f0a9139ade830..bbf125bc9a5d9 100644 --- a/ext/session/tests/session_set_save_handler_class_012.phpt +++ b/ext/session/tests/session_set_save_handler_class_012.phpt @@ -52,7 +52,7 @@ Open Warning: session_start(): Failed to initialize storage module: user (path: ) in %s on line %d SessionHandler::open() expects exactly 2 parameters, 0 given -Notice: Undefined variable: _SESSION in %s on line %d +Warning: Undefined variable: _SESSION in %s on line %d string(0) "" string(5) "files" string(4) "user" diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt index 28e05176512b2..c050ca2dd4ba6 100644 --- a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt @@ -11,7 +11,7 @@ $xml = simplexml_load_string("XXXXXXX^",$x,0x6000000000000001); var_dump($xml); ?> --EXPECTF-- -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d Warning: simplexml_load_string(): Invalid options in %s on line %d bool(false) diff --git a/ext/simplexml/tests/bug38406.phpt b/ext/simplexml/tests/bug38406.phpt index ea9222949623d..51a716cbd352e 100644 --- a/ext/simplexml/tests/bug38406.phpt +++ b/ext/simplexml/tests/bug38406.phpt @@ -27,7 +27,7 @@ object(SimpleXMLElement)#%d (1) { string(9) "something" } -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Warning: It is not yet possible to assign complex types to properties in %s on line %d Done diff --git a/ext/spl/tests/SplFileObject_fputcsv_002.phpt b/ext/spl/tests/SplFileObject_fputcsv_002.phpt index fdd4112ee6dd5..77f6d76bbf5cc 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_002.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_002.phpt @@ -16,7 +16,7 @@ $file = __DIR__ . '/SplFileObject_fputcsv1.csv'; unlink($file); ?> --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d array(7) { [0]=> int(1) diff --git a/ext/spl/tests/arrayObject___construct_basic2.phpt b/ext/spl/tests/arrayObject___construct_basic2.phpt index 9295f40e51f07..ddbf074bf36bd 100644 --- a/ext/spl/tests/arrayObject___construct_basic2.phpt +++ b/ext/spl/tests/arrayObject___construct_basic2.phpt @@ -61,7 +61,7 @@ bool(true) bool(true) - Unset: -Notice: Undefined property: ArrayObject::$prop in %s on line 40 +Warning: Undefined property: ArrayObject::$prop in %s on line %d Notice: Undefined index: prop in %s on line 40 NULL @@ -89,7 +89,7 @@ bool(true) bool(true) - Unset: -Notice: Undefined property: MyArrayObject::$prop in %s on line 40 +Warning: Undefined property: MyArrayObject::$prop in %s on line %d Notice: Undefined index: prop in %s on line 40 NULL diff --git a/ext/spl/tests/arrayObject___construct_basic3.phpt b/ext/spl/tests/arrayObject___construct_basic3.phpt index fcd369af84bb5..f162317773d24 100644 --- a/ext/spl/tests/arrayObject___construct_basic3.phpt +++ b/ext/spl/tests/arrayObject___construct_basic3.phpt @@ -61,7 +61,7 @@ bool(true) bool(true) - Unset: -Notice: Undefined property: ArrayObject::$prop in %s on line 40 +Warning: Undefined property: ArrayObject::$prop in %s on line %d Notice: Undefined index: prop in %s on line 40 NULL @@ -89,7 +89,7 @@ bool(true) bool(true) - Unset: -Notice: Undefined property: MyArrayObject::$prop in %s on line 40 +Warning: Undefined property: MyArrayObject::$prop in %s on line %d Notice: Undefined index: prop in %s on line 40 NULL diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt index c6759a31cf4da..68f20f7bb6440 100644 --- a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt +++ b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt @@ -83,7 +83,7 @@ array(2) { --> exchangeArray() with no arg: Exception: ArrayObject::exchangeArray() expects exactly 1 parameter, 0 given -Notice: Undefined variable: copy in %s on line %d +Warning: Undefined variable: copy in %s on line %d object(ArrayObject)#2 (1) { ["storage":"ArrayObject":private]=> object(C)#3 (2) { @@ -105,7 +105,7 @@ NULL --> exchangeArray() with bad arg type: Exception:Passed variable is not an array or object -Notice: Undefined variable: copy in %s on line 46 +Warning: Undefined variable: copy in %s on line %d object(ArrayObject)#3 (1) { ["storage":"ArrayObject":private]=> object(C)#2 (2) { diff --git a/ext/spl/tests/arrayObject_magicMethods2.phpt b/ext/spl/tests/arrayObject_magicMethods2.phpt index 18f0520fcdab9..3f88654a5d960 100644 --- a/ext/spl/tests/arrayObject_magicMethods2.phpt +++ b/ext/spl/tests/arrayObject_magicMethods2.phpt @@ -102,7 +102,7 @@ object(ArrayObject)#2 (3) { --> Read existent, non-existent and dynamic: string(7) "changed" -Notice: Undefined property: ArrayObject::$nonexistent in %s on line 42 +Warning: Undefined property: ArrayObject::$nonexistent in %s on line %d NULL string(11) "new.changed" Original wrapped object: diff --git a/ext/spl/tests/array_026.phpt b/ext/spl/tests/array_026.phpt index 8ff6aafb93c5d..7a1784e30e3cb 100644 --- a/ext/spl/tests/array_026.phpt +++ b/ext/spl/tests/array_026.phpt @@ -8,9 +8,9 @@ $test['d1']['d3'] = 'world'; var_dump($test, $test3['mmmmm']); ?> --EXPECTF-- -Notice: Undefined variable: test3 in %s on line %d +Warning: Undefined variable: test3 in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d object(ArrayObject)#1 (1) { ["storage":"ArrayObject":private]=> array(1) { diff --git a/ext/spl/tests/bug54323.phpt b/ext/spl/tests/bug54323.phpt index df6416a0f1839..a2e252239346c 100644 --- a/ext/spl/tests/bug54323.phpt +++ b/ext/spl/tests/bug54323.phpt @@ -17,7 +17,7 @@ function testAccess($c, $ao) { var_dump($c->prop, $ao['prop']); } --EXPECTF-- -Notice: Undefined property: C::$prop in %sbug54323.php on line 14 +Warning: Undefined property: C::$prop in %s on line %d Notice: Undefined index: prop in %sbug54323.php on line 14 NULL diff --git a/ext/spl/tests/bug62978.phpt b/ext/spl/tests/bug62978.phpt index 972bd07ce1ecd..ec6275346e218 100644 --- a/ext/spl/tests/bug62978.phpt +++ b/ext/spl/tests/bug62978.phpt @@ -31,9 +31,9 @@ NULL Notice: Undefined index: epic_magic in %sbug62978.php on line %d NULL -Notice: Undefined variable: c in %sbug62978.php on line %d +Warning: Undefined variable: c in %s on line %d -Notice: Trying to access array offset on value of type null in %s on line %d +Warning: Trying to access array offset on value of type null in %s on line %d NULL Notice: Undefined index: epic_magic in %sbug62978.php on line %d diff --git a/ext/spl/tests/bug72888.phpt b/ext/spl/tests/bug72888.phpt index d354490f88255..c27c8424efa87 100644 --- a/ext/spl/tests/bug72888.phpt +++ b/ext/spl/tests/bug72888.phpt @@ -14,5 +14,5 @@ var_dump($y); --EXPECTF-- string(60) "Trying to clone an uncloneable object of class SplFileObject" -Notice: Undefined variable: y in %sbug72888.php on line %d +Warning: Undefined variable: y in %s on line %d NULL diff --git a/ext/spl/tests/iterator_026.phpt b/ext/spl/tests/iterator_026.phpt index 8eb77a7baf7c2..963950cd0e2a0 100644 --- a/ext/spl/tests/iterator_026.phpt +++ b/ext/spl/tests/iterator_026.phpt @@ -24,13 +24,13 @@ hasNext: yes 1=>2 hasNext: yes -Notice: Array to string conversion in %siterator_026.php on line %d +Warning: Array to string conversion in %s on line %d 0=>31 hasNext: yes 1=>32 hasNext: yes -Notice: Array to string conversion in %siterator_026.php on line %d +Warning: Array to string conversion in %s on line %d 0=>331 hasNext: no 3=>4 diff --git a/ext/spl/tests/iterator_047.phpt b/ext/spl/tests/iterator_047.phpt index 548f4865280c7..e3e9bba05b550 100644 --- a/ext/spl/tests/iterator_047.phpt +++ b/ext/spl/tests/iterator_047.phpt @@ -71,7 +71,7 @@ int(0) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -Notice: Array to string conversion in %siterator_047.php on line %d +Warning: Array to string conversion in %s on line %d MyRecursiveArrayIterator::hasChildren() int(0) int(10) @@ -81,7 +81,7 @@ int(2) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -Notice: Array to string conversion in %siterator_047.php on line %d +Warning: Array to string conversion in %s on line %d MyRecursiveArrayIterator::hasChildren() int(0) int(30) @@ -105,7 +105,7 @@ int(0) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -Notice: Array to string conversion in %siterator_047.php on line %d +Warning: Array to string conversion in %s on line %d MyRecursiveArrayIterator::hasChildren() int(0) int(10) @@ -115,7 +115,7 @@ int(2) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -Notice: Array to string conversion in %siterator_047.php on line %d +Warning: Array to string conversion in %s on line %d MyRecursiveArrayIterator::hasChildren() int(0) int(30) diff --git a/ext/spl/tests/recursive_tree_iterator_001.phpt b/ext/spl/tests/recursive_tree_iterator_001.phpt index ac9f2813888aa..9ac4fdbc17a92 100644 --- a/ext/spl/tests/recursive_tree_iterator_001.phpt +++ b/ext/spl/tests/recursive_tree_iterator_001.phpt @@ -1,7 +1,5 @@ --TEST-- SPL: RecursiveTreeIterator ---INI-- -error_reporting=E_ALL&~E_NOTICE --FILE-- ===DONE=== ---EXPECT-- +--EXPECTF-- -- flags = BYPASS_KEY -- [0] => |-Array [0] => | |-a @@ -60,22 +58,34 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $ [0] => |-4 [1] => \-c -- flags = BYPASS_CURRENT -- + +Warning: Array to string conversion in %s on line %d [|-0] => Array [| |-0] => a [| \-1] => 1 + +Warning: Array to string conversion in %s on line %d [\-a] => Array [ |-0] => 2 [ |-1] => b + +Warning: Array to string conversion in %s on line %d [ \-3] => Array [ |-0] => 4 [ \-1] => c -- flags = BYPASS_KEY|BYPASS_KEY -- + +Warning: Array to string conversion in %s on line %d [0] => Array [0] => a [1] => 1 + +Warning: Array to string conversion in %s on line %d [a] => Array [0] => 2 [1] => b + +Warning: Array to string conversion in %s on line %d [3] => Array [0] => 4 [1] => c diff --git a/ext/spl/tests/recursive_tree_iterator_006.phpt b/ext/spl/tests/recursive_tree_iterator_006.phpt index 1d1891e4a4370..3440a90b6d0e2 100644 --- a/ext/spl/tests/recursive_tree_iterator_006.phpt +++ b/ext/spl/tests/recursive_tree_iterator_006.phpt @@ -1,7 +1,5 @@ --TEST-- SPL: RecursiveTreeIterator and IteratorAggregate ---INI-- -error_reporting=E_ALL&~E_NOTICE --FILE-- ===DONE=== ---EXPECT-- +--EXPECTF-- -- flags = BYPASS_KEY -- [0] => |-Array [0] => | |-a @@ -70,22 +68,34 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $ [0] => |-4 [1] => \-c -- flags = BYPASS_CURRENT -- + +Warning: Array to string conversion in %s on line %d [|-0] => Array [| |-0] => a [| \-1] => 1 + +Warning: Array to string conversion in %s on line %d [\-a] => Array [ |-0] => 2 [ |-1] => b + +Warning: Array to string conversion in %s on line %d [ \-3] => Array [ |-0] => 4 [ \-1] => c -- flags = BYPASS_KEY|BYPASS_KEY -- + +Warning: Array to string conversion in %s on line %d [0] => Array [0] => a [1] => 1 + +Warning: Array to string conversion in %s on line %d [a] => Array [0] => 2 [1] => b + +Warning: Array to string conversion in %s on line %d [3] => Array [0] => 4 [1] => c diff --git a/ext/standard/tests/array/002.phpt b/ext/standard/tests/array/002.phpt index f6aa37b9fbd57..8d088f91297ed 100644 --- a/ext/standard/tests/array/002.phpt +++ b/ext/standard/tests/array/002.phpt @@ -130,17 +130,17 @@ array(8) { } Using SORT_STRING -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d array(8) { [1000]=> string(4) "test" @@ -240,15 +240,15 @@ array(8) { } Using SORT_STRING -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d array(8) { [16777216]=> float(-0.33333333333333) @@ -544,17 +544,17 @@ array(8) { } Using SORT_STRING -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d array(8) { [0]=> string(4) "test" @@ -654,15 +654,15 @@ array(8) { } Using SORT_STRING -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d array(8) { [0]=> float(-0.33333333333333) diff --git a/ext/standard/tests/array/array_combine_variation4.phpt b/ext/standard/tests/array/array_combine_variation4.phpt index 125221cac82ed..5726eb73e62fc 100644 --- a/ext/standard/tests/array/array_combine_variation4.phpt +++ b/ext/standard/tests/array/array_combine_variation4.phpt @@ -90,9 +90,9 @@ echo "Done"; --EXPECTF-- *** Testing array_combine() : assoc array with diff keys to both $keys and $values argument *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- array(0) { } diff --git a/ext/standard/tests/array/array_diff_variation9.phpt b/ext/standard/tests/array/array_diff_variation9.phpt index 05b6a1eb0260e..3d85bc18329ad 100644 --- a/ext/standard/tests/array/array_diff_variation9.phpt +++ b/ext/standard/tests/array/array_diff_variation9.phpt @@ -1,7 +1,5 @@ --TEST-- Test array_diff() function : usage variations - multidimensional arrays ---INI-- -error_reporting=E_ALL & ~E_NOTICE --FILE-- ---EXPECT-- +--EXPECTF-- *** Testing array_diff() : usage variations *** -- Compare two 2-D arrays -- + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(0) { } + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(0) { } @@ -71,6 +85,10 @@ array(3) { } -- Compare a subarray from one 2-D array and one 2-D array -- + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(3) { [0]=> int(1) @@ -79,6 +97,10 @@ array(3) { [2]=> int(3) } + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(2) { ["sub_array1"]=> array(3) { diff --git a/ext/standard/tests/array/array_fill_keys_variation1.phpt b/ext/standard/tests/array/array_fill_keys_variation1.phpt index 0af38c7bde876..1f394eec86cc6 100644 --- a/ext/standard/tests/array/array_fill_keys_variation1.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation1.phpt @@ -59,7 +59,7 @@ array(4) { -- Testing array_fill_keys() function with mixed array -- -Notice: Array to string conversion in %sarray_fill_keys_variation1.php on line %d +Warning: Array to string conversion in %s on line %d array(7) { ["Resource id #%d"]=> string(6) "simple" diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt index bd89416d9d891..9edc4e4a9c69a 100644 --- a/ext/standard/tests/array/array_fill_keys_variation4.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation4.phpt @@ -83,7 +83,7 @@ array(1) { -- Testing array_fill_keys() function with unset var -- -Notice: Undefined variable: unset_var in %sarray_fill_keys_variation4.php on line %d +Warning: Undefined variable: unset_var in %s on line %d array(1) { ["one"]=> NULL diff --git a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt index 26a491ad64f08..38b7605924d8c 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt @@ -62,13 +62,13 @@ echo "Done"; -- Passing the entire 2-D array to $arr1 and $arr2 -- - With default arguments - -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d array(2) { [0]=> array(4) { @@ -95,21 +95,21 @@ array(2) { } - With more arguments - -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d array(2) { [0]=> array(4) { diff --git a/ext/standard/tests/array/array_intersect_variation9.phpt b/ext/standard/tests/array/array_intersect_variation9.phpt index 6c7c956ea7364..d66d9c682bf32 100644 --- a/ext/standard/tests/array/array_intersect_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_variation9.phpt @@ -61,37 +61,37 @@ echo "Done"; -- Passing the entire 2-D array to $arr1 and $arr2 -- - With default arguments - -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d array(4) { [0]=> array(4) { @@ -136,53 +136,53 @@ array(4) { } - With more arguments - -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d array(4) { [0]=> array(4) { diff --git a/ext/standard/tests/array/array_map_variation4.phpt b/ext/standard/tests/array/array_map_variation4.phpt index 08599e0567126..8e75b91ff474d 100644 --- a/ext/standard/tests/array/array_map_variation4.phpt +++ b/ext/standard/tests/array/array_map_variation4.phpt @@ -79,9 +79,9 @@ echo "Done"; --EXPECTF-- *** Testing array_map() : associative array with diff. keys for 'arr1' argument *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- array(0) { } diff --git a/ext/standard/tests/array/array_merge_recursive_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt index 151a515205e7a..dc5651adfb8b5 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation4.phpt @@ -80,7 +80,7 @@ echo "Done"; --EXPECTF-- *** Testing array_merge_recursive() : assoc. array with diff. keys to $arr1 argument *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- -- With default argument -- array(2) { diff --git a/ext/standard/tests/array/array_reverse_variation4.phpt b/ext/standard/tests/array/array_reverse_variation4.phpt index f6e98dae8223d..21cced17030d7 100644 --- a/ext/standard/tests/array/array_reverse_variation4.phpt +++ b/ext/standard/tests/array/array_reverse_variation4.phpt @@ -83,9 +83,9 @@ echo "Done"; --EXPECTF-- *** Testing array_reverse() : usage variations *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- - default argument - array(0) { diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt index e80df1fb65e10..0227449233b9a 100644 --- a/ext/standard/tests/array/array_unique_variation3.phpt +++ b/ext/standard/tests/array/array_unique_variation3.phpt @@ -68,7 +68,7 @@ echo "Done"; --EXPECTF-- *** Testing array_unique() : assoc. array with diff. keys passed to $input argument *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- array(1) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation8.phpt b/ext/standard/tests/array/array_unique_variation8.phpt index d8a318dd93496..0ac6f91687cb9 100644 --- a/ext/standard/tests/array/array_unique_variation8.phpt +++ b/ext/standard/tests/array/array_unique_variation8.phpt @@ -29,13 +29,13 @@ echo "Done"; --EXPECTF-- *** Testing array_unique() : two dimensional array for $input argument *** -Notice: Array to string conversion in %sarray_unique_variation8.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_unique_variation8.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_unique_variation8.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_unique_variation8.php on line %d +Warning: Array to string conversion in %s on line %d array(1) { [0]=> array(4) { diff --git a/ext/standard/tests/array/array_unshift_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt index ee91bba18065c..e468bfcf4694b 100644 --- a/ext/standard/tests/array/array_unshift_variation4.phpt +++ b/ext/standard/tests/array/array_unshift_variation4.phpt @@ -101,9 +101,9 @@ echo "Done"; --EXPECTF-- *** Testing array_unshift() : associative array with different keys *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- int(1) array(1) { diff --git a/ext/standard/tests/array/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt index 289e802c00f49..e0309bac1f5b3 100644 --- a/ext/standard/tests/array/bug30074.phpt +++ b/ext/standard/tests/array/bug30074.phpt @@ -2,12 +2,12 @@ Bug #30074 (EG(uninitialized_zval_ptr) gets set to reference using EXTR_REFS, affecting later values) --FILE-- $undefined), EXTR_REFS); var_dump(array($a)); echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- +Warning: Undefined variable: undefined in %s on line %d array(1) { [0]=> NULL diff --git a/ext/standard/tests/array/bug31158.phpt b/ext/standard/tests/array/bug31158.phpt index 62ba1cfaa3c6a..d4f5210760c49 100644 --- a/ext/standard/tests/array/bug31158.phpt +++ b/ext/standard/tests/array/bug31158.phpt @@ -14,7 +14,7 @@ __(); echo "ok\n"; ?> --EXPECTF-- -Notice: Undefined variable: GLOBALS in %sbug31158.php on line 6 +Warning: Undefined variable: GLOBALS in %s on line %d -Notice: Trying to access array offset on value of type null in %sbug31158.php on line 6 +Warning: Trying to access array offset on value of type null in %s on line %d ok diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt index 465b8181745a0..2fc98396b1635 100644 --- a/ext/standard/tests/array/sizeof_variation4.phpt +++ b/ext/standard/tests/array/sizeof_variation4.phpt @@ -89,380 +89,380 @@ echo "Done"; --- Testing sizeof() for all kinds of unset variables in default, Normal and Recursive Modes --- -- Iteration 1 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 2 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 3 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 4 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 5 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 6 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 7 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 8 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 9 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 10 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 11 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 12 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 13 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 14 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 15 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 16 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 17 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 18 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 19 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) -- Iteration 20 -- Default Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_NORMAL Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) COUNT_RECURSIVE Mode: -Notice: Undefined variable: value in %s on line %d +Warning: Undefined variable: value in %s on line %d Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d int(0) diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt index 650002ce1a6e8..2e2e1657af1d6 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt @@ -10,7 +10,7 @@ Test get_class_methods() function : usage variations - unexpected types function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -81,10 +81,10 @@ foreach($values as $value) { }; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_class_methods() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(67) -Error: 8 - Undefined variable: unset_var, %s(70) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 NULL @@ -112,23 +112,23 @@ NULL Arg value 0.5 NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt index 8c1543d71153a..87a9eac6c3a44 100644 --- a/ext/standard/tests/class_object/get_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_variation_001.phpt @@ -80,9 +80,9 @@ echo "Done"; --EXPECTF-- *** Testing get_class() : usage variations *** -Notice: Undefined variable: undefined_var in %s on line %d +Warning: Undefined variable: undefined_var in %s on line %d -Notice: Undefined variable: unset_var in %s on line %d +Warning: Undefined variable: unset_var in %s on line %d Arg value: 0 (type: integer) get_class() expects parameter 1 to be object, int given diff --git a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt index 985330d4133b1..2aaa93fa8aaae 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt @@ -13,7 +13,7 @@ spl_autoload_register(function ($className) { }); function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -83,10 +83,10 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_parent_class() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(68) -Error: 8 - Undefined variable: unset_var, %s(71) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 bool(false) @@ -114,23 +114,23 @@ bool(false) Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) diff --git a/ext/standard/tests/class_object/is_a_variation_001.phpt b/ext/standard/tests/class_object/is_a_variation_001.phpt index 563195cd0ccfa..e9dfe0db6d2f1 100644 --- a/ext/standard/tests/class_object/is_a_variation_001.phpt +++ b/ext/standard/tests/class_object/is_a_variation_001.phpt @@ -77,9 +77,9 @@ echo "Done"; --EXPECTF-- *** Testing is_a() : usage variations *** -Notice: Undefined variable: undefined_var in %s on line 59 +Warning: Undefined variable: undefined_var in %s on line %d -Notice: Undefined variable: unset_var in %s on line 62 +Warning: Undefined variable: unset_var in %s on line %d Arg value 0 bool(false) diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt index e545616667780..961ae96287678 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt @@ -13,7 +13,7 @@ spl_autoload_register(function ($className) { }); function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -84,10 +84,10 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_subclass_of() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(69) -Error: 8 - Undefined variable: unset_var, %s(72) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 bool(false) @@ -115,23 +115,23 @@ bool(false) Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt index 3e5447308b72f..dba37cc3f4fbe 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt @@ -13,7 +13,7 @@ spl_autoload_register(function ($className) { }); function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -84,10 +84,10 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_subclass_of() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(69) -Error: 8 - Undefined variable: unset_var, %s(72) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 bool(false) @@ -115,23 +115,23 @@ bool(false) Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt index 93497c34b1832..b975f819583a3 100644 --- a/ext/standard/tests/class_object/method_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt @@ -13,7 +13,7 @@ spl_autoload_register(function ($className) { }); function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -83,10 +83,10 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing method_exists() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(68) -Error: 8 - Undefined variable: unset_var, %s(71) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 bool(false) @@ -114,23 +114,23 @@ bool(false) Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index 5e18ce1948d60..8dd0eed54ce71 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -110,7 +110,7 @@ unlink($filename); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing file_put_contents() : usage variation *** --int 0-- @@ -138,8 +138,8 @@ unlink($filename); --associative array-- 12 --nested arrays-- -Error: 8 - Array to string conversion, %s(%d) -Error: 8 - Array to string conversion, %s(%d) +Error: 2 - Array to string conversion, /home/nikic/php-src/ext/standard/tests/file/file_put_contents_variation2.php(101) +Error: 2 - Array to string conversion, /home/nikic/php-src/ext/standard/tests/file/file_put_contents_variation2.php(101) fooArrayArray --uppercase NULL-- diff --git a/ext/standard/tests/file/fputcsv_002.phpt b/ext/standard/tests/file/fputcsv_002.phpt index db565d5223b57..90999a9e701b6 100644 --- a/ext/standard/tests/file/fputcsv_002.phpt +++ b/ext/standard/tests/file/fputcsv_002.phpt @@ -20,7 +20,7 @@ $file = __DIR__ .'/fgetcsv-test.csv'; unlink($file); ?> --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d array(7) { [0]=> int(1) diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index 1df1a699cbd9f..5666689574765 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -61,7 +61,7 @@ fscanf(): supplied resource is not a valid File-Handle resource Warning: fscanf(): Different numbers of variable names and field specifiers in %s on line %d int(-1) -Notice: Undefined variable: undefined_var in %s on line %d +Warning: Undefined variable: undefined_var in %s on line %d array(0) { } diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt index 6f4492e375a4c..a671c22fdac65 100644 --- a/ext/standard/tests/file/pathinfo_variaton.phpt +++ b/ext/standard/tests/file/pathinfo_variaton.phpt @@ -90,7 +90,7 @@ echo "Done\n"; --EXPECTF-- *** Testing pathinfo() with miscelleneous input arguments *** -Notice: Undefined variable: fp in %s on line %d +Warning: Undefined variable: fp in %s on line %d -- Iteration 1 -- array(3) { ["dirname"]=> diff --git a/ext/standard/tests/general_functions/bug32647.phpt b/ext/standard/tests/general_functions/bug32647.phpt index a9d84e798bc42..92fa547820fb1 100644 --- a/ext/standard/tests/general_functions/bug32647.phpt +++ b/ext/standard/tests/general_functions/bug32647.phpt @@ -30,11 +30,11 @@ register_shutdown_function(array($obj,'barfoo')); // Valid ?> --EXPECTF-- -Notice: Undefined variable: obj in %s on line %d +Warning: Undefined variable: obj in %s on line %d Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed in %s on line %d -Notice: Undefined variable: obj in %s on line %d +Warning: Undefined variable: obj in %s on line %d Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed in %s on line %d diff --git a/ext/standard/tests/general_functions/bug60723.phpt b/ext/standard/tests/general_functions/bug60723.phpt index 504de7afbf32c..93381d246c652 100644 --- a/ext/standard/tests/general_functions/bug60723.phpt +++ b/ext/standard/tests/general_functions/bug60723.phpt @@ -14,6 +14,6 @@ readfile($log); unlink($log); ?> --EXPECTF-- -Notice: Undefined variable: aa in %sbug60723.php on line %d -[%s ASIA/Chongqing] PHP Notice: Undefined variable: aa in %sbug60723.php on line %d +Warning: Undefined variable: aa in %s on line %d +[%s ASIA/Chongqing] PHP Warning: Undefined variable: aa in %s on line %d [%s ASIA/Chongqing] dummy diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index 6cb413dc2614c..d622089cffcb1 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -147,7 +147,7 @@ int(10) -- Value of $ref_first_var -- -Notice: Undefined variable: ref_first_var in %s on line %d +Warning: Undefined variable: ref_first_var in %s on line %d NULL -- Value of $first_var -- @@ -166,7 +166,7 @@ int(10) -- Value of $var_3: (after unsetting var_3) -- -Notice: Undefined variable: var_3 in %s on line %d +Warning: Undefined variable: var_3 in %s on line %d NULL -- Value of $var_2: -- @@ -177,7 +177,7 @@ int(10) -- Value of $var_1: (after unsetting variable_1) -- -Notice: Undefined variable: var_1 in %s on line %d +Warning: Undefined variable: var_1 in %s on line %d NULL -- Value of $var_2: -- diff --git a/ext/standard/tests/general_functions/error_clear_last.phpt b/ext/standard/tests/general_functions/error_clear_last.phpt index 675affb6259c6..2cfd17793a725 100644 --- a/ext/standard/tests/general_functions/error_clear_last.phpt +++ b/ext/standard/tests/general_functions/error_clear_last.phpt @@ -20,7 +20,7 @@ NULL NULL array(4) { ["type"]=> - int(8) + int(2) ["message"]=> string(21) "Undefined variable: b" ["file"]=> diff --git a/ext/standard/tests/general_functions/error_get_last.phpt b/ext/standard/tests/general_functions/error_get_last.phpt index e6cea73f4d82a..a4cae412b5e8f 100644 --- a/ext/standard/tests/general_functions/error_get_last.phpt +++ b/ext/standard/tests/general_functions/error_get_last.phpt @@ -22,14 +22,14 @@ NULL error_get_last() expects exactly 0 parameters, 1 given NULL -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d array(4) { ["type"]=> - int(8) + int(2) ["message"]=> string(21) "Undefined variable: b" ["file"]=> - string(%i) "%s" + string(%d) "%s" ["line"]=> int(11) } diff --git a/ext/standard/tests/general_functions/gettype_settype_basic.phpt b/ext/standard/tests/general_functions/gettype_settype_basic.phpt index f8ff6c446007c..fac0327ad5181 100644 --- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt @@ -846,7 +846,7 @@ string(6) "object" -- Setting type of data to string -- -- Iteration 1 -- -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" @@ -855,7 +855,7 @@ bool(true) string(14) "another string" string(6) "string" -- Iteration 3 -- -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt index 531c64aa5a5de..a75ac12272e09 100644 --- a/ext/standard/tests/general_functions/strval.phpt +++ b/ext/standard/tests/general_functions/strval.phpt @@ -277,19 +277,19 @@ string(14) "Resource id #%d" string(14) "Resource id #%d" -- Iteration 4 -- -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 5 -- -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 6 -- -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 7 -- -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 8 -- string(0) "" diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index c7691634c981b..240b015f1f814 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -9,7 +9,7 @@ Test getimagesize() function : usage variations - unexpected type for arg 2 */ function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -79,10 +79,10 @@ foreach($values as $key => $value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getimagesize() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(%d) -Error: 8 - Undefined variable: unset_var, %s(%d) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var -- Arg value 0 -- string(28) "4a46494600010201006000600000" diff --git a/ext/standard/tests/math/base_convert_variation1.phpt b/ext/standard/tests/math/base_convert_variation1.phpt index 9f106bc704d16..ee151e3f7f195 100644 --- a/ext/standard/tests/math/base_convert_variation1.phpt +++ b/ext/standard/tests/math/base_convert_variation1.phpt @@ -148,7 +148,7 @@ string(1) "0" -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d string(1) "0" diff --git a/ext/standard/tests/password/password_hash_error.phpt b/ext/standard/tests/password/password_hash_error.phpt index 04a8249ced727..0eec2383c18ea 100644 --- a/ext/standard/tests/password/password_hash_error.phpt +++ b/ext/standard/tests/password/password_hash_error.phpt @@ -30,7 +30,7 @@ try { --EXPECTF-- password_hash() expects at least 2 parameters, 1 given -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Warning: password_hash(): Unknown password hashing algorithm: Array in %s on line %d NULL diff --git a/ext/standard/tests/serialize/bug69793.phpt b/ext/standard/tests/serialize/bug69793.phpt index 8426c1573eef4..b2d9fbb2566f2 100644 --- a/ext/standard/tests/serialize/bug69793.phpt +++ b/ext/standard/tests/serialize/bug69793.phpt @@ -7,11 +7,11 @@ $e = unserialize('O:9:"Exception":7:{s:17:"'."\0".'Exception'."\0".'string";s:1: var_dump($e.""); ?> --EXPECTF-- -Notice: Undefined property: Exception::$file in %s%ebug69793.php on line %d +Warning: Undefined property: Exception::$file in %s on line %d -Notice: Undefined property: Exception::$previous in %s%ebug69793.php on line %d +Warning: Undefined property: Exception::$previous in %s on line %d -Notice: Undefined property: Exception::$previous in %s%ebug69793.php on line %d +Warning: Undefined property: Exception::$previous in %s on line %d string(41) "Exception in :1337 Stack trace: #0 {main}" diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt index c7f9e1cbd30b07833bf416b1614c34aa4ebfecef..920fd35310704abdd7a18cb4f1232fbeb3dbd2a3 100644 GIT binary patch delta 47 tcmdmQanNEzD+hacVo_dZUi##24g+r06fQ0#K9g$7>f{~{11?iDE-nO@$;@E#I&t~U5}caC0B2SX9smFU diff --git a/ext/standard/tests/serialize/serialization_objects_005.phpt b/ext/standard/tests/serialize/serialization_objects_005.phpt index 4c631c6a5969d..48325f4fba59a 100644 --- a/ext/standard/tests/serialize/serialization_objects_005.phpt +++ b/ext/standard/tests/serialize/serialization_objects_005.phpt @@ -77,7 +77,7 @@ string(9) "p.changed" bool(false) bool(true) -Notice: Undefined property: C::$x in %s on line 37 +Warning: Undefined property: C::$x in %s on line %d NULL diff --git a/ext/standard/tests/streams/bug53903.phpt b/ext/standard/tests/streams/bug53903.phpt index fd0b770f6b60e..ca04a5ca149e8 100644 --- a/ext/standard/tests/streams/bug53903.phpt +++ b/ext/standard/tests/streams/bug53903.phpt @@ -24,7 +24,7 @@ $s[] = 1; // Cannot use a scalar value as an array print_r($s); --EXPECTF-- -Notice: Undefined property: sw::$undefined in %s on line %d +Warning: Undefined property: sw::$undefined in %s on line %d Array ( [0] => 1 diff --git a/ext/standard/tests/streams/bug60602.phpt b/ext/standard/tests/streams/bug60602.phpt index 82917ecbd676b..4f88c8dd2c9ca 100644 --- a/ext/standard/tests/streams/bug60602.phpt +++ b/ext/standard/tests/streams/bug60602.phpt @@ -48,7 +48,7 @@ if (is_resource($p)) { ?> ==DONE== --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d int(%d) int(0) bool(true) diff --git a/ext/standard/tests/strings/bug54238.phpt b/ext/standard/tests/strings/bug54238.phpt index 0f60098ff0e10..e679bb6928708 100644 --- a/ext/standard/tests/strings/bug54238.phpt +++ b/ext/standard/tests/strings/bug54238.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #54238 (use-after-free in substr_replace()) ---INI-- -error_reporting=E_ALL&~E_NOTICE --FILE-- ---EXPECT-- +--EXPECTF-- +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(1) { [0]=> string(9) "AArrayray" diff --git a/ext/standard/tests/strings/implode.phpt b/ext/standard/tests/strings/implode.phpt index 330ba2ff30638..ec685586ef8ee 100644 --- a/ext/standard/tests/strings/implode.phpt +++ b/ext/standard/tests/strings/implode.phpt @@ -12,5 +12,5 @@ echo implode(':', array('foo', array('bar', 'baz'), 'burp'))."\n"; foobarbaz foo:bar:baz -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d foo:Array:burp diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt index 3906e997f1aa3f94269356903c741690f6c93aba..500bdc6dce5b026a3e7841c8fb68c096a9f48c05 100644 GIT binary patch delta 126 zcmbQFKTCf@3oms?47sWImh?GWoXXc18f1iY~7J delta 121 zcmbQGKS_T>3on~reo1C>>g0pGdhA>f_U41U>dZ*un`H(6Fd^|_>VSGoCwGe|BS}q` V6)c$?E-Hm2grwSR^Api+i~u6DDzyLr diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 695ee2ddca8cf..33c519f13ef01 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -122,31 +122,31 @@ string(29) "element11.07654321E-9element2" string(19) "element10.5element2" -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(0) "" -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(1) "0" -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(1) "1" -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(7) "1Array2" -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(11) "redArraypen" diff --git a/ext/standard/tests/strings/join_variation3.phpt b/ext/standard/tests/strings/join_variation3.phpt index c3799cc01a504..a89612332117e 100644 --- a/ext/standard/tests/strings/join_variation3.phpt +++ b/ext/standard/tests/strings/join_variation3.phpt @@ -62,9 +62,9 @@ string(6) "1], [2" string(10) "1.1], [2.2" -- Iteration 3 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(14) "Array], [Array" -- Iteration 4 -- string(5) "], [1" diff --git a/ext/standard/tests/strings/join_variation4.phpt b/ext/standard/tests/strings/join_variation4.phpt index f6154f1e4d78179585ec14f2043f351542b24314..49cbfa15bce3320029de5f331e0082cf23e674d6 100644 GIT binary patch delta 20 bcmeAZ>KED|$jTm`Sd^EUm%dq?^*b{FLxKjb delta 19 acmeAd>J!=^$jauIUy_-ex>wO(t(Oc6G}{F2P%)X57(CIA3M+6Pbo diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 19a28678f2724..38fe9195280a9 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -110,17 +110,17 @@ int(1) int(1) -- Iteration 9 -- -Notice: Array to string conversion in %sprint_variation1.php on line %d +Warning: Array to string conversion in %s on line %d Array int(1) -- Iteration 10 -- -Notice: Array to string conversion in %sprint_variation1.php on line %d +Warning: Array to string conversion in %s on line %d Array int(1) -- Iteration 11 -- -Notice: Array to string conversion in %sprint_variation1.php on line %d +Warning: Array to string conversion in %s on line %d Array int(1) -- Iteration 12 -- diff --git a/ext/standard/tests/strings/printf_variation1.phpt b/ext/standard/tests/strings/printf_variation1.phpt index fcf69ebaa7bd8..62f5e21916a21 100644 --- a/ext/standard/tests/strings/printf_variation1.phpt +++ b/ext/standard/tests/strings/printf_variation1.phpt @@ -188,71 +188,71 @@ int(3) -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) diff --git a/ext/standard/tests/strings/printf_variation2.phpt b/ext/standard/tests/strings/printf_variation2.phpt index 8e7d5ec910962..6cf3e90d62afc 100644 --- a/ext/standard/tests/strings/printf_variation2.phpt +++ b/ext/standard/tests/strings/printf_variation2.phpt @@ -7,8 +7,6 @@ Test printf() function : usage variations - with all types of values for arg1 ar * Source code: ext/standard/formatted_print.c */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing printf() : with different types of values passed for arg1 argument ***\n"; // initialing required variables @@ -166,32 +164,52 @@ int(3) int(3) -- Iteration 10 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 11 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 12 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 13 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 14 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index bf77e3bc06d6e..33320b9f1c8f2 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -155,57 +155,57 @@ string(3) "0.5" -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 15 -- diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 2bf9322c83133..74547cf53ef88 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -7,8 +7,6 @@ Test sprintf() function : usage variations - string formats with array values * Source code: ext/standard/formatted_print.c */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing sprintf() : string formats with array values ***\n"; // different arrays used to test he function @@ -47,185 +45,377 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECT-- +--EXPECTF-- *** Testing sprintf() : string formats with array values *** -- Iteration 1 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 2 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 3 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 4 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 5 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 6 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 7 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 8 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 9 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 10 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 11 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 12 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt index 1bab5dc862410..0f8290a9a77b4 100644 --- a/ext/standard/tests/strings/sprintf_variation2.phpt +++ b/ext/standard/tests/strings/sprintf_variation2.phpt @@ -7,8 +7,6 @@ Test sprintf() function : usage variations - with all types of values for arg1 a * Source code: ext/standard/formatted_print.c */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing sprintf() : with different types of values passed for arg1 argument ***\n"; // initialing required variables @@ -144,23 +142,43 @@ string(3) "0.5" string(3) "0.5" -- Iteration 10 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 11 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 12 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 13 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 14 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 15 -- diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt index bef11f872a51b..b0ca488f3c96d 100644 --- a/ext/standard/tests/strings/str_replace.phpt +++ b/ext/standard/tests/strings/str_replace.phpt @@ -876,7 +876,7 @@ array(2) { } int(6) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d array(2) { [0]=> string(15) "ArrayArrayArray" @@ -925,7 +925,7 @@ int(0) string(5) "FOUND" string(5) "FOUND" -Notice: Undefined variable: strS in %s on line %d +Warning: Undefined variable: strS in %s on line %d string(0) "" string(5) "FOUND" string(5) "FOUND" diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 8ae709745f0e5..c6851c5c9c507 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -173,7 +173,7 @@ array(2) { } int(6) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d array(1) { [0]=> string(15) "ArrayArrayArray" @@ -220,7 +220,7 @@ int(0) string(5) "FOUND" string(5) "FOUND" -Notice: Undefined variable: strS in %s on line %d +Warning: Undefined variable: strS in %s on line %d string(0) "" string(5) "FOUND" string(5) "FOUND" diff --git a/ext/standard/tests/strings/str_word_count1.phpt b/ext/standard/tests/strings/str_word_count1.phpt index 18652699e232b..6ce8c38f225d7 100644 --- a/ext/standard/tests/strings/str_word_count1.phpt +++ b/ext/standard/tests/strings/str_word_count1.phpt @@ -25,10 +25,10 @@ DONE int(0) Invalid format value -1 -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d Invalid format value -1 -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d NULL DONE diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt index d9063cc9decc9a85c9b71991014ecd515fe3d461..4cca47ac96f519cf7d04a9b00c2bbdca72bdebe9 100644 GIT binary patch delta 21 dcmZ3wka5{U#tobO*~1fy@-p+%C-3xs0{~@{38nx5 delta 20 ccmZ3ska6ik#tobO+5GZLGLus$@A7{G09=y^G5`Po diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index fd20e501958cdad2859ae0abd82e0329419ae691..1e0f5d18a262abec1372681f11948390dc2be8ee 100644 GIT binary patch delta 21 dcmbO;fpP8x#tmBT?BR(;d6{|XlMUS8003An2v7h3 delta 20 ccmbO`fpN|R#tmBTY<~GAnaQb>4c*@W08jG=+yDRo diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt index 156038ed7b491ffb1f633f581ea1d910303f1e49..0db36eea22aed10ea9af6dfb41a7173ec78239a3 100644 GIT binary patch delta 19 acmeCt>($$kCB`0}Sd^EUmp-{bYz_cMQ3p5x delta 18 ZcmeCx>(SegCC28LUy_-eI=N764gfyv2E+gW diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt index 9fc521d8d87403ad59de409f4c66a707ccf90cb4..8e1a1a7472d18640676c3b83ca6993cb239f4648 100644 GIT binary patch delta 20 bcmZp+Yq8t#Se89Ju_!MyFMab%St&*USAqxS delta 19 acmZp%Yqs0)SeDH%za%p`b@MA(DMkQK8wYU! diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index 81ddee0804cc2a00c83afda542bf7b49c92bcba9..22fe2d0da93be4edd8bdf85d35bdf27c5e521a7f 100644 GIT binary patch delta 20 ccmX@?b;N7KQbqRg#G<^+y!6eh6=yI50AE@Ni2wiq delta 19 bcmX@&b=YgeQbjhu{F2P%)Xi%YXD|Z*R+R`9 diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt index 5e06da6178e9a..272e58a544e80 100644 --- a/ext/standard/tests/strings/strtr_variation6.phpt +++ b/ext/standard/tests/strings/strtr_variation6.phpt @@ -103,15 +103,15 @@ string(6) "m1tatm" string(6) "tm0atm" -- Iteration 7 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(6) "0120tm" -- Iteration 8 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(6) "0120tm" -- Iteration 9 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(6) "0120tm" -- Iteration 10 -- string(6) "0a2atm" diff --git a/ext/standard/tests/strings/strval.phpt b/ext/standard/tests/strings/strval.phpt index b837a079d45ba..8f01cbfc0b9bc 100644 --- a/ext/standard/tests/strings/strval.phpt +++ b/ext/standard/tests/strings/strval.phpt @@ -22,5 +22,5 @@ string(3) "1.1" string(1) "1" string(0) "" -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt index 5918c286e2765..d833fa01be819 100644 --- a/ext/standard/tests/strings/strval_variation1.phpt +++ b/ext/standard/tests/strings/strval_variation1.phpt @@ -9,8 +9,6 @@ Test strval() function : usage variations - Pass different data types as strval echo "*** Testing strval() : usage variations ***\n"; -error_reporting(E_ALL ^ E_NOTICE); - //get an unset variable $unset_var = 10; unset ($unset_var); @@ -147,9 +145,13 @@ string(14) "1.007654321E-8" string(3) "0.5" -- Iteration 18 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 19 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 20 -- diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt index 3508881d3ca66249045f0c44db6d76e7c476ffbb..ea575f6f11e22c3a1d3bbe88442ae26664c85d60 100644 GIT binary patch delta 19 bcmZ3lvO#6TOhNYW#G<^+y!6TQ1t$OiOtA;D delta 18 acmdm>vR-AwOhGok{F2P%)X573CjbCM@CQBs diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt index 8be51e1798d05..d02855d61e617 100644 --- a/ext/standard/tests/strings/vfprintf_error3.phpt +++ b/ext/standard/tests/strings/vfprintf_error3.phpt @@ -46,7 +46,7 @@ unlink( $file ); --EXPECTF-- -- Testing vfprintf() function with wrong variable types as argument -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d int(5) string(5) "Array" int(9) diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt index 1f8dfefca40bd..6285bd11f1052 100644 --- a/ext/standard/tests/strings/vfprintf_variation20.phpt +++ b/ext/standard/tests/strings/vfprintf_variation20.phpt @@ -108,15 +108,15 @@ unlink($data_file); --EXPECTF-- *** Testing vfprintf() : with unexpected values for format argument *** -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d *** Testing vprintf() with with unexpected values for format argument *** diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt index ff806154f458c..6f3250e5f1af2 100644 --- a/ext/standard/tests/strings/vfprintf_variation8.phpt +++ b/ext/standard/tests/strings/vfprintf_variation8.phpt @@ -12,8 +12,6 @@ Test vfprintf() function : usage variations - string formats with non-string val * the '$format' and '$args' arguments of the function */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing vfprintf() : string formats and non-string values ***\n"; // defining array of string formats @@ -81,9 +79,45 @@ unlink($data_file); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- *** Testing vfprintf() : string formats and non-string values *** +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + -- Iteration 1 -- 2.2 0.2 10.2 123456.234 s -1234.6789 1234.6789 diff --git a/ext/standard/tests/strings/vprintf_variation1.phpt b/ext/standard/tests/strings/vprintf_variation1.phpt index 5cf50105ab001..94158243b7567 100644 --- a/ext/standard/tests/strings/vprintf_variation1.phpt +++ b/ext/standard/tests/strings/vprintf_variation1.phpt @@ -141,31 +141,31 @@ int(3) -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) diff --git a/ext/standard/tests/strings/vprintf_variation8.phpt b/ext/standard/tests/strings/vprintf_variation8.phpt index f635b1d4c0636..eecc60ac3cac4 100644 --- a/ext/standard/tests/strings/vprintf_variation8.phpt +++ b/ext/standard/tests/strings/vprintf_variation8.phpt @@ -12,8 +12,6 @@ Test vprintf() function : usage variations - string formats with non-string valu * the '$format' and '$args' arguments of the function */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing vprintf() : string formats and non-string values ***\n"; // defining array of string formats @@ -72,7 +70,7 @@ foreach($args_array as $args) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- *** Testing vprintf() : string formats and non-string values *** -- Iteration 1 -- @@ -92,6 +90,42 @@ int(172) int(132) -- Iteration 3 -- + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d Array Array Array Array s Array Array Arra Arra Array Arra diff --git a/ext/standard/tests/strings/vsprintf_variation1.phpt b/ext/standard/tests/strings/vsprintf_variation1.phpt index 15c749d3f80e7..33bc043927b94 100644 --- a/ext/standard/tests/strings/vsprintf_variation1.phpt +++ b/ext/standard/tests/strings/vsprintf_variation1.phpt @@ -130,27 +130,27 @@ string(3) "0.5" -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 15 -- diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index 0efd8bb0081e4..a2adbfa093f7d 100644 --- a/ext/standard/tests/strings/vsprintf_variation8.phpt +++ b/ext/standard/tests/strings/vsprintf_variation8.phpt @@ -12,8 +12,6 @@ Test vsprintf() function : usage variations - string formats with non-string val * the '$format' and '$args' arguments of the function */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing vsprintf() : string formats and non-string values ***\n"; // defining array of string formats @@ -70,7 +68,7 @@ foreach($args_array as $args) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- *** Testing vsprintf() : string formats and non-string values *** -- Iteration 1 -- @@ -88,6 +86,42 @@ string(130) "2 -2 2 2 123456 2 -2" -- Iteration 3 -- + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d string(129) "Array Array Array Array Array Array Arra Arra Array Arra diff --git a/ext/xml/tests/xml_parser_set_option_variation3.phpt b/ext/xml/tests/xml_parser_set_option_variation3.phpt index 836ee7a469119..4187ddf068347 100644 --- a/ext/xml/tests/xml_parser_set_option_variation3.phpt +++ b/ext/xml/tests/xml_parser_set_option_variation3.phpt @@ -15,7 +15,6 @@ if (!extension_loaded("xml")) { */ echo "*** Testing xml_parser_set_option() : usage variations ***\n"; -error_reporting(E_ALL & ~E_NOTICE); class aClass { function __toString() { @@ -79,12 +78,6 @@ $values = array( // resource data $fp, - - // undefined data - $undefined_var, - - // unset data - $unset_var, ); // loop through each element of the array for value @@ -174,14 +167,10 @@ Arg value string bool(true) Arg value Some Ascii Data -bool(true) -Arg value Resource id %s +Notice: Object of class aClass could not be converted to int in %s on line %d bool(true) -Arg value -bool(true) - -Arg value +Arg value Resource id %s bool(true) Done diff --git a/ext/zip/tests/oo_properties.phpt b/ext/zip/tests/oo_properties.phpt index b435d6c15909e..108a85e29bb9c 100644 --- a/ext/zip/tests/oo_properties.phpt +++ b/ext/zip/tests/oo_properties.phpt @@ -40,7 +40,7 @@ zip->numFiles (4): empty(): 0 isset(): 1 -Notice: Undefined property: ZipArchive::$bogus in %s on line %d +Warning: Undefined property: ZipArchive::$bogus in %s on line %d zip->bogus (0): empty(): 1 isset(): 0 From a1420b37f6c1cbf83f6b3d2c90df31f19323e24d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 15:24:16 +0200 Subject: [PATCH 6/9] Fixup --- ext/standard/tests/file/file_put_contents_variation2.phpt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index 8dd0eed54ce71..1f86ba107418a 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -16,7 +16,7 @@ echo "*** Testing file_put_contents() : usage variation ***\n"; function test_error_handler($err_no, $err_msg, $filename, $linenum) { if (error_reporting() & $err_no) { // report non-silenced errors - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } } set_error_handler('test_error_handler'); @@ -138,8 +138,8 @@ unlink($filename); --associative array-- 12 --nested arrays-- -Error: 2 - Array to string conversion, /home/nikic/php-src/ext/standard/tests/file/file_put_contents_variation2.php(101) -Error: 2 - Array to string conversion, /home/nikic/php-src/ext/standard/tests/file/file_put_contents_variation2.php(101) +Error: 2 - Array to string conversion +Error: 2 - Array to string conversion fooArrayArray --uppercase NULL-- From 82052e877a2545cef92f2a0bb3664d450444eb71 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 15:25:42 +0200 Subject: [PATCH 7/9] Update opcache tests --- ext/opcache/tests/block_pass_001.phpt | 2 +- ext/opcache/tests/bug73668.phpt | 2 +- ext/opcache/tests/bug76446.phpt | 2 +- ext/opcache/tests/bug77058.phpt | 2 +- ext/opcache/tests/bug78015.phpt | 2 +- ext/opcache/tests/jit/assign_022.phpt | 2 +- ext/opcache/tests/jit/assign_023.phpt | 2 +- ext/opcache/tests/jit/assign_024.phpt | 2 +- ext/opcache/tests/jit/assign_025.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_003.phpt | 8 ++++---- ext/opcache/tests/jit/fetch_dim_r_004.phpt | 8 ++++---- ext/opcache/tests/jit/fetch_dim_rw_001.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_002.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_003.phpt | 4 ++-- ext/opcache/tests/jmpz_jmp_elim.phpt | 2 +- ext/opcache/tests/wrong_inlining_003.phpt | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ext/opcache/tests/block_pass_001.phpt b/ext/opcache/tests/block_pass_001.phpt index c024b81ce8020..7fab78bbe8556 100644 --- a/ext/opcache/tests/block_pass_001.phpt +++ b/ext/opcache/tests/block_pass_001.phpt @@ -9,4 +9,4 @@ Block pass: Bugs in BOOL/QM_ASSIGN elision (bool) new stdClass; ?> --EXPECTF-- -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/ext/opcache/tests/bug73668.phpt b/ext/opcache/tests/bug73668.phpt index 379ba4a5acd61..b2a0508aa5926 100644 --- a/ext/opcache/tests/bug73668.phpt +++ b/ext/opcache/tests/bug73668.phpt @@ -7,4 +7,4 @@ Bug #73668: "SIGFPE Arithmetic exception" in opcache when divide by minus 1 $a/-1; ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d diff --git a/ext/opcache/tests/bug76446.phpt b/ext/opcache/tests/bug76446.phpt index dfb676f4baf32..98b1d3dc560de 100644 --- a/ext/opcache/tests/bug76446.phpt +++ b/ext/opcache/tests/bug76446.phpt @@ -18,5 +18,5 @@ function test() var_dump(test()); ?> --EXPECTF-- -Notice: Undefined variable: addlang in %sbug76446.php on line %d +Warning: Undefined variable: addlang in %s on line %d int(0) diff --git a/ext/opcache/tests/bug77058.phpt b/ext/opcache/tests/bug77058.phpt index a1962b7adeeec..22a36d1e3d9ac 100644 --- a/ext/opcache/tests/bug77058.phpt +++ b/ext/opcache/tests/bug77058.phpt @@ -18,5 +18,5 @@ myfunc(); ?> --EXPECTF-- -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d '2' is expected to be 2 diff --git a/ext/opcache/tests/bug78015.phpt b/ext/opcache/tests/bug78015.phpt index 0a03c9834f790..aa4ba4db4b036 100644 --- a/ext/opcache/tests/bug78015.phpt +++ b/ext/opcache/tests/bug78015.phpt @@ -103,7 +103,7 @@ array(1) { } bool(true) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(11) "Arrayfoobar" int(2) array(2) { diff --git a/ext/opcache/tests/jit/assign_022.phpt b/ext/opcache/tests/jit/assign_022.phpt index f054a6a4d78d1..ebe153f140882 100644 --- a/ext/opcache/tests/jit/assign_022.phpt +++ b/ext/opcache/tests/jit/assign_022.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Notice: Undefined variable: undef in %s on line %d +Warning: Undefined variable: undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_023.phpt b/ext/opcache/tests/jit/assign_023.phpt index 3e18b1932432b..ebe5ff288fb90 100644 --- a/ext/opcache/tests/jit/assign_023.phpt +++ b/ext/opcache/tests/jit/assign_023.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Notice: Undefined variable: undef in %s on line %d +Warning: Undefined variable: undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_024.phpt b/ext/opcache/tests/jit/assign_024.phpt index b0fc3721396e5..4f48a3e75c45f 100644 --- a/ext/opcache/tests/jit/assign_024.phpt +++ b/ext/opcache/tests/jit/assign_024.phpt @@ -19,5 +19,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Notice: Undefined variable: undef in %s on line %d +Warning: Undefined variable: undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_025.phpt b/ext/opcache/tests/jit/assign_025.phpt index 402c923a5fb72..36b76dba09a0a 100644 --- a/ext/opcache/tests/jit/assign_025.phpt +++ b/ext/opcache/tests/jit/assign_025.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Notice: Undefined variable: ref in %s on line %d +Warning: Undefined variable: ref in %s on line %d ok diff --git a/ext/opcache/tests/jit/fetch_dim_r_003.phpt b/ext/opcache/tests/jit/fetch_dim_r_003.phpt index 0c213802ce9a0..2e82cb926c663 100644 --- a/ext/opcache/tests/jit/fetch_dim_r_003.phpt +++ b/ext/opcache/tests/jit/fetch_dim_r_003.phpt @@ -34,18 +34,18 @@ foo(); string(1) "A" string(1) "C" -Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 6 +Warning: String offset cast occurred in %s on line %d string(1) "B" string(1) "A" string(1) "C" -Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 9 +Warning: String offset cast occurred in %s on line %d string(1) "A" -Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 10 +Warning: String offset cast occurred in %s on line %d string(1) "B" -Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 11 +Warning: String offset cast occurred in %s on line %d string(1) "A" Warning: Illegal string offset 'ab' in %sfetch_dim_r_003.php on line 12 diff --git a/ext/opcache/tests/jit/fetch_dim_r_004.phpt b/ext/opcache/tests/jit/fetch_dim_r_004.phpt index 6f3c730a8df15..66a88977d9c29 100644 --- a/ext/opcache/tests/jit/fetch_dim_r_004.phpt +++ b/ext/opcache/tests/jit/fetch_dim_r_004.phpt @@ -34,18 +34,18 @@ foo($x.$y); string(1) "A" string(1) "C" -Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4 +Warning: String offset cast occurred in %s on line %d string(1) "B" string(1) "A" string(1) "C" -Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4 +Warning: String offset cast occurred in %s on line %d string(1) "A" -Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4 +Warning: String offset cast occurred in %s on line %d string(1) "B" -Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4 +Warning: String offset cast occurred in %s on line %d string(1) "A" Warning: Illegal string offset 'ab' in %sfetch_dim_r_004.php on line 4 diff --git a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt index 9e883aaf75adf..a828e0a5ea377 100644 --- a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt +++ b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt @@ -16,7 +16,7 @@ function foo() { } var_dump(foo()); --EXPECTF-- -Notice: Undefined variable: a in %sfetch_dim_rw_001.php on line 3 +Warning: Undefined variable: a in %s on line %d Notice: Undefined offset: 0 in %sfetch_dim_rw_001.php on line 3 diff --git a/ext/opcache/tests/jit/fetch_obj_002.phpt b/ext/opcache/tests/jit/fetch_obj_002.phpt index 95ad920ea84ee..463ff01b26bf3 100644 --- a/ext/opcache/tests/jit/fetch_obj_002.phpt +++ b/ext/opcache/tests/jit/fetch_obj_002.phpt @@ -35,7 +35,7 @@ bar(); --EXPECTF-- int(2) -Notice: Undefined property: A::$y in %sfetch_obj_002.php on line 16 +Warning: Undefined property: A::$y in %s on line %d NULL int(3) string(5) "__get" diff --git a/ext/opcache/tests/jit/fetch_obj_003.phpt b/ext/opcache/tests/jit/fetch_obj_003.phpt index 3f7f0beaf39ed..9232ccd64b4e5 100644 --- a/ext/opcache/tests/jit/fetch_obj_003.phpt +++ b/ext/opcache/tests/jit/fetch_obj_003.phpt @@ -31,13 +31,13 @@ foo(); bar(); ?> --EXPECTF-- -Notice: Undefined property: C::$a in %sfetch_obj_003.php on line 9 +Warning: Undefined property: C::$a in %s on line %d object(C)#1 (1) { ["a"]=> int(2) } -Notice: Undefined property: C::$a in %sfetch_obj_003.php on line 17 +Warning: Undefined property: C::$a in %s on line %d object(C)#1 (2) { ["a"]=> int(2) diff --git a/ext/opcache/tests/jmpz_jmp_elim.phpt b/ext/opcache/tests/jmpz_jmp_elim.phpt index 8a343512dd738..434897bf8022a 100644 --- a/ext/opcache/tests/jmpz_jmp_elim.phpt +++ b/ext/opcache/tests/jmpz_jmp_elim.phpt @@ -14,5 +14,5 @@ echo "done\n"; ?> --EXPECTF-- -Notice: Undefined variable: undef in %s on line %d +Warning: Undefined variable: undef in %s on line %d done diff --git a/ext/opcache/tests/wrong_inlining_003.phpt b/ext/opcache/tests/wrong_inlining_003.phpt index a7e4a11b76be5..c83a4efc361f0 100644 --- a/ext/opcache/tests/wrong_inlining_003.phpt +++ b/ext/opcache/tests/wrong_inlining_003.phpt @@ -19,5 +19,5 @@ function test() { test(); ?> --EXPECTF-- -Notice: Undefined variable: undef in %swrong_inlining_003.php on line 7 +Warning: Undefined variable: undef in %s on line %d int(42) From a9071050ec7fb528b3994daca0cee01907663462 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 16:04:53 +0200 Subject: [PATCH 8/9] Fix i386 tests, hopefully --- .../general_functions/gettype_settype_variation1.phpt | 11 ----------- .../general_functions/gettype_settype_variation2.phpt | 11 ----------- .../general_functions/gettype_settype_variation3.phpt | 11 ----------- .../general_functions/gettype_settype_variation4.phpt | 11 ----------- .../general_functions/gettype_settype_variation5.phpt | 11 ----------- .../general_functions/gettype_settype_variation6.phpt | 11 ----------- .../general_functions/gettype_settype_variation7.phpt | 11 ----------- .../general_functions/gettype_settype_variation8.phpt | 11 ----------- ext/standard/tests/strings/crc32_variation3.phpt | 4 ++-- 9 files changed, 2 insertions(+), 90 deletions(-) diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index 7fb8789ff3ae0..3c0f7fcd0cf8c 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to null type */ @@ -180,9 +172,6 @@ foreach ($var_values as $var) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to null -- diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index d44c04e5dde74..80e73c4319a13 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -42,10 +42,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -153,10 +149,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); // test conversion to these types @@ -189,9 +181,6 @@ foreach ($types as $type) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing settype() & gettype() : usage variations *** -- Setting type of data to integer -- diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index 71b03461eb860..7253538f9911f 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); // test conversion to these types @@ -185,9 +177,6 @@ foreach ($types as $type) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing settype() & gettype() : usage variations *** -- Setting type of data to float -- diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index a14cb73dbb62b..f29b4c504e74b 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -160,10 +156,6 @@ $var_values = array ( new point(0, 0), new class_with_no_member, - /* undefined/unset vars */ - $unset_var, - $undef_var, - /* binary strings */ b"0", b'0', @@ -210,9 +202,6 @@ foreach ($types as $type) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing settype() & gettype() : usage variations *** -- Setting type of data to boolean -- diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt index c5e2640f9c211..faa386235ca4e 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to resource type */ @@ -180,9 +172,6 @@ foreach ($var_values as $var) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to resource -- diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt index 27beaa0744424..59e7c95804c46 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to array type */ @@ -182,9 +174,6 @@ foreach ($var_values as $var) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to array -- diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt index dae20a18568b8..e8c1c014aa8c0 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to object type */ @@ -180,9 +172,6 @@ foreach ($var_values as $var) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to object -- diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt index 97f550e446ba8..578157ab43c66 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to string type */ @@ -180,9 +172,6 @@ foreach ($var_values as $var) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to string -- diff --git a/ext/standard/tests/strings/crc32_variation3.phpt b/ext/standard/tests/strings/crc32_variation3.phpt index 691703103e2ff..bc219c43e96fd 100644 --- a/ext/standard/tests/strings/crc32_variation3.phpt +++ b/ext/standard/tests/strings/crc32_variation3.phpt @@ -77,9 +77,9 @@ echo "Done"; --EXPECTF-- *** Testing crc32() : with different strings in double quotes *** -Notice: Undefined variable: hello in %s on line %d +Warning: Undefined variable: hello in %s on line %d -Notice: Undefined variable: world in %s on line %d +Warning: Undefined variable: world in %s on line %d -- Iteration 1 -- int(0) From 7311c815306a866cc3c14cc98d3a66d29a10d317 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 1 Oct 2019 16:57:28 +0200 Subject: [PATCH 9/9] More i386 fixes Eh, let's do an m32 build and regenerate them... --- .../gettype_settype_variation1.phpt | 10 ------ .../gettype_settype_variation2.phpt | 20 ----------- .../gettype_settype_variation3.phpt | 20 ----------- .../gettype_settype_variation4.phpt | 36 +++++-------------- .../gettype_settype_variation5.phpt | 14 +------- .../gettype_settype_variation6.phpt | 14 +------- .../gettype_settype_variation7.phpt | 14 +------- .../gettype_settype_variation8.phpt | 22 ++++-------- 8 files changed, 17 insertions(+), 133 deletions(-) diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index 3c0f7fcd0cf8c..eb43b85f309c8 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -565,14 +565,4 @@ string(6) "object" bool(true) NULL string(4) "NULL" --- Iteration 79 -- -string(4) "NULL" -bool(true) -NULL -string(4) "NULL" --- Iteration 80 -- -string(4) "NULL" -bool(true) -NULL -string(4) "NULL" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index 80e73c4319a13..5e49821f2ca4b 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -577,16 +577,6 @@ string(6) "object" bool(true) int(1) string(7) "integer" --- Iteration 79 -- -string(4) "NULL" -bool(true) -int(0) -string(7) "integer" --- Iteration 80 -- -string(4) "NULL" -bool(true) -int(0) -string(7) "integer" -- Setting type of data to int -- -- Iteration 1 -- @@ -982,14 +972,4 @@ string(6) "object" bool(true) int(1) string(7) "integer" --- Iteration 79 -- -string(4) "NULL" -bool(true) -int(0) -string(7) "integer" --- Iteration 80 -- -string(4) "NULL" -bool(true) -int(0) -string(7) "integer" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index 7253538f9911f..f17b261437ab3 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -573,16 +573,6 @@ string(6) "object" bool(true) float(1) string(6) "double" --- Iteration 79 -- -string(4) "NULL" -bool(true) -float(0) -string(6) "double" --- Iteration 80 -- -string(4) "NULL" -bool(true) -float(0) -string(6) "double" -- Setting type of data to double -- -- Iteration 1 -- @@ -978,14 +968,4 @@ string(6) "object" bool(true) float(1) string(6) "double" --- Iteration 79 -- -string(4) "NULL" -bool(true) -float(0) -string(6) "double" --- Iteration 80 -- -string(4) "NULL" -bool(true) -float(0) -string(6) "double" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index f29b4c504e74b..00da4bf4bb5d7 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -621,24 +621,24 @@ bool(true) bool(true) string(7) "boolean" -- Iteration 84 -- -string(4) "NULL" +string(6) "string" bool(true) bool(false) string(7) "boolean" -- Iteration 85 -- -string(4) "NULL" +string(6) "string" bool(true) bool(false) string(7) "boolean" -- Iteration 86 -- string(6) "string" bool(true) -bool(false) +bool(true) string(7) "boolean" -- Iteration 87 -- string(6) "string" bool(true) -bool(false) +bool(true) string(7) "boolean" -- Iteration 88 -- string(6) "string" @@ -685,16 +685,6 @@ string(6) "string" bool(true) bool(true) string(7) "boolean" --- Iteration 97 -- -string(6) "string" -bool(true) -bool(true) -string(7) "boolean" --- Iteration 98 -- -string(6) "string" -bool(true) -bool(true) -string(7) "boolean" -- Setting type of data to bool -- -- Iteration 1 -- @@ -1113,24 +1103,24 @@ bool(true) bool(true) string(7) "boolean" -- Iteration 84 -- -string(4) "NULL" +string(6) "string" bool(true) bool(false) string(7) "boolean" -- Iteration 85 -- -string(4) "NULL" +string(6) "string" bool(true) bool(false) string(7) "boolean" -- Iteration 86 -- string(6) "string" bool(true) -bool(false) +bool(true) string(7) "boolean" -- Iteration 87 -- string(6) "string" bool(true) -bool(false) +bool(true) string(7) "boolean" -- Iteration 88 -- string(6) "string" @@ -1177,14 +1167,4 @@ string(6) "string" bool(true) bool(true) string(7) "boolean" --- Iteration 97 -- -string(6) "string" -bool(true) -bool(true) -string(7) "boolean" --- Iteration 98 -- -string(6) "string" -bool(true) -bool(true) -string(7) "boolean" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt index faa386235ca4e..6437baa10b3b3 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -171,7 +171,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to resource -- @@ -688,16 +688,4 @@ object(point)#3 (2) { int(0) } string(6) "object" --- Iteration 79 -- -string(4) "NULL" -2: settype(): Cannot convert to resource type -bool(false) -NULL -string(4) "NULL" --- Iteration 80 -- -string(4) "NULL" -2: settype(): Cannot convert to resource type -bool(false) -NULL -string(4) "NULL" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt index 59e7c95804c46..7c5ea5efb66c5 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -173,7 +173,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to array -- @@ -820,16 +820,4 @@ array(2) { int(0) } string(5) "array" --- Iteration 79 -- -string(4) "NULL" -bool(true) -array(0) { -} -string(5) "array" --- Iteration 80 -- -string(4) "NULL" -bool(true) -array(0) { -} -string(5) "array" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt index e8c1c014aa8c0..b282cbdab1d6d 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -171,7 +171,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to object -- @@ -818,16 +818,4 @@ object(point)#3 (2) { int(0) } string(6) "object" --- Iteration 79 -- -string(4) "NULL" -bool(true) -object(stdClass)#4 (0) { -} -string(6) "object" --- Iteration 80 -- -string(4) "NULL" -bool(true) -object(stdClass)#4 (0) { -} -string(6) "object" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt index 578157ab43c66..7ddfe54ab62e5 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -171,7 +171,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to string -- @@ -388,31 +388,31 @@ string(12) "@$%#$%^$%^&^" string(6) "string" -- Iteration 43 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" -- Iteration 44 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" -- Iteration 45 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" -- Iteration 46 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" -- Iteration 47 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" @@ -571,14 +571,4 @@ string(6) "object" bool(true) string(11) "ObjectPoint" string(6) "string" --- Iteration 79 -- -string(4) "NULL" -bool(true) -string(0) "" -string(6) "string" --- Iteration 80 -- -string(4) "NULL" -bool(true) -string(0) "" -string(6) "string" Done