Skip to content

Commit 72e1525

Browse files
kocsismatekocsismate
committed
Cleanup argument handling in ext/reflection
1 parent 8c89f23 commit 72e1525

19 files changed

+310
-250
lines changed

‎Zend/zend_API.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,12 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_error(int error_code,
234234
case ZPP_ERROR_WRONG_STRING_OR_CLASS_OR_NULL:
235235
zend_wrong_parameter_string_or_class_or_null_error(num, name, arg);
236236
break;
237+
case ZPP_ERROR_WRONG_CLASS_NAME_OR_CLASS:
238+
zend_wrong_parameter_class_name_or_class_error(num, name, arg);
239+
break;
240+
case ZPP_ERROR_WRONG_CLASS_NAME_OR_CLASS_OR_NULL:
241+
zend_wrong_parameter_class_name_or_class_or_null_error(num, name, arg);
242+
break;
237243
default:
238244
ZEND_ASSERT(error_code != ZPP_ERROR_OK);
239245
}
@@ -295,6 +301,26 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_string_or_class_or_nu
295301
}
296302
/* }}} */
297303

304+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_name_or_class_error(uint32_t num, const char *name, zval *arg) /* {{{ */
305+
{
306+
if (EG(exception)) {
307+
return;
308+
}
309+
310+
zend_argument_type_error(num, "must be a valid class name or an object of type %s, %s given", name, zend_zval_type_name(arg));
311+
}
312+
/* }}} */
313+
314+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_name_or_class_or_null_error(uint32_t num, const char *name, zval *arg) /* {{{ */
315+
{
316+
if (EG(exception)) {
317+
return;
318+
}
319+
320+
zend_argument_type_error(num, "must be either a valid class name, or an object of type %s, or null, %s given", name, zend_zval_type_name(arg));
321+
}
322+
/* }}} */
323+
298324
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(uint32_t num, char *error) /* {{{ */
299325
{
300326
if (EG(exception)) {

‎Zend/zend_API.h

Lines changed: 72 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,22 +1235,26 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_error(int error_code,
12351235
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(uint32_t num, zend_expected_type expected_type, zval *arg);
12361236
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(uint32_t num, const char *name, zval *arg);
12371237
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_null_error(uint32_t num, const char *name, zval *arg);
1238+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_name_or_class_error(uint32_t num, const char *name, zval *arg);
1239+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_name_or_class_or_null_error(uint32_t num, const char *name, zval *arg);
12381240
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_string_or_class_error(uint32_t num, const char *name, zval *arg);
12391241
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_string_or_class_or_null_error(uint32_t num, const char *name, zval *arg);
12401242
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(uint32_t num, char *error);
12411243
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);
12421244
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_type_error(uint32_t arg_num, const char *format, ...);
12431245
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num, const char *format, ...);
12441246

1245-
#define ZPP_ERROR_OK 0
1246-
#define ZPP_ERROR_FAILURE 1
1247-
#define ZPP_ERROR_WRONG_CALLBACK 2
1248-
#define ZPP_ERROR_WRONG_CLASS 3
1249-
#define ZPP_ERROR_WRONG_CLASS_OR_NULL 4
1250-
#define ZPP_ERROR_WRONG_ARG 5
1251-
#define ZPP_ERROR_WRONG_COUNT 6
1252-
#define ZPP_ERROR_WRONG_STRING_OR_CLASS 7
1253-
#define ZPP_ERROR_WRONG_STRING_OR_CLASS_OR_NULL 8
1247+
#define ZPP_ERROR_OK 0
1248+
#define ZPP_ERROR_FAILURE 1
1249+
#define ZPP_ERROR_WRONG_CALLBACK 2
1250+
#define ZPP_ERROR_WRONG_CLASS 3
1251+
#define ZPP_ERROR_WRONG_CLASS_OR_NULL 4
1252+
#define ZPP_ERROR_WRONG_ARG 5
1253+
#define ZPP_ERROR_WRONG_COUNT 6
1254+
#define ZPP_ERROR_WRONG_STRING_OR_CLASS 7
1255+
#define ZPP_ERROR_WRONG_STRING_OR_CLASS_OR_NULL 8
1256+
#define ZPP_ERROR_WRONG_CLASS_NAME_OR_CLASS 9
1257+
#define ZPP_ERROR_WRONG_CLASS_NAME_OR_CLASS_OR_NULL 10
12541258

12551259
#define ZEND_PARSE_PARAMETERS_START_EX(flags, min_num_args, max_num_args) do { \
12561260
const int _flags = (flags); \
@@ -1407,6 +1411,40 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num
14071411
#define Z_PARAM_CLASS_NAME_OR_OBJ_OR_NULL(dest) \
14081412
Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest, 1);
14091413

1414+
#define Z_PARAM_CLASS_NAME_CE_OR_OBJ_EX(dest_ce, dest_obj, allow_null) \
1415+
Z_PARAM_PROLOGUE(0, 0); \
1416+
if (UNEXPECTED(!zend_parse_arg_class_name_ce_or_obj(_arg, &dest_ce, &dest_obj, NULL, allow_null))) { \
1417+
_expected_type = allow_null ? Z_EXPECTED_CLASS_NAME_OR_OBJECT_OR_NULL : Z_EXPECTED_CLASS_NAME_OR_OBJECT; \
1418+
_error_code = ZPP_ERROR_WRONG_ARG; \
1419+
break; \
1420+
}
1421+
1422+
#define Z_PARAM_CLASS_NAME_CE_OR_OBJ(dest_ce, dest_obj) \
1423+
Z_PARAM_CLASS_NAME_CE_OR_OBJ_EX(dest_ce, dest_obj, 0);
1424+
1425+
#define Z_PARAM_CLASS_NAME_CE_OR_OBJ_OR_NULL(dest_ce, dest_obj) \
1426+
Z_PARAM_CLASS_NAME_CE_OR_OBJ_EX(dest_ce, dest_obj, 1);
1427+
1428+
#define Z_PARAM_CLASS_NAME_CE_OR_OBJ_OF_CLASS_EX(dest_ce, dest_obj, base_ce, allow_null) \
1429+
Z_PARAM_PROLOGUE(0, 0); \
1430+
if (UNEXPECTED(!zend_parse_arg_class_name_ce_or_obj(_arg, &dest_ce, &dest_obj, base_ce, allow_null))) { \
1431+
if (base_ce) { \
1432+
_error = ZSTR_VAL((base_ce)->name); \
1433+
_error_code = allow_null ? ZPP_ERROR_WRONG_CLASS_NAME_OR_CLASS_OR_NULL : ZPP_ERROR_WRONG_CLASS_NAME_OR_CLASS; \
1434+
break; \
1435+
} else { \
1436+
_expected_type = allow_null ? Z_EXPECTED_CLASS_NAME_OR_OBJECT_OR_NULL : Z_EXPECTED_CLASS_NAME_OR_OBJECT_OR_NULL; \
1437+
_error_code = ZPP_ERROR_WRONG_ARG; \
1438+
break; \
1439+
} \
1440+
}
1441+
1442+
#define Z_PARAM_CLASS_NAME_CE_OR_OBJ_OF_CLASS(dest_ce, dest_obj, base_ce) \
1443+
Z_PARAM_CLASS_NAME_CE_OR_OBJ_OF_CLASS_EX(dest_ce, dest_obj, base_ce, 0);
1444+
1445+
#define Z_PARAM_CLASS_NAME_CE_OR_OBJ_OF_CLASS_OR_NULL(dest_ce, dest_obj, base_ce) \
1446+
Z_PARAM_CLASS_NAME_CE_OR_OBJ_OF_CLASS_EX(dest_ce, dest_obj, base_ce, 1);
1447+
14101448
#define Z_PARAM_STR_OR_OBJ_EX(destination_string, destination_object, allow_null) \
14111449
Z_PARAM_PROLOGUE(0, 0); \
14121450
if (UNEXPECTED(!zend_parse_arg_str_or_obj(_arg, &destination_string, &destination_object, NULL, allow_null))) { \
@@ -2002,6 +2040,31 @@ static zend_always_inline int zend_parse_arg_class_name_or_obj(
20022040
return 1;
20032041
}
20042042

2043+
static zend_always_inline int zend_parse_arg_class_name_ce_or_obj(
2044+
zval *arg, zend_class_entry **destination_ce, zend_object **destination_object, zend_class_entry *base_ce, int allow_null
2045+
) {
2046+
if (EXPECTED(Z_TYPE_P(arg) == IS_OBJECT)) {
2047+
if (base_ce && UNEXPECTED(!instanceof_function(Z_OBJCE_P(arg), base_ce))) {
2048+
return 0;
2049+
}
2050+
2051+
*destination_object = Z_OBJ_P(arg);
2052+
*destination_ce = NULL;
2053+
} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
2054+
*destination_object = NULL;
2055+
*destination_ce = zend_lookup_class(Z_STR_P(arg));
2056+
2057+
return *destination_ce != NULL;
2058+
} else if (allow_null && EXPECTED(Z_TYPE_P(arg) == IS_NULL)) {
2059+
*destination_ce = NULL;
2060+
*destination_object = NULL;
2061+
} else {
2062+
return 0;
2063+
}
2064+
2065+
return 1;
2066+
}
2067+
20052068
static zend_always_inline int zend_parse_arg_str_or_obj(
20062069
zval *arg, zend_string **destination_string, zend_object **destination_object, zend_class_entry *base_ce, int allow_null
20072070
) {

‎Zend/zend_closures.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,13 @@ ZEND_API const zend_function *zend_get_closure_method_def(zval *obj) /* {{{ */
401401
}
402402
/* }}} */
403403

404+
ZEND_API const zend_function *zend_get_closure_method_def_from_obj(zend_object *obj) /* {{{ */
405+
{
406+
zend_closure *closure = (zend_closure *) obj;
407+
return &closure->func;
408+
}
409+
/* }}} */
410+
404411
ZEND_API zval* zend_get_closure_this_ptr(zval *obj) /* {{{ */
405412
{
406413
zend_closure *closure = (zend_closure *)Z_OBJ_P(obj);

‎Zend/zend_closures.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ ZEND_API void zend_create_closure(zval *res, zend_function *op_array, zend_class
3636
ZEND_API void zend_create_fake_closure(zval *res, zend_function *op_array, zend_class_entry *scope, zend_class_entry *called_scope, zval *this_ptr);
3737
ZEND_API zend_function *zend_get_closure_invoke_method(zend_object *obj);
3838
ZEND_API const zend_function *zend_get_closure_method_def(zval *obj);
39+
ZEND_API const zend_function *zend_get_closure_method_def_from_obj(zend_object *obj);
3940
ZEND_API zval* zend_get_closure_this_ptr(zval *obj);
4041

4142
END_EXTERN_C()

0 commit comments

Comments
 (0)