Skip to content

Commit 6425fd0

Browse files
kocsismatekocsismate
committed
Use zend_zval_type_name instead of zend_zval_type_error_name
1 parent be9f184 commit 6425fd0

24 files changed

+100
-109
lines changed

‎Zend/zend_API.c

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,6 @@ ZEND_API const char *zend_zval_type_name(const zval *arg) /* {{{ */
136136
{
137137
ZVAL_DEREF(arg);
138138

139-
return Z_ISUNDEF_P(arg) ? "null" : zend_get_type_by_const(Z_TYPE_P(arg));
140-
}
141-
/* }}} */
142-
143-
ZEND_API const char *zend_zval_type_error_name(const zval *arg) /* {{{ */
144-
{
145-
ZVAL_DEREF(arg);
146-
147139
if (Z_ISUNDEF_P(arg)) {
148140
return "null";
149141
}
@@ -236,7 +228,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(int num, z
236228
return;
237229
}
238230

239-
zend_argument_type_error(num, "must be %s, %s given", expected_error[expected_type], zend_zval_type_error_name(arg));
231+
zend_argument_type_error(num, "must be %s, %s given", expected_error[expected_type], zend_zval_type_name(arg));
240232
}
241233
/* }}} */
242234

@@ -246,7 +238,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num,
246238
return;
247239
}
248240

249-
zend_argument_type_error(num, "must be of type %s, %s given", name, zend_zval_type_error_name(arg));
241+
zend_argument_type_error(num, "must be of type %s, %s given", name, zend_zval_type_name(arg));
250242
}
251243
/* }}} */
252244

@@ -256,7 +248,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_null_error(i
256248
return;
257249
}
258250

259-
zend_argument_type_error(num, "must be of type ?%s, %s given", name, zend_zval_type_error_name(arg));
251+
zend_argument_type_error(num, "must be of type ?%s, %s given", name, zend_zval_type_name(arg));
260252
}
261253
/* }}} */
262254

@@ -623,7 +615,7 @@ static const char *zend_parse_arg_impl(zval *arg, va_list *va, const char **spec
623615
size_t *pl = va_arg(*va, size_t *);
624616
if (!zend_parse_arg_path(arg, p, pl, check_null)) {
625617
zend_spprintf(error, 0, "a valid path%s, %s given",
626-
check_null ? " or null" : "", zend_zval_type_error_name(arg)
618+
check_null ? " or null" : "", zend_zval_type_name(arg)
627619
);
628620
return "";
629621
}
@@ -635,7 +627,7 @@ static const char *zend_parse_arg_impl(zval *arg, va_list *va, const char **spec
635627
zend_string **str = va_arg(*va, zend_string **);
636628
if (!zend_parse_arg_path_str(arg, str, check_null)) {
637629
zend_spprintf(error, 0, "a valid path%s, %s given",
638-
check_null ? " or null" : "", zend_zval_type_error_name(arg)
630+
check_null ? " or null" : "", zend_zval_type_name(arg)
639631
);
640632
return "";
641633
}
@@ -716,7 +708,7 @@ static const char *zend_parse_arg_impl(zval *arg, va_list *va, const char **spec
716708
if (!zend_parse_arg_object(arg, p, ce, check_null)) {
717709
if (ce) {
718710
if (check_null) {
719-
zend_spprintf(error, 0, "of type ?%s, %s given", ZSTR_VAL(ce->name), zend_zval_type_error_name(arg));
711+
zend_spprintf(error, 0, "of type ?%s, %s given", ZSTR_VAL(ce->name), zend_zval_type_name(arg));
720712
return "";
721713
} else {
722714
return ZSTR_VAL(ce->name);
@@ -827,7 +819,7 @@ static int zend_parse_arg(uint32_t arg_num, zval *arg, va_list *va, const char *
827819
zend_argument_type_error(arg_num, "must be %s", error);
828820
efree(error);
829821
} else {
830-
zend_argument_type_error(arg_num, "must be of type %s, %s given", expected_type, zend_zval_type_error_name(arg));
822+
zend_argument_type_error(arg_num, "must be of type %s, %s given", expected_type, zend_zval_type_name(arg));
831823
}
832824
} else if (error) {
833825
efree(error);

‎Zend/zend_API.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ ZEND_API int zend_parse_parameters_ex(int flags, uint32_t num_args, const char *
301301
#define zend_parse_parameters_throw(num_args, ...) \
302302
zend_parse_parameters(num_args, __VA_ARGS__)
303303
ZEND_API const char *zend_zval_type_name(const zval *arg);
304-
ZEND_API const char *zend_zval_type_error_name(const zval *arg);
305304
ZEND_API zend_string *zend_zval_get_legacy_type(const zval *arg);
306305

307306
ZEND_API int zend_parse_method_parameters(uint32_t num_args, zval *this_ptr, const char *type_spec, ...);

‎Zend/zend_builtin_functions.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ ZEND_FUNCTION(method_exists)
986986
RETURN_FALSE;
987987
}
988988
} else {
989-
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_error_name(klass));
989+
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_name(klass));
990990
RETURN_THROWS();
991991
}
992992

@@ -1043,7 +1043,7 @@ ZEND_FUNCTION(property_exists)
10431043
} else if (Z_TYPE_P(object) == IS_OBJECT) {
10441044
ce = Z_OBJCE_P(object);
10451045
} else {
1046-
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_error_name(object));
1046+
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_name(object));
10471047
RETURN_THROWS();
10481048
}
10491049

‎Zend/zend_compile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6437,7 +6437,7 @@ void zend_compile_prop_decl(zend_ast *ast, zend_ast *type_ast, uint32_t flags) /
64376437
} else {
64386438
zend_error_noreturn(E_COMPILE_ERROR,
64396439
"Cannot use %s as default value for property %s::$%s of type %s",
6440-
zend_zval_type_error_name(&value_zv),
6440+
zend_zval_type_name(&value_zv),
64416441
ZSTR_VAL(ce->name), ZSTR_VAL(name), ZSTR_VAL(str));
64426442
}
64436443
}

‎Zend/zend_execute.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ static ZEND_COLD void zend_verify_type_error_common(
663663
*need_msg = zend_type_to_string_resolved(arg_info->type, zf->common.scope);
664664

665665
if (value) {
666-
*given_kind = zend_zval_type_error_name(value);
666+
*given_kind = zend_zval_type_name(value);
667667
} else {
668668
*given_kind = "none";
669669
}
@@ -843,7 +843,7 @@ ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_i
843843

844844
type_str = zend_type_to_string(info->type);
845845
zend_type_error("Cannot assign %s to property %s::$%s of type %s",
846-
zend_zval_type_error_name(property),
846+
zend_zval_type_name(property),
847847
ZSTR_VAL(info->ce->name),
848848
zend_get_unmangled_property_name(info->name),
849849
ZSTR_VAL(type_str));
@@ -1229,7 +1229,7 @@ static int zend_verify_internal_return_type(zend_function *zf, zval *ret)
12291229

12301230
if (ZEND_TYPE_FULL_MASK(ret_info->type) & MAY_BE_VOID) {
12311231
if (UNEXPECTED(Z_TYPE_P(ret) != IS_NULL)) {
1232-
zend_verify_void_return_error(zf, zend_zval_type_error_name(ret), "");
1232+
zend_verify_void_return_error(zf, zend_zval_type_name(ret), "");
12331233
return 0;
12341234
}
12351235
return 1;
@@ -2361,7 +2361,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
23612361
}
23622362
if (!is_list && type != BP_VAR_IS) {
23632363
zend_error(E_WARNING, "Trying to access array offset on value of type %s",
2364-
zend_zval_type_error_name(container));
2364+
zend_zval_type_name(container));
23652365
}
23662366
ZVAL_NULL(result);
23672367
}
@@ -2560,7 +2560,7 @@ static ZEND_COLD void ZEND_FASTCALL zend_array_key_exists_error(
25602560
}
25612561
if (!EG(exception)) {
25622562
zend_type_error("array_key_exists(): Argument #2 ($array) must be of type array, %s given",
2563-
zend_zval_type_error_name(subject));
2563+
zend_zval_type_name(subject));
25642564
}
25652565
}
25662566

@@ -2946,7 +2946,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1
29462946
zend_string *type1_str = zend_type_to_string(prop1->type);
29472947
zend_string *type2_str = zend_type_to_string(prop2->type);
29482948
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",
2949-
zend_zval_type_error_name(zv),
2949+
zend_zval_type_name(zv),
29502950
ZSTR_VAL(prop1->ce->name),
29512951
zend_get_unmangled_property_name(prop1->name),
29522952
ZSTR_VAL(type1_str),
@@ -2961,7 +2961,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(zend_property_info *prop1
29612961
ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(zend_property_info *prop, zval *zv) {
29622962
zend_string *type_str = zend_type_to_string(prop->type);
29632963
zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s",
2964-
zend_zval_type_error_name(zv),
2964+
zend_zval_type_name(zv),
29652965
ZSTR_VAL(prop->ce->name),
29662966
zend_get_unmangled_property_name(prop->name),
29672967
ZSTR_VAL(type_str)
@@ -2973,7 +2973,7 @@ ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(zend_property_info
29732973
zend_string *type1_str = zend_type_to_string(prop1->type);
29742974
zend_string *type2_str = zend_type_to_string(prop2->type);
29752975
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",
2976-
zend_zval_type_error_name(zv),
2976+
zend_zval_type_name(zv),
29772977
ZSTR_VAL(prop1->ce->name),
29782978
zend_get_unmangled_property_name(prop1->name),
29792979
ZSTR_VAL(type1_str),

‎Zend/zend_operators.c

Lines changed: 4 additions & 4 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_zval_type_error_name(op1), operator, zend_zval_type_error_name(op2));
939+
zend_zval_type_name(op1), operator, zend_zval_type_name(op2));
940940
}
941941
/* }}} */
942942

@@ -1468,7 +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", zend_zval_type_error_name(op1));
1471+
zend_type_error("Cannot perform bitwise not on %s", zend_zval_type_name(op1));
14721472
return FAILURE;
14731473
}
14741474
}
@@ -2375,7 +2375,7 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
23752375
/* break missing intentionally */
23762376
case IS_RESOURCE:
23772377
case IS_ARRAY:
2378-
zend_type_error("Cannot increment %s", zend_zval_type_error_name(op1));
2378+
zend_type_error("Cannot increment %s", zend_zval_type_name(op1));
23792379
return FAILURE;
23802380
EMPTY_SWITCH_DEFAULT_CASE()
23812381
}
@@ -2437,7 +2437,7 @@ ZEND_API int ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
24372437
/* break missing intentionally */
24382438
case IS_RESOURCE:
24392439
case IS_ARRAY:
2440-
zend_type_error("Cannot decrement %s", zend_zval_type_error_name(op1));
2440+
zend_type_error("Cannot decrement %s", zend_zval_type_name(op1));
24412441
return FAILURE;
24422442
EMPTY_SWITCH_DEFAULT_CASE()
24432443
}

‎Zend/zend_vm_def.h

Lines changed: 8 additions & 8 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_zval_type_error_name(function_name));
3698+
zend_zval_type_name(function_name));
36993699
call = NULL;
37003700
}
37013701

@@ -4932,7 +4932,7 @@ ZEND_VM_HANDLER(119, ZEND_SEND_ARRAY, ANY, ANY, NUM)
49324932
ZEND_VM_C_GOTO(send_array);
49334933
}
49344934
}
4935-
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_zval_type_error_name(args));
4935+
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_zval_type_name(args));
49364936
FREE_UNFETCHED_OP2();
49374937
FREE_OP1();
49384938
HANDLE_EXCEPTION();
@@ -6186,7 +6186,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET_R, CONST|TMP|VAR|CV, JMP_ADDR)
61866186
}
61876187
}
61886188
} else {
6189-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_error_name(array_ptr));
6189+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
61906190
ZVAL_UNDEF(EX_VAR(opline->result.var));
61916191
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
61926192
FREE_OP1();
@@ -6275,7 +6275,7 @@ ZEND_VM_COLD_CONST_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, JMP_ADDR)
62756275
}
62766276
}
62776277
} else {
6278-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_error_name(array_ptr));
6278+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
62796279
ZVAL_UNDEF(EX_VAR(opline->result.var));
62806280
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
62816281
if (OP1_TYPE == IS_VAR) {
@@ -6585,7 +6585,7 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY, JMP_ADDR)
65856585
value_type = Z_TYPE_INFO_P(value);
65866586
}
65876587
} else {
6588-
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_error_name(array));
6588+
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array));
65896589
if (UNEXPECTED(EG(exception))) {
65906590
UNDEF_RESULT();
65916591
HANDLE_EXCEPTION();
@@ -7915,7 +7915,7 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY)
79157915
zval_ptr_dtor(&tmp);
79167916
}
79177917
if (!EG(exception)) {
7918-
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_error_name(value));
7918+
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
79197919
}
79207920
ZVAL_UNDEF(EX_VAR(opline->result.var));
79217921
} while (0);
@@ -8010,7 +8010,7 @@ ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, CV|TMPVAR|UNUSED|CLASS_FETCH, ANY)
80108010
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
80118011
ZVAL_DEREF(op);
80128012
if (Z_TYPE_P(op) != IS_OBJECT) {
8013-
zend_type_error("Cannot use ::class on value of type %s", zend_zval_type_error_name(op));
8013+
zend_type_error("Cannot use ::class on value of type %s", zend_zval_type_name(op));
80148014
ZVAL_UNDEF(EX_VAR(opline->result.var));
80158015
FREE_OP1();
80168016
HANDLE_EXCEPTION();
@@ -8522,7 +8522,7 @@ ZEND_VM_COLD_CONST_HANDLER(191, ZEND_GET_CLASS, UNUSED|CONST|TMPVAR|CV, UNUSED)
85228522
if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
85238523
ZVAL_UNDEFINED_OP1();
85248524
}
8525-
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_error_name(op1));
8525+
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
85268526
ZVAL_UNDEF(EX_VAR(opline->result.var));
85278527
}
85288528
break;

0 commit comments

Comments
 (0)