diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-09-11 00:23:54 +0200 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-09-11 11:00:18 +0200 |
| commit | c98d47696f5e459e6a3efdfd7034357208284b84 (patch) | |
| tree | 40800320921080cbb90cd28a2178eae0a0c7823e /ext/reflection | |
| parent | a59923befde4969eb619e90ed618a8eb89dcdef7 (diff) | |
| download | php-git-c98d47696f5e459e6a3efdfd7034357208284b84.tar.gz | |
Consolidate new union type ZPP macro names
They will now follow the canonical order of types. Older macros are
left intact due to maintaining BC.
Closes GH-6112
Diffstat (limited to 'ext/reflection')
| -rw-r--r-- | ext/reflection/php_reflection.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index e8938157c0..403c91c3e4 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1496,7 +1496,7 @@ ZEND_METHOD(ReflectionFunction, __construct) intern = Z_REFLECTION_P(object); ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ_OF_CLASS(fname, closure_obj, zend_ce_closure) + Z_PARAM_OBJ_OF_CLASS_OR_STR(closure_obj, zend_ce_closure, fname) ZEND_PARSE_PARAMETERS_END(); if (closure_obj) { @@ -2992,7 +2992,7 @@ ZEND_METHOD(ReflectionMethod, __construct) zend_function *mptr; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR_OR_OBJ(arg1_str, arg1_obj) + Z_PARAM_OBJ_OR_STR(arg1_obj, arg1_str) Z_PARAM_OPTIONAL Z_PARAM_STR_OR_NULL(arg2_str) ZEND_PARSE_PARAMETERS_END(); @@ -3513,7 +3513,7 @@ ZEND_METHOD(ReflectionClassConstant, __construct) zend_class_constant *constant = NULL; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_STR_OR_OBJ(classname_str, classname_obj) + Z_PARAM_OBJ_OR_STR(classname_obj, classname_str) Z_PARAM_STR(constname) ZEND_PARSE_PARAMETERS_END(); @@ -3698,7 +3698,7 @@ static void reflection_class_object_ctor(INTERNAL_FUNCTION_PARAMETERS, int is_ob ZEND_PARSE_PARAMETERS_END(); } else { ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ(arg_class, arg_obj) + Z_PARAM_OBJ_OR_STR(arg_obj, arg_class) ZEND_PARSE_PARAMETERS_END(); } @@ -4922,7 +4922,7 @@ ZEND_METHOD(ReflectionClass, isSubclassOf) zend_object *class_obj; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ_OF_CLASS(class_str, class_obj, reflection_class_ptr) + Z_PARAM_OBJ_OF_CLASS_OR_STR(class_obj, reflection_class_ptr, class_str) ZEND_PARSE_PARAMETERS_END(); if (class_obj) { @@ -4955,7 +4955,7 @@ ZEND_METHOD(ReflectionClass, implementsInterface) zend_object *interface_obj; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ_OF_CLASS(interface_str, interface_obj, reflection_class_ptr) + Z_PARAM_OBJ_OF_CLASS_OR_STR(interface_obj, reflection_class_ptr, interface_str) ZEND_PARSE_PARAMETERS_END(); if (interface_obj) { @@ -5124,7 +5124,7 @@ ZEND_METHOD(ReflectionProperty, __construct) property_reference *reference; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_STR_OR_OBJ(classname_str, classname_obj) + Z_PARAM_OBJ_OR_STR(classname_obj, classname_str) Z_PARAM_STR(name) ZEND_PARSE_PARAMETERS_END(); |