Skip to content

Commit c6a6ca0

Browse files
nikicnikic
committed
Use zend_zval_type_name() API where possible
Rather than zend_get_type_by_const(Z_TYPE_P()).
1 parent 3f51d82 commit c6a6ca0

File tree

8 files changed

+48
-53
lines changed

8 files changed

+48
-53
lines changed

‎Zend/zend_compile.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6417,7 +6417,7 @@ void zend_compile_prop_decl(zend_ast *ast, zend_ast *type_ast, uint32_t flags) /
64176417
} else {
64186418
zend_error_noreturn(E_COMPILE_ERROR,
64196419
"Cannot use %s as default value for property %s::$%s of type %s",
6420-
zend_get_type_by_const(Z_TYPE(value_zv)),
6420+
zend_zval_type_name(&value_zv),
64216421
ZSTR_VAL(ce->name), ZSTR_VAL(name), ZSTR_VAL(str));
64226422
}
64236423
}
@@ -8320,7 +8320,7 @@ void zend_compile_class_name(znode *result, zend_ast *ast) /* {{{ */
83208320
/* Unlikely case that happen if class_ast is constant folded.
83218321
* Handle it here, to avoid needing a CONST specialization in the VM. */
83228322
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use ::class on value of type %s",
8323-
zend_get_type_by_const(Z_TYPE(expr_node.u.constant)));
8323+
zend_zval_type_name(&expr_node.u.constant));
83248324
}
83258325

83268326
zend_emit_op_tmp(result, ZEND_FETCH_CLASS_NAME, &expr_node, NULL);

‎Zend/zend_execute.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_i
844844

845845
type_str = zend_type_to_string(info->type);
846846
zend_type_error("Cannot assign %s to property %s::$%s of type %s",
847-
Z_TYPE_P(property) == IS_OBJECT ? ZSTR_VAL(Z_OBJCE_P(property)->name) : zend_get_type_by_const(Z_TYPE_P(property)),
847+
Z_TYPE_P(property) == IS_OBJECT ? ZSTR_VAL(Z_OBJCE_P(property)->name) : zend_zval_type_name(property),
848848
ZSTR_VAL(info->ce->name),
849849
zend_get_unmangled_property_name(info->name),
850850
ZSTR_VAL(type_str));
@@ -1915,7 +1915,8 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_method(cons
19151915

19161916
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_invalid_method_call(zval *object, zval *function_name)
19171917
{
1918-
zend_throw_error(NULL, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
1918+
zend_throw_error(NULL, "Call to a member function %s() on %s",
1919+
Z_STRVAL_P(function_name), zend_zval_type_name(object));
19191920
}
19201921

19211922
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_non_static_method_call(const zend_function *fbc)
@@ -2556,8 +2557,7 @@ static ZEND_COLD void ZEND_FASTCALL zend_array_key_exists_error(
25562557
}
25572558
if (!EG(exception)) {
25582559
zend_type_error("array_key_exists(): Argument #2 ($array) must be of type array, %s given",
2559-
zend_get_type_by_const(Z_TYPE_P(subject))
2560-
);
2560+
zend_zval_type_name(subject));
25612561
}
25622562
}
25632563

@@ -2943,7 +2943,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1
29432943
zend_string *type1_str = zend_type_to_string(prop1->type);
29442944
zend_string *type2_str = zend_type_to_string(prop2->type);
29452945
zend_type_error("Reference with value of type %s held by property %s::$%s of type %s is not compatible with property %s::$%s of type %s",
2946-
Z_TYPE_P(zv) == IS_OBJECT ? ZSTR_VAL(Z_OBJCE_P(zv)->name) : zend_get_type_by_const(Z_TYPE_P(zv)),
2946+
Z_TYPE_P(zv) == IS_OBJECT ? ZSTR_VAL(Z_OBJCE_P(zv)->name) : zend_zval_type_name(zv),
29472947
ZSTR_VAL(prop1->ce->name),
29482948
zend_get_unmangled_property_name(prop1->name),
29492949
ZSTR_VAL(type1_str),
@@ -2958,7 +2958,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1
29582958
ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(zend_property_info *prop, zval *zv) {
29592959
zend_string *type_str = zend_type_to_string(prop->type);
29602960
zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s",
2961-
Z_TYPE_P(zv) == IS_OBJECT ? ZSTR_VAL(Z_OBJCE_P(zv)->name) : zend_get_type_by_const(Z_TYPE_P(zv)),
2961+
Z_TYPE_P(zv) == IS_OBJECT ? ZSTR_VAL(Z_OBJCE_P(zv)->name) : zend_zval_type_name(zv),
29622962
ZSTR_VAL(prop->ce->name),
29632963
zend_get_unmangled_property_name(prop->name),
29642964
ZSTR_VAL(type_str)
@@ -2970,7 +2970,7 @@ ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(zend_property_info
29702970
zend_string *type1_str = zend_type_to_string(prop1->type);
29712971
zend_string *type2_str = zend_type_to_string(prop2->type);
29722972
zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s and property %s::$%s of type %s, as this would result in an inconsistent type conversion",
2973-
Z_TYPE_P(zv) == IS_OBJECT ? ZSTR_VAL(Z_OBJCE_P(zv)->name) : zend_get_type_by_const(Z_TYPE_P(zv)),
2973+
Z_TYPE_P(zv) == IS_OBJECT ? ZSTR_VAL(Z_OBJCE_P(zv)->name) : zend_zval_type_name(zv),
29742974
ZSTR_VAL(prop1->ce->name),
29752975
zend_get_unmangled_property_name(prop1->name),
29762976
ZSTR_VAL(type1_str),

‎Zend/zend_operators.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ static ZEND_COLD zend_never_inline void ZEND_FASTCALL zend_binop_error(const cha
936936
}
937937

938938
zend_type_error("Unsupported operand types: %s %s %s",
939-
zend_get_type_by_const(Z_TYPE_P(op1)), operator, zend_get_type_by_const(Z_TYPE_P(op2)));
939+
zend_zval_type_name(op1), operator, zend_zval_type_name(op2));
940940
}
941941
/* }}} */
942942

@@ -1468,8 +1468,7 @@ ZEND_API int ZEND_FASTCALL bitwise_not_function(zval *result, zval *op1) /* {{{
14681468
if (result != op1) {
14691469
ZVAL_UNDEF(result);
14701470
}
1471-
zend_type_error("Cannot perform bitwise not on %s",
1472-
zend_get_type_by_const(Z_TYPE_P(op1)));
1471+
zend_type_error("Cannot perform bitwise not on %s", zend_zval_type_name(op1));
14731472
return FAILURE;
14741473
}
14751474
}
@@ -2376,7 +2375,7 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
23762375
/* break missing intentionally */
23772376
case IS_RESOURCE:
23782377
case IS_ARRAY:
2379-
zend_type_error("Cannot increment %s", zend_get_type_by_const(Z_TYPE_P(op1)));
2378+
zend_type_error("Cannot increment %s", zend_zval_type_name(op1));
23802379
return FAILURE;
23812380
EMPTY_SWITCH_DEFAULT_CASE()
23822381
}
@@ -2438,7 +2437,7 @@ ZEND_API int ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
24382437
/* break missing intentionally */
24392438
case IS_RESOURCE:
24402439
case IS_ARRAY:
2441-
zend_type_error("Cannot decrement %s", zend_get_type_by_const(Z_TYPE_P(op1)));
2440+
zend_type_error("Cannot decrement %s", zend_zval_type_name(op1));
24422441
return FAILURE;
24432442
EMPTY_SWITCH_DEFAULT_CASE()
24442443
}

‎Zend/zend_vm_def.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3695,7 +3695,7 @@ ZEND_VM_C_LABEL(try_function_name):
36953695
}
36963696
}
36973697
zend_throw_error(NULL, "Value of type %s is not callable",
3698-
zend_get_type_by_const(Z_TYPE_P(function_name)));
3698+
zend_zval_type_name(function_name));
36993699
call = NULL;
37003700
}
37013701

@@ -4934,7 +4934,7 @@ ZEND_VM_HANDLER(119, ZEND_SEND_ARRAY, ANY, ANY, NUM)
49344934
ZEND_VM_C_GOTO(send_array);
49354935
}
49364936
}
4937-
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_get_type_by_const(Z_TYPE_P(args)));
4937+
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_zval_type_name(args));
49384938
FREE_UNFETCHED_OP2();
49394939
FREE_OP1();
49404940
HANDLE_EXCEPTION();
@@ -6188,7 +6188,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET_R, CONST|TMP|VAR|CV, JMP_ADDR)
61886188
}
61896189
}
61906190
} else {
6191-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
6191+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
61926192
ZVAL_UNDEF(EX_VAR(opline->result.var));
61936193
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
61946194
FREE_OP1();
@@ -6277,7 +6277,7 @@ ZEND_VM_COLD_CONST_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, JMP_ADDR)
62776277
}
62786278
}
62796279
} else {
6280-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
6280+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
62816281
ZVAL_UNDEF(EX_VAR(opline->result.var));
62826282
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
62836283
if (OP1_TYPE == IS_VAR) {
@@ -6587,7 +6587,7 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY, JMP_ADDR)
65876587
value_type = Z_TYPE_INFO_P(value);
65886588
}
65896589
} else {
6590-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array)));
6590+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array));
65916591
if (UNEXPECTED(EG(exception))) {
65926592
UNDEF_RESULT();
65936593
HANDLE_EXCEPTION();
@@ -7917,7 +7917,7 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY)
79177917
zval_ptr_dtor(&tmp);
79187918
}
79197919
if (!EG(exception)) {
7920-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value)));
7920+
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
79217921
}
79227922
ZVAL_UNDEF(EX_VAR(opline->result.var));
79237923
} while (0);
@@ -8012,8 +8012,7 @@ ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, CV|TMPVAR|UNUSED|CLASS_FETCH, ANY)
80128012
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
80138013
ZVAL_DEREF(op);
80148014
if (Z_TYPE_P(op) != IS_OBJECT) {
8015-
zend_type_error("Cannot use ::class on value of type %s",
8016-
zend_get_type_by_const(Z_TYPE_P(op)));
8015+
zend_type_error("Cannot use ::class on value of type %s", zend_zval_type_name(op));
80178016
ZVAL_UNDEF(EX_VAR(opline->result.var));
80188017
FREE_OP1();
80198018
HANDLE_EXCEPTION();
@@ -8525,7 +8524,7 @@ ZEND_VM_COLD_CONST_HANDLER(191, ZEND_GET_CLASS, UNUSED|CONST|TMPVAR|CV, UNUSED)
85258524
if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
85268525
ZVAL_UNDEFINED_OP1();
85278526
}
8528-
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1)));
8527+
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
85298528
ZVAL_UNDEF(EX_VAR(opline->result.var));
85308529
}
85318530
break;

‎Zend/zend_vm_execute.h

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,7 +1977,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_ARRAY_SPEC_HANDLER(ZEND_O
19771977
goto send_array;
19781978
}
19791979
}
1980-
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_get_type_by_const(Z_TYPE_P(args)));
1980+
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_zval_type_name(args));
19811981
FREE_UNFETCHED_OP(opline->op2_type, opline->op2.var);
19821982
FREE_OP(opline->op1_type, opline->op1.var);
19831983
HANDLE_EXCEPTION();
@@ -2900,7 +2900,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_CONST_H
29002900
}
29012901
}
29022902
zend_throw_error(NULL, "Value of type %s is not callable",
2903-
zend_get_type_by_const(Z_TYPE_P(function_name)));
2903+
zend_zval_type_name(function_name));
29042904
call = NULL;
29052905
}
29062906

@@ -3067,7 +3067,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_TMPVAR_
30673067
}
30683068
}
30693069
zend_throw_error(NULL, "Value of type %s is not callable",
3070-
zend_get_type_by_const(Z_TYPE_P(function_name)));
3070+
zend_zval_type_name(function_name));
30713071
call = NULL;
30723072
}
30733073

@@ -3185,7 +3185,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_CV_HAND
31853185
}
31863186
}
31873187
zend_throw_error(NULL, "Value of type %s is not callable",
3188-
zend_get_type_by_const(Z_TYPE_P(function_name)));
3188+
zend_zval_type_name(function_name));
31893189
call = NULL;
31903190
}
31913191

@@ -4096,7 +4096,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_CONST_HANDLER(
40964096
}
40974097
}
40984098
} else {
4099-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
4099+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
41004100
ZVAL_UNDEF(EX_VAR(opline->result.var));
41014101
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
41024102

@@ -4184,7 +4184,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_
41844184
}
41854185
}
41864186
} else {
4187-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
4187+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
41884188
ZVAL_UNDEF(EX_VAR(opline->result.var));
41894189
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
41904190
if (IS_CONST == IS_VAR) {
@@ -4473,7 +4473,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CONST
44734473
zval_ptr_dtor(&tmp);
44744474
}
44754475
if (!EG(exception)) {
4476-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value)));
4476+
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
44774477
}
44784478
ZVAL_UNDEF(EX_VAR(opline->result.var));
44794479
} while (0);
@@ -9342,7 +9342,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_CO
93429342
if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
93439343
ZVAL_UNDEFINED_OP1();
93449344
}
9345-
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1)));
9345+
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
93469346
ZVAL_UNDEF(EX_VAR(opline->result.var));
93479347
}
93489348
break;
@@ -13314,7 +13314,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_TMPVAR_HANDLER(ZEN
1331413314
zval_ptr_dtor(&tmp);
1331513315
}
1331613316
if (!EG(exception)) {
13317-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value)));
13317+
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
1331813318
}
1331913319
ZVAL_UNDEF(EX_VAR(opline->result.var));
1332013320
} while (0);
@@ -13371,8 +13371,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_TMPVAR_H
1337113371
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
1337213372
ZVAL_DEREF(op);
1337313373
if (Z_TYPE_P(op) != IS_OBJECT) {
13374-
zend_type_error("Cannot use ::class on value of type %s",
13375-
zend_get_type_by_const(Z_TYPE_P(op)));
13374+
zend_type_error("Cannot use ::class on value of type %s", zend_zval_type_name(op));
1337613375
ZVAL_UNDEF(EX_VAR(opline->result.var));
1337713376
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
1337813377
HANDLE_EXCEPTION();
@@ -16421,7 +16420,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_TMPVAR_UNUSED_H
1642116420
if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
1642216421
ZVAL_UNDEFINED_OP1();
1642316422
}
16424-
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1)));
16423+
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
1642516424
ZVAL_UNDEF(EX_VAR(opline->result.var));
1642616425
}
1642716426
break;
@@ -17694,7 +17693,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_TMP_HANDLER(ZE
1769417693
}
1769517694
}
1769617695
} else {
17697-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
17696+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
1769817697
ZVAL_UNDEF(EX_VAR(opline->result.var));
1769917698
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
1770017699
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
@@ -17782,7 +17781,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_TMP_HANDLER(Z
1778217781
}
1778317782
}
1778417783
} else {
17785-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
17784+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
1778617785
ZVAL_UNDEF(EX_VAR(opline->result.var));
1778717786
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
1778817787
if (IS_TMP_VAR == IS_VAR) {
@@ -20354,7 +20353,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_VAR_HANDLER(ZE
2035420353
}
2035520354
}
2035620355
} else {
20357-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
20356+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
2035820357
ZVAL_UNDEF(EX_VAR(opline->result.var));
2035920358
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
2036020359
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
@@ -20443,7 +20442,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_VAR_HANDLER(Z
2044320442
}
2044420443
}
2044520444
} else {
20446-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
20445+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
2044720446
ZVAL_UNDEF(EX_VAR(opline->result.var));
2044820447
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
2044920448
if (IS_VAR == IS_VAR) {
@@ -20753,7 +20752,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FETCH_RW_SPEC_VAR_HANDLER(Z
2075320752
value_type = Z_TYPE_INFO_P(value);
2075420753
}
2075520754
} else {
20756-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array)));
20755+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array));
2075720756
if (UNEXPECTED(EG(exception))) {
2075820757
UNDEF_RESULT();
2075920758
HANDLE_EXCEPTION();
@@ -29111,8 +29110,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_UNUSED_H
2911129110
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
2911229111
ZVAL_DEREF(op);
2911329112
if (Z_TYPE_P(op) != IS_OBJECT) {
29114-
zend_type_error("Cannot use ::class on value of type %s",
29115-
zend_get_type_by_const(Z_TYPE_P(op)));
29113+
zend_type_error("Cannot use ::class on value of type %s", zend_zval_type_name(op));
2911629114
ZVAL_UNDEF(EX_VAR(opline->result.var));
2911729115

2911829116
HANDLE_EXCEPTION();
@@ -33317,7 +33315,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_UNUSED_UNUSED_H
3331733315
if (IS_UNUSED == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
3331833316
ZVAL_UNDEFINED_OP1();
3331933317
}
33320-
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1)));
33318+
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
3332133319
ZVAL_UNDEF(EX_VAR(opline->result.var));
3332233320
}
3332333321
break;
@@ -36343,7 +36341,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_CV_HANDLER(ZEN
3634336341
}
3634436342
}
3634536343
} else {
36346-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
36344+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
3634736345
ZVAL_UNDEF(EX_VAR(opline->result.var));
3634836346
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
3634936347

@@ -36431,7 +36429,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_CV_HANDLER(ZE
3643136429
}
3643236430
}
3643336431
} else {
36434-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_get_type_by_const(Z_TYPE_P(array_ptr)));
36432+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
3643536433
ZVAL_UNDEF(EX_VAR(opline->result.var));
3643636434
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
3643736435
if (IS_CV == IS_VAR) {
@@ -36711,7 +36709,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CV_HANDLER(ZEND_OP
3671136709
zval_ptr_dtor(&tmp);
3671236710
}
3671336711
if (!EG(exception)) {
36714-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_get_type_by_const(Z_TYPE_P(value)));
36712+
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
3671536713
}
3671636714
ZVAL_UNDEF(EX_VAR(opline->result.var));
3671736715
} while (0);
@@ -36768,8 +36766,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_CV_HANDL
3676836766
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
3676936767
ZVAL_DEREF(op);
3677036768
if (Z_TYPE_P(op) != IS_OBJECT) {
36771-
zend_type_error("Cannot use ::class on value of type %s",
36772-
zend_get_type_by_const(Z_TYPE_P(op)));
36769+
zend_type_error("Cannot use ::class on value of type %s", zend_zval_type_name(op));
3677336770
ZVAL_UNDEF(EX_VAR(opline->result.var));
3677436771

3677536772
HANDLE_EXCEPTION();
@@ -45268,7 +45265,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_CV_UNUSED_HANDL
4526845265
if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
4526945266
ZVAL_UNDEFINED_OP1();
4527045267
}
45271-
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_get_type_by_const(Z_TYPE_P(op1)));
45268+
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
4527245269
ZVAL_UNDEF(EX_VAR(opline->result.var));
4527345270
}
4527445271
break;

0 commit comments

Comments
 (0)