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 | |
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
31 files changed, 206 insertions, 206 deletions
diff --git a/Zend/tests/010.phpt b/Zend/tests/010.phpt index 8c8970fa17..467c7d9efc 100644 --- a/Zend/tests/010.phpt +++ b/Zend/tests/010.phpt @@ -75,10 +75,10 @@ bool(false) string(3) "foo" bool(false) bool(false) -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given bool(false) -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, array given -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, array given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Done diff --git a/Zend/tests/str_or_obj_of_class_zpp.phpt b/Zend/tests/str_or_obj_of_class_zpp.phpt index 3f32ea9a8a..b8f5d8492f 100644 --- a/Zend/tests/str_or_obj_of_class_zpp.phpt +++ b/Zend/tests/str_or_obj_of_class_zpp.phpt @@ -1,5 +1,5 @@ --TEST-- -Test Z_PARAM_STR_OR_OBJ_OF_CLASS() and Z_PARAM_STR_OR_OBJ_OF_CLASS_OR_NULL +Test Z_PARAM_OBJ_OF_CLASS_OR_STR() and Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL --SKIPIF-- <?php if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded'); diff --git a/Zend/tests/str_or_obj_zpp.phpt b/Zend/tests/str_or_obj_zpp.phpt index 386558e02a..301abd8ddc 100644 --- a/Zend/tests/str_or_obj_zpp.phpt +++ b/Zend/tests/str_or_obj_zpp.phpt @@ -1,5 +1,5 @@ --TEST-- -Test Z_PARAM_STR_OR_OBJ() and Z_PARAM_STR_OR_OBJ_OR_NULL +Test Z_PARAM_OBJ_OR_STR() and Z_PARAM_OBJ_OR_STR_OR_NULL --SKIPIF-- <?php if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded'); diff --git a/Zend/zend_API.c b/Zend/zend_API.c index beaae81323..14abdd1a38 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -224,11 +224,11 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_error(int error_code, case ZPP_ERROR_WRONG_ARG: zend_wrong_parameter_type_error(num, expected_type, arg); break; - case ZPP_ERROR_WRONG_STRING_OR_CLASS: - zend_wrong_parameter_string_or_class_error(num, name, arg); + case ZPP_ERROR_WRONG_CLASS_OR_STRING: + zend_wrong_parameter_class_or_string_error(num, name, arg); break; - case ZPP_ERROR_WRONG_STRING_OR_CLASS_OR_NULL: - zend_wrong_parameter_string_or_class_or_null_error(num, name, arg); + case ZPP_ERROR_WRONG_CLASS_OR_STRING_OR_NULL: + zend_wrong_parameter_class_or_string_or_null_error(num, name, arg); break; case ZPP_ERROR_UNEXPECTED_EXTRA_NAMED: zend_unexpected_extra_named_error(); @@ -280,7 +280,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_null_error(u } /* }}} */ -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_string_or_class_error(uint32_t num, const char *name, zval *arg) /* {{{ */ +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_string_error(uint32_t num, const char *name, zval *arg) /* {{{ */ { if (EG(exception)) { return; @@ -290,7 +290,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_string_or_class_error } /* }}} */ -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_string_or_class_or_null_error(uint32_t num, const char *name, zval *arg) /* {{{ */ +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_string_or_null_error(uint32_t num, const char *name, zval *arg) /* {{{ */ { if (EG(exception)) { return; diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 9bb8957e8e..c4743e775d 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -1223,14 +1223,14 @@ static zend_always_inline zval *zend_try_array_init(zval *zv) _(Z_EXPECTED_DOUBLE_OR_NULL, "of type ?float") \ _(Z_EXPECTED_NUMBER, "of type int|float") \ _(Z_EXPECTED_NUMBER_OR_NULL, "of type int|float|null") \ - _(Z_EXPECTED_STRING_OR_ARRAY, "of type array|string") \ - _(Z_EXPECTED_STRING_OR_ARRAY_OR_NULL, "of type array|string|null") \ + _(Z_EXPECTED_ARRAY_OR_STRING, "of type array|string") \ + _(Z_EXPECTED_ARRAY_OR_STRING_OR_NULL, "of type array|string|null") \ _(Z_EXPECTED_STRING_OR_LONG, "of type string|int") \ _(Z_EXPECTED_STRING_OR_LONG_OR_NULL, "of type string|int|null") \ - _(Z_EXPECTED_CLASS_NAME_OR_OBJECT, "a valid class name or object") \ - _(Z_EXPECTED_CLASS_NAME_OR_OBJECT_OR_NULL, "a valid class name, object, or null") \ - _(Z_EXPECTED_STRING_OR_OBJECT, "of type object|string") \ - _(Z_EXPECTED_STRING_OR_OBJECT_OR_NULL, "of type object|string|null") \ + _(Z_EXPECTED_OBJECT_OR_CLASS_NAME, "an object or a valid class name") \ + _(Z_EXPECTED_OBJECT_OR_CLASS_NAME_OR_NULL, "an object, a valid class name, or null") \ + _(Z_EXPECTED_OBJECT_OR_STRING, "of type object|string") \ + _(Z_EXPECTED_OBJECT_OR_STRING_OR_NULL, "of type object|string|null") \ #define Z_EXPECTED_TYPE @@ -1248,8 +1248,8 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_error(int error_code, ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(uint32_t num, zend_expected_type expected_type, zval *arg); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(uint32_t num, const char *name, zval *arg); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_null_error(uint32_t num, const char *name, zval *arg); -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_string_or_class_error(uint32_t num, const char *name, zval *arg); -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_string_or_class_or_null_error(uint32_t num, const char *name, zval *arg); +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_string_error(uint32_t num, const char *name, zval *arg); +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_string_or_null_error(uint32_t num, const char *name, zval *arg); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(uint32_t num, char *error); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_unexpected_extra_named_error(void); ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...); @@ -1263,8 +1263,8 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char * #define ZPP_ERROR_WRONG_CLASS_OR_NULL 4 #define ZPP_ERROR_WRONG_ARG 5 #define ZPP_ERROR_WRONG_COUNT 6 -#define ZPP_ERROR_WRONG_STRING_OR_CLASS 7 -#define ZPP_ERROR_WRONG_STRING_OR_CLASS_OR_NULL 8 +#define ZPP_ERROR_WRONG_CLASS_OR_STRING 7 +#define ZPP_ERROR_WRONG_CLASS_OR_STRING_OR_NULL 8 #define ZPP_ERROR_UNEXPECTED_EXTRA_NAMED 9 #define ZEND_PARSE_PARAMETERS_START_EX(flags, min_num_args, max_num_args) do { \ @@ -1424,53 +1424,53 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char * #define Z_PARAM_CLASS_OR_NULL(dest) \ Z_PARAM_CLASS_EX(dest, 1, 0) -#define Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest, allow_null) \ +#define Z_PARAM_OBJ_OR_CLASS_NAME_EX(dest, allow_null) \ Z_PARAM_PROLOGUE(0, 0); \ - if (UNEXPECTED(!zend_parse_arg_class_name_or_obj(_arg, &dest, allow_null))) { \ - _expected_type = allow_null ? Z_EXPECTED_CLASS_NAME_OR_OBJECT_OR_NULL : Z_EXPECTED_CLASS_NAME_OR_OBJECT; \ + if (UNEXPECTED(!zend_parse_arg_obj_or_class_name(_arg, &dest, allow_null))) { \ + _expected_type = allow_null ? Z_EXPECTED_OBJECT_OR_CLASS_NAME_OR_NULL : Z_EXPECTED_OBJECT_OR_CLASS_NAME; \ _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } -#define Z_PARAM_CLASS_NAME_OR_OBJ(dest) \ - Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest, 0); +#define Z_PARAM_OBJ_OR_CLASS_NAME(dest) \ + Z_PARAM_OBJ_OR_CLASS_NAME_EX(dest, 0); -#define Z_PARAM_CLASS_NAME_OR_OBJ_OR_NULL(dest) \ - Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest, 1); +#define Z_PARAM_OBJ_OR_CLASS_NAME_OR_NULL(dest) \ + Z_PARAM_OBJ_OR_CLASS_NAME_EX(dest, 1); -#define Z_PARAM_STR_OR_OBJ_EX(destination_string, destination_object, allow_null) \ +#define Z_PARAM_OBJ_OR_STR_EX(destination_object, destination_string, allow_null) \ Z_PARAM_PROLOGUE(0, 0); \ - if (UNEXPECTED(!zend_parse_arg_str_or_obj(_arg, &destination_string, &destination_object, NULL, allow_null))) { \ - _expected_type = allow_null ? Z_EXPECTED_STRING_OR_OBJECT_OR_NULL : Z_EXPECTED_STRING_OR_OBJECT; \ + if (UNEXPECTED(!zend_parse_arg_obj_or_str(_arg, &destination_object, NULL, &destination_string, allow_null))) { \ + _expected_type = allow_null ? Z_EXPECTED_OBJECT_OR_STRING_OR_NULL : Z_EXPECTED_OBJECT_OR_STRING; \ _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } -#define Z_PARAM_STR_OR_OBJ(destination_string, destination_object) \ - Z_PARAM_STR_OR_OBJ_EX(destination_string, destination_object, 0); +#define Z_PARAM_OBJ_OR_STR(destination_object, destination_string) \ + Z_PARAM_OBJ_OR_STR_EX(destination_object, destination_string, 0); -#define Z_PARAM_STR_OR_OBJ_OR_NULL(destination_string, destination_object) \ - Z_PARAM_STR_OR_OBJ_EX(destination_string, destination_object, 1); +#define Z_PARAM_OBJ_OR_STR_OR_NULL(destination_object, destination_string) \ + Z_PARAM_OBJ_OR_STR_EX(destination_object, destination_string, 1); -#define Z_PARAM_STR_OR_OBJ_OF_CLASS_EX(destination_string, destination_object, base_ce, allow_null) \ +#define Z_PARAM_OBJ_OF_CLASS_OR_STR_EX(destination_object, base_ce, destination_string, allow_null) \ Z_PARAM_PROLOGUE(0, 0); \ - if (UNEXPECTED(!zend_parse_arg_str_or_obj(_arg, &destination_string, &destination_object, base_ce, allow_null))) { \ + if (UNEXPECTED(!zend_parse_arg_obj_or_str(_arg, &destination_object, base_ce, &destination_string, allow_null))) { \ if (base_ce) { \ _error = ZSTR_VAL((base_ce)->name); \ - _error_code = allow_null ? ZPP_ERROR_WRONG_STRING_OR_CLASS_OR_NULL : ZPP_ERROR_WRONG_STRING_OR_CLASS; \ + _error_code = allow_null ? ZPP_ERROR_WRONG_CLASS_OR_STRING_OR_NULL : ZPP_ERROR_WRONG_CLASS_OR_STRING; \ break; \ } else { \ - _expected_type = allow_null ? Z_EXPECTED_STRING_OR_OBJECT_OR_NULL : Z_EXPECTED_STRING_OR_OBJECT; \ + _expected_type = allow_null ? Z_EXPECTED_OBJECT_OR_STRING_OR_NULL : Z_EXPECTED_OBJECT_OR_STRING; \ _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } \ } -#define Z_PARAM_STR_OR_OBJ_OF_CLASS(destination_string, destination_object, base_ce) \ - Z_PARAM_STR_OR_OBJ_OF_CLASS_EX(destination_string, destination_object, base_ce, 0); +#define Z_PARAM_OBJ_OF_CLASS_OR_STR(destination_object, base_ce, destination_string) \ + Z_PARAM_OBJ_OF_CLASS_OR_STR_EX(destination_object, base_ce, destination_string, 0); -#define Z_PARAM_STR_OR_OBJ_OF_CLASS_OR_NULL(destination_string, destination_object, base_ce) \ - Z_PARAM_STR_OR_OBJ_OF_CLASS_EX(destination_string, destination_object, base_ce, 1); +#define Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL(destination_object, base_ce, destination_string) \ + Z_PARAM_OBJ_OF_CLASS_OR_STR_EX(destination_object, base_ce, destination_string, 1); /* old "d" */ #define Z_PARAM_DOUBLE_EX2(dest, is_null, check_null, deref, separate) \ @@ -1779,19 +1779,19 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char * } \ } while (0); -#define Z_PARAM_STR_OR_ARRAY_HT_EX(dest_str, dest_ht, allow_null) \ +#define Z_PARAM_ARRAY_HT_OR_STR_EX(dest_ht, dest_str, allow_null) \ Z_PARAM_PROLOGUE(0, 0); \ - if (UNEXPECTED(!zend_parse_arg_str_or_array_ht(_arg, &dest_str, &dest_ht, allow_null))) { \ - _expected_type = allow_null ? Z_EXPECTED_STRING_OR_ARRAY_OR_NULL : Z_EXPECTED_STRING_OR_ARRAY; \ + if (UNEXPECTED(!zend_parse_arg_array_ht_or_str(_arg, &dest_ht, &dest_str, allow_null))) { \ + _expected_type = allow_null ? Z_EXPECTED_ARRAY_OR_STRING_OR_NULL : Z_EXPECTED_ARRAY_OR_STRING; \ _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } -#define Z_PARAM_STR_OR_ARRAY_HT(dest_str, dest_ht) \ - Z_PARAM_STR_OR_ARRAY_HT_EX(dest_str, dest_ht, 0); +#define Z_PARAM_ARRAY_HT_OR_STR(dest_ht, dest_str) \ + Z_PARAM_ARRAY_HT_OR_STR_EX(dest_ht, dest_str, 0); -#define Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(dest_str, dest_ht) \ - Z_PARAM_STR_OR_ARRAY_HT_EX(dest_str, dest_ht, 1); +#define Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(dest_ht, dest_str) \ + Z_PARAM_ARRAY_HT_OR_STR_EX(dest_ht, dest_str, 1); #define Z_PARAM_STR_OR_LONG_EX(dest_str, dest_long, is_null, allow_null) \ Z_PARAM_PROLOGUE(0, 0); \ @@ -2058,12 +2058,12 @@ static zend_always_inline void zend_parse_arg_zval_deref(zval *arg, zval **dest, *dest = (check_null && UNEXPECTED(Z_TYPE_P(arg) == IS_NULL)) ? NULL : arg; } -static zend_always_inline bool zend_parse_arg_str_or_array_ht( - zval *arg, zend_string **dest_str, HashTable **dest_ht, bool allow_null) +static zend_always_inline bool zend_parse_arg_array_ht_or_str( + zval *arg, HashTable **dest_ht, zend_string **dest_str, bool allow_null) { if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) { - *dest_str = Z_STR_P(arg); *dest_ht = NULL; + *dest_str = Z_STR_P(arg); } else if (EXPECTED(Z_TYPE_P(arg) == IS_ARRAY)) { *dest_ht = Z_ARRVAL_P(arg); *dest_str = NULL; @@ -2097,7 +2097,7 @@ static zend_always_inline bool zend_parse_arg_str_or_long(zval *arg, zend_string return 1; } -static zend_always_inline bool zend_parse_arg_class_name_or_obj( +static zend_always_inline bool zend_parse_arg_obj_or_class_name( zval *arg, zend_class_entry **destination, bool allow_null ) { if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) { @@ -2115,13 +2115,13 @@ static zend_always_inline bool zend_parse_arg_class_name_or_obj( return 1; } -static zend_always_inline bool zend_parse_arg_str_or_obj( - zval *arg, zend_string **destination_string, zend_object **destination_object, zend_class_entry *base_ce, bool allow_null +static zend_always_inline bool zend_parse_arg_obj_or_str( + zval *arg, zend_object **destination_object, zend_class_entry *base_ce, zend_string **destination_string, bool allow_null ) { if (EXPECTED(Z_TYPE_P(arg) == IS_OBJECT)) { if (!base_ce || EXPECTED(instanceof_function(Z_OBJCE_P(arg), base_ce))) { - *destination_string = NULL; *destination_object = Z_OBJ_P(arg); + *destination_string = NULL; return 1; } } diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index c3a2a1b63f..fbc7d13329 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -616,7 +616,7 @@ ZEND_FUNCTION(get_parent_class) ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_CLASS_NAME_OR_OBJ(ce) + Z_PARAM_OBJ_OR_CLASS_NAME(ce) ZEND_PARSE_PARAMETERS_END(); if (!ce) { @@ -892,7 +892,7 @@ ZEND_FUNCTION(get_class_methods) zend_function *mptr; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_CLASS_NAME_OR_OBJ(ce) + Z_PARAM_OBJ_OR_CLASS_NAME(ce) ZEND_PARSE_PARAMETERS_END(); array_init(return_value); diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c index ef8d99567f..45080ba395 100644 --- a/ext/com_dotnet/com_com.c +++ b/ext/com_dotnet/com_com.c @@ -54,7 +54,7 @@ PHP_METHOD(com, __construct) ZEND_PARSE_PARAMETERS_START(1, 4) Z_PARAM_STRING(module_name, module_name_len) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(server_name, server_params) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(server_params, server_name) Z_PARAM_LONG(cp) Z_PARAM_STRING(typelib_name, typelib_name_len) ZEND_PARSE_PARAMETERS_END(); @@ -695,7 +695,7 @@ PHP_FUNCTION(com_event_sink) Z_PARAM_OBJECT_OF_CLASS(object, php_com_variant_class_entry) Z_PARAM_OBJECT(sinkobject) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(sink_str, sink_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(sink_ht, sink_str) ZEND_PARSE_PARAMETERS_END(); RETVAL_FALSE; diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index 06f52bb87f..cc3cbf8433 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -500,7 +500,7 @@ PHP_METHOD(DOMXPath, registerPhpFunctions) ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(name, ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(ht, name) ZEND_PARSE_PARAMETERS_END(); if (ht) { diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index 3196dd09cc..b24850dfa0 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -3601,7 +3601,7 @@ ZEND_METHOD(FFI, new) /* {{{ */ ZEND_FFI_VALIDATE_API_RESTRICTION(); ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_STR_OR_OBJ_OF_CLASS(type_def, type_obj, zend_ffi_ctype_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(type_obj, zend_ffi_ctype_ce, type_def) Z_PARAM_OPTIONAL Z_PARAM_BOOL(owned) Z_PARAM_BOOL(persistent) @@ -3752,7 +3752,7 @@ ZEND_METHOD(FFI, cast) /* {{{ */ ZEND_FFI_VALIDATE_API_RESTRICTION(); ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_STR_OR_OBJ_OF_CLASS(type_def, ztype, zend_ffi_ctype_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(ztype, zend_ffi_ctype_ce, type_def) Z_PARAM_ZVAL(zv) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp index ed27551d66..bcef9cf3b9 100644 --- a/ext/intl/calendar/calendar_methods.cpp +++ b/ext/intl/calendar/calendar_methods.cpp @@ -953,7 +953,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time) intl_error_reset(NULL); ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR_OR_OBJ_OF_CLASS(date_str, date_obj, php_date_get_date_ce()) + Z_PARAM_OBJ_OF_CLASS_OR_STR(date_obj, php_date_get_date_ce(), date_str) Z_PARAM_OPTIONAL Z_PARAM_STRING_OR_NULL(locale_str, locale_str_len) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c index 1a0e2bfffc..af770ed72f 100644 --- a/ext/intl/transliterator/transliterator_methods.c +++ b/ext/intl/transliterator/transliterator_methods.c @@ -287,7 +287,7 @@ PHP_FUNCTION( transliterator_transliterate ) zend_object *arg1_obj; ZEND_PARSE_PARAMETERS_START(2, 4) - Z_PARAM_STR_OR_OBJ_OF_CLASS(arg1_str, arg1_obj, Transliterator_ce_ptr) + Z_PARAM_OBJ_OF_CLASS_OR_STR(arg1_obj, Transliterator_ce_ptr, arg1_str) Z_PARAM_STRING(str, str_len) Z_PARAM_OPTIONAL Z_PARAM_LONG(start) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index b5031eaaab..03926e5a07 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1438,8 +1438,8 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) ZEND_PARSE_PARAMETERS_START(3, 9) Z_PARAM_ZVAL(link) - Z_PARAM_STR_OR_ARRAY_HT(base_dn_str, base_dn_ht) - Z_PARAM_STR_OR_ARRAY_HT(filter_str, filter_ht) + Z_PARAM_ARRAY_HT_OR_STR(base_dn_ht, base_dn_str) + Z_PARAM_ARRAY_HT_OR_STR(filter_ht, filter_str) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_EX(attrs, 0, 1) Z_PARAM_LONG(attrsonly) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 9c3b97b3ee..1189270bec 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1357,7 +1357,7 @@ PHP_FUNCTION(mb_detect_order) ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(order_str, order_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(order_ht, order_str) ZEND_PARSE_PARAMETERS_END(); if (!order_str && !order_ht) { @@ -2508,10 +2508,10 @@ PHP_FUNCTION(mb_convert_encoding) zend_bool free_from_encodings; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_STR_OR_ARRAY_HT(input_str, input_ht) + Z_PARAM_ARRAY_HT_OR_STR(input_ht, input_str) Z_PARAM_STR(to_encoding_name) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(from_encodings_str, from_encodings_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(from_encodings_ht, from_encodings_str) ZEND_PARSE_PARAMETERS_END(); const mbfl_encoding *to_encoding = php_mb_get_encoding(to_encoding_name, 2); @@ -2689,7 +2689,7 @@ PHP_FUNCTION(mb_detect_encoding) ZEND_PARSE_PARAMETERS_START(1, 3) Z_PARAM_STRING(str, str_len) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(encoding_str, encoding_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(encoding_ht, encoding_str) Z_PARAM_BOOL(strict) ZEND_PARSE_PARAMETERS_END(); @@ -3063,7 +3063,7 @@ PHP_FUNCTION(mb_convert_variables) ZEND_PARSE_PARAMETERS_START(3, -1) Z_PARAM_STR(to_enc_str) - Z_PARAM_STR_OR_ARRAY_HT(from_enc_str, from_enc_ht) + Z_PARAM_ARRAY_HT_OR_STR(from_enc_ht, from_enc_str) Z_PARAM_VARIADIC('+', args, argc) ZEND_PARSE_PARAMETERS_END(); @@ -3488,7 +3488,7 @@ PHP_FUNCTION(mb_send_mail) Z_PARAM_PATH(subject, subject_len) Z_PARAM_PATH(message, message_len) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(str_headers, headers_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(headers_ht, str_headers) Z_PARAM_PATH_STR_OR_NULL(extra_cmd) ZEND_PARSE_PARAMETERS_END(); @@ -3974,7 +3974,7 @@ PHP_FUNCTION(mb_check_encoding) ZEND_PARSE_PARAMETERS_START(0, 2) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(input_str, input_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(input_ht, input_str) Z_PARAM_STR_OR_NULL(enc) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index cd4eeaa2de..63bd8eb792 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1487,7 +1487,7 @@ PHP_FUNCTION(openssl_x509_export_to_file) size_t filename_len; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_PATH(filename, filename_len) Z_PARAM_OPTIONAL Z_PARAM_BOOL(notext) @@ -1795,7 +1795,7 @@ PHP_FUNCTION(openssl_x509_export) BIO * bio_out; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_ZVAL(zout) Z_PARAM_OPTIONAL Z_PARAM_BOOL(notext) @@ -1875,7 +1875,7 @@ PHP_FUNCTION(openssl_x509_fingerprint) zend_string *fingerprint; ZEND_PARSE_PARAMETERS_START(1, 3) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_OPTIONAL Z_PARAM_STRING(method, method_len) Z_PARAM_BOOL(raw_output) @@ -1909,7 +1909,7 @@ PHP_FUNCTION(openssl_x509_check_private_key) EVP_PKEY * key = NULL; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_ZVAL(zkey) ZEND_PARSE_PARAMETERS_END(); @@ -1943,7 +1943,7 @@ PHP_FUNCTION(openssl_x509_verify) int err = -1; ZEND_PARSE_PARAMETERS_START(2, 2) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_ZVAL(zkey) ZEND_PARSE_PARAMETERS_END(); @@ -2064,7 +2064,7 @@ PHP_FUNCTION(openssl_x509_parse) char buf[256]; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_OPTIONAL Z_PARAM_BOOL(useshortnames) ZEND_PARSE_PARAMETERS_END(); @@ -2310,7 +2310,7 @@ PHP_FUNCTION(openssl_x509_checkpurpose) int ret; ZEND_PARSE_PARAMETERS_START(2, 4) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_LONG(purpose) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_OR_NULL(zcainfo) @@ -2434,7 +2434,7 @@ PHP_FUNCTION(openssl_x509_read) zend_string *cert_str; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) ZEND_PARSE_PARAMETERS_END(); cert = php_openssl_x509_from_param(cert_obj, cert_str); @@ -2546,7 +2546,7 @@ PHP_FUNCTION(openssl_pkcs12_export_to_file) STACK_OF(X509) *ca = NULL; ZEND_PARSE_PARAMETERS_START(4, 5) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_PATH(filename, filename_len) Z_PARAM_ZVAL(zpkey) Z_PARAM_STRING(pass, pass_len) @@ -2645,7 +2645,7 @@ PHP_FUNCTION(openssl_pkcs12_export) STACK_OF(X509) *ca = NULL; ZEND_PARSE_PARAMETERS_START(4, 5) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_ZVAL(zout) Z_PARAM_ZVAL(zpkey) Z_PARAM_STRING(pass, pass_len) @@ -3050,7 +3050,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) BIO * bio_out; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_STR_OR_OBJ_OF_CLASS(csr_str, csr_obj, php_openssl_request_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(csr_obj, php_openssl_request_ce, csr_str) Z_PARAM_PATH(filename, filename_len) Z_PARAM_OPTIONAL Z_PARAM_BOOL(notext) @@ -3102,7 +3102,7 @@ PHP_FUNCTION(openssl_csr_export) BIO * bio_out; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_STR_OR_OBJ_OF_CLASS(csr_str, csr_obj, php_openssl_request_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(csr_obj, php_openssl_request_ce, csr_str) Z_PARAM_ZVAL(zout) Z_PARAM_OPTIONAL Z_PARAM_BOOL(notext) @@ -3160,8 +3160,8 @@ PHP_FUNCTION(openssl_csr_sign) struct php_x509_request req; ZEND_PARSE_PARAMETERS_START(4, 6) - Z_PARAM_STR_OR_OBJ_OF_CLASS(csr_str, csr_obj, php_openssl_request_ce) - Z_PARAM_STR_OR_OBJ_OF_CLASS_OR_NULL(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(csr_obj, php_openssl_request_ce, csr_str) + Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_ZVAL(zpkey) Z_PARAM_LONG(num_days) Z_PARAM_OPTIONAL @@ -3389,7 +3389,7 @@ PHP_FUNCTION(openssl_csr_get_subject) X509_NAME *subject; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR_OR_OBJ_OF_CLASS(csr_str, csr_obj, php_openssl_request_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(csr_obj, php_openssl_request_ce, csr_str) Z_PARAM_OPTIONAL Z_PARAM_BOOL(use_shortnames) ZEND_PARSE_PARAMETERS_END(); @@ -3422,7 +3422,7 @@ PHP_FUNCTION(openssl_csr_get_public_key) EVP_PKEY *tpubkey; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR_OR_OBJ_OF_CLASS(csr_str, csr_obj, php_openssl_request_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(csr_obj, php_openssl_request_ce, csr_str) Z_PARAM_OPTIONAL Z_PARAM_BOOL(use_shortnames) ZEND_PARSE_PARAMETERS_END(); @@ -5231,7 +5231,7 @@ PHP_FUNCTION(openssl_pkcs7_sign) ZEND_PARSE_PARAMETERS_START(5, 7) Z_PARAM_PATH(infilename, infilename_len) Z_PARAM_PATH(outfilename, outfilename_len) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_ZVAL(zprivkey) Z_PARAM_ARRAY_OR_NULL(zheaders) Z_PARAM_OPTIONAL @@ -5902,7 +5902,7 @@ PHP_FUNCTION(openssl_cms_sign) ZEND_PARSE_PARAMETERS_START(5, 8) Z_PARAM_PATH(infilename, infilename_len) Z_PARAM_PATH(outfilename, outfilename_len) - Z_PARAM_STR_OR_OBJ_OF_CLASS(cert_str, cert_obj, php_openssl_certificate_ce) + Z_PARAM_OBJ_OF_CLASS_OR_STR(cert_obj, php_openssl_certificate_ce, cert_str) Z_PARAM_ZVAL(zprivkey) Z_PARAM_ARRAY_OR_NULL(zheaders) Z_PARAM_OPTIONAL diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 99ab36e84f..35285a42dd 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -2285,9 +2285,9 @@ static void preg_replace_common(INTERNAL_FUNCTION_PARAMETERS, bool is_filter) /* Get function parameters and do error-checking. */ ZEND_PARSE_PARAMETERS_START(3, 5) - Z_PARAM_STR_OR_ARRAY_HT(regex_str, regex_ht) - Z_PARAM_STR_OR_ARRAY_HT(replace_str, replace_ht) - Z_PARAM_STR_OR_ARRAY_HT(subject_str, subject_ht) + Z_PARAM_ARRAY_HT_OR_STR(regex_ht, regex_str) + Z_PARAM_ARRAY_HT_OR_STR(replace_ht, replace_str) + Z_PARAM_ARRAY_HT_OR_STR(subject_ht, subject_str) Z_PARAM_OPTIONAL Z_PARAM_LONG(limit) Z_PARAM_ZVAL(zcount) @@ -2377,9 +2377,9 @@ PHP_FUNCTION(preg_replace_callback) /* Get function parameters and do error-checking. */ ZEND_PARSE_PARAMETERS_START(3, 6) - Z_PARAM_STR_OR_ARRAY_HT(regex_str, regex_ht) + Z_PARAM_ARRAY_HT_OR_STR(regex_ht, regex_str) Z_PARAM_FUNC(fci, fcc) - Z_PARAM_STR_OR_ARRAY_HT(subject_str, subject_ht) + Z_PARAM_ARRAY_HT_OR_STR(subject_ht, subject_str) Z_PARAM_OPTIONAL Z_PARAM_LONG(limit) Z_PARAM_ZVAL(zcount) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 69b9d3206d..0d8aef562e 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -4307,7 +4307,7 @@ PHP_METHOD(Phar, extractTo) ZEND_PARSE_PARAMETERS_START(1, 3) Z_PARAM_PATH(pathto, pathto_len) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(filename, files_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(files_ht, filename) Z_PARAM_BOOL(overwrite) ZEND_PARSE_PARAMETERS_END(); 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(); diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 68e901ff20..b0ad6cf47e 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -1110,9 +1110,9 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) Z_PARAM_STRING(a5, a5_len) Z_PARAM_STRING(a6, a6_len) Z_PARAM_STRING(a7, a7_len) - Z_PARAM_STR_OR_ARRAY_HT(oid_str, oid_ht) - Z_PARAM_STR_OR_ARRAY_HT(type_str, type_ht) - Z_PARAM_STR_OR_ARRAY_HT(value_str, value_ht) + Z_PARAM_ARRAY_HT_OR_STR(oid_ht, oid_str) + Z_PARAM_ARRAY_HT_OR_STR(type_ht, type_str) + Z_PARAM_ARRAY_HT_OR_STR(value_ht, value_str) Z_PARAM_OPTIONAL Z_PARAM_LONG(timeout) Z_PARAM_LONG(retries) @@ -1130,7 +1130,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) Z_PARAM_STRING(a5, a5_len) Z_PARAM_STRING(a6, a6_len) Z_PARAM_STRING(a7, a7_len) - Z_PARAM_STR_OR_ARRAY_HT(oid_str, oid_ht) + Z_PARAM_ARRAY_HT_OR_STR(oid_ht, oid_str) Z_PARAM_OPTIONAL Z_PARAM_LONG(timeout) Z_PARAM_LONG(retries) @@ -1141,9 +1141,9 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) ZEND_PARSE_PARAMETERS_START(5, 7) Z_PARAM_STRING(a1, a1_len) Z_PARAM_STRING(a2, a2_len) - Z_PARAM_STR_OR_ARRAY_HT(oid_str, oid_ht) - Z_PARAM_STR_OR_ARRAY_HT(type_str, type_ht) - Z_PARAM_STR_OR_ARRAY_HT(value_str, value_ht) + Z_PARAM_ARRAY_HT_OR_STR(oid_ht, oid_str) + Z_PARAM_ARRAY_HT_OR_STR(type_ht, type_str) + Z_PARAM_ARRAY_HT_OR_STR(value_ht, value_str) Z_PARAM_OPTIONAL Z_PARAM_LONG(timeout) Z_PARAM_LONG(retries) @@ -1156,7 +1156,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) ZEND_PARSE_PARAMETERS_START(3, 5) Z_PARAM_STRING(a1, a1_len) Z_PARAM_STRING(a2, a2_len) - Z_PARAM_STR_OR_ARRAY_HT(oid_str, oid_ht) + Z_PARAM_ARRAY_HT_OR_STR(oid_ht, oid_str) Z_PARAM_OPTIONAL Z_PARAM_LONG(timeout) Z_PARAM_LONG(retries) @@ -1166,13 +1166,13 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) } else { if (st & SNMP_CMD_SET) { ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_STR_OR_ARRAY_HT(oid_str, oid_ht) - Z_PARAM_STR_OR_ARRAY_HT(type_str, type_ht) - Z_PARAM_STR_OR_ARRAY_HT(value_str, value_ht) + Z_PARAM_ARRAY_HT_OR_STR(oid_ht, oid_str) + Z_PARAM_ARRAY_HT_OR_STR(type_ht, type_str) + Z_PARAM_ARRAY_HT_OR_STR(value_ht, value_str) ZEND_PARSE_PARAMETERS_END(); } else if (st & SNMP_CMD_WALK) { ZEND_PARSE_PARAMETERS_START(1, 4) - Z_PARAM_STR_OR_ARRAY_HT(oid_str, oid_ht) + Z_PARAM_ARRAY_HT_OR_STR(oid_ht, oid_str) Z_PARAM_OPTIONAL Z_PARAM_BOOL(suffix_keys) Z_PARAM_LONG(objid_query.max_repetitions) @@ -1183,7 +1183,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) } } else if (st & SNMP_CMD_GET) { ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR_OR_ARRAY_HT(oid_str, oid_ht) + Z_PARAM_ARRAY_HT_OR_STR(oid_ht, oid_str) Z_PARAM_OPTIONAL Z_PARAM_BOOL(use_orignames) ZEND_PARSE_PARAMETERS_END(); @@ -1194,7 +1194,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) /* SNMP_CMD_GETNEXT */ ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_ARRAY_HT(oid_str, oid_ht) + Z_PARAM_ARRAY_HT_OR_STR(oid_ht, oid_str) ZEND_PARSE_PARAMETERS_END(); } } diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 387beb78e5..446436db5f 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -604,7 +604,7 @@ PHP_METHOD(SoapFault, __construct) HashTable *code_ht; ZEND_PARSE_PARAMETERS_START(2, 6) - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(code_str, code_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(code_ht, code_str) Z_PARAM_STRING(fault_string, fault_string_len) Z_PARAM_OPTIONAL Z_PARAM_STRING_OR_NULL(fault_actor, fault_actor_len) diff --git a/ext/standard/assert.c b/ext/standard/assert.c index f476415f5c..382c0b87e4 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -149,7 +149,7 @@ PHP_FUNCTION(assert) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_ZVAL(assertion) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_OBJ_OF_CLASS_OR_NULL(description_str, description_obj, zend_ce_throwable) + Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL(description_obj, zend_ce_throwable, description_str) ZEND_PARSE_PARAMETERS_END(); if (zend_is_true(assertion)) { diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 149fc072b2..e1ae2a65bc 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -267,7 +267,7 @@ PHP_FUNCTION(mail) Z_PARAM_STRING(subject, subject_len) Z_PARAM_STRING(message, message_len) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT(headers_str, headers_ht) + Z_PARAM_ARRAY_HT_OR_STR(headers_ht, headers_str) Z_PARAM_STR(extra_cmd) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 2f5d15d738..6d0e74af1d 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -1034,7 +1034,7 @@ PHP_FUNCTION(proc_open) php_process_handle *proc; ZEND_PARSE_PARAMETERS_START(3, 6) - Z_PARAM_STR_OR_ARRAY_HT(command_str, command_ht) + Z_PARAM_ARRAY_HT_OR_STR(command_ht, command_str) Z_PARAM_ARRAY(descriptorspec) Z_PARAM_ZVAL(pipes) Z_PARAM_OPTIONAL diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 78e3896d5b..50e0a38d9b 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -1000,7 +1000,7 @@ PHP_FUNCTION(stream_context_set_option) ZEND_PARSE_PARAMETERS_START(2, 4) Z_PARAM_RESOURCE(zcontext) - Z_PARAM_STR_OR_ARRAY_HT(wrappername, options) + Z_PARAM_ARRAY_HT_OR_STR(options, wrappername) Z_PARAM_OPTIONAL Z_PARAM_STRING_OR_NULL(optionname, optionname_len) Z_PARAM_ZVAL(zvalue) diff --git a/ext/standard/string.c b/ext/standard/string.c index a50ba01fd6..9fd7e5f454 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1228,7 +1228,7 @@ PHP_FUNCTION(implode) zend_array *pieces = NULL; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_STR_OR_ARRAY_HT(arg1_str, arg1_array) + Z_PARAM_ARRAY_HT_OR_STR(arg1_array, arg1_str) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_HT_OR_NULL(pieces) ZEND_PARSE_PARAMETERS_END(); @@ -2246,8 +2246,8 @@ PHP_FUNCTION(substr_replace) zval *tmp_str = NULL, *tmp_repl, *tmp_from = NULL, *tmp_len= NULL; ZEND_PARSE_PARAMETERS_START(3, 4) - Z_PARAM_STR_OR_ARRAY_HT(str, str_ht) - Z_PARAM_STR_OR_ARRAY_HT(repl_str, repl_ht) + Z_PARAM_ARRAY_HT_OR_STR(str_ht, str) + Z_PARAM_ARRAY_HT_OR_STR(repl_ht, repl_str) Z_PARAM_ZVAL(from) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(len) @@ -3208,7 +3208,7 @@ PHP_FUNCTION(strtr) ZEND_PARSE_PARAMETERS_START(2, 3) Z_PARAM_STR(str) - Z_PARAM_STR_OR_ARRAY_HT(from_str, from_ht) + Z_PARAM_ARRAY_HT_OR_STR(from_ht, from_str) Z_PARAM_OPTIONAL Z_PARAM_STRING_OR_NULL(to, to_len) ZEND_PARSE_PARAMETERS_END(); @@ -4251,9 +4251,9 @@ static void php_str_replace_common(INTERNAL_FUNCTION_PARAMETERS, int case_sensit zend_long count = 0; ZEND_PARSE_PARAMETERS_START(3, 4) - Z_PARAM_STR_OR_ARRAY_HT(search_str, search_ht) - Z_PARAM_STR_OR_ARRAY_HT(replace_str, replace_ht) - Z_PARAM_STR_OR_ARRAY_HT(subject_str, subject_ht) + Z_PARAM_ARRAY_HT_OR_STR(search_ht, search_str) + Z_PARAM_ARRAY_HT_OR_STR(replace_ht, replace_str) + Z_PARAM_ARRAY_HT_OR_STR(subject_ht, subject_str) Z_PARAM_OPTIONAL Z_PARAM_ZVAL(zcount) ZEND_PARSE_PARAMETERS_END(); @@ -4570,7 +4570,7 @@ PHP_FUNCTION(strip_tags) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_STR(str) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(allow_str, allow_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(allow_ht, allow_str) ZEND_PARSE_PARAMETERS_END(); if (allow_ht) { diff --git a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt index ebb45aaab6..bee28f5442 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt @@ -57,5 +57,5 @@ Argument is name of class which has no methods: array(0) { } Argument is non existent class: -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Done 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 0d103c1144..3fc707c15e 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 @@ -84,89 +84,89 @@ Error: 2 - Undefined variable $undefined_var Error: 2 - Undefined variable $unset_var Arg value 0 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Arg value 1 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Arg value 12345 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Arg value -2345 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Arg value 10.5 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Arg value -10.5 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Arg value 101234567000 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Arg value 1.07654321E-9 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Arg value 0.5 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Error: 2 - Array to string conversion Arg value Array -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Error: 2 - Array to string conversion Arg value Array -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Error: 2 - Array to string conversion Arg value Array -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Error: 2 - Array to string conversion Arg value Array -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Error: 2 - Array to string conversion Arg value Array -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Arg value -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, null given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, null given Arg value -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, null given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, null given Arg value 1 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, bool given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, bool given Arg value -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, bool given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, bool given Arg value 1 -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, bool given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, bool given Arg value -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, bool given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, bool given Arg value -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Arg value -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Arg value string -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Arg value string -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Arg value stdClass array(0) { } Arg value -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, null given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, null given Arg value -get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, null given +get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, null given Done 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 9d6361e449..529f13ce71 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 @@ -87,90 +87,90 @@ Error: 2 - Undefined variable $undefined_var Error: 2 - Undefined variable $unset_var Arg value 0 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Arg value 1 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Arg value 12345 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Arg value -2345 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, int given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, int given Arg value 10.5 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Arg value -10.5 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Arg value 101234567000 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Arg value 1.07654321E-9 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Arg value 0.5 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, float given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, float given Error: 2 - Array to string conversion Arg value Array -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Error: 2 - Array to string conversion Arg value Array -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Error: 2 - Array to string conversion Arg value Array -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Error: 2 - Array to string conversion Arg value Array -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Error: 2 - Array to string conversion Arg value Array -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, array given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, array given Arg value -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, null given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, null given Arg value -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, null given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, null given Arg value 1 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, bool given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, bool given Arg value -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, bool given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, bool given Arg value 1 -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, bool given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, bool given Arg value -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, bool given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, bool given Arg value -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Arg value -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Arg value string In autoload(string) -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Arg value String In autoload(String) -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, string given Arg value stdClass bool(false) Arg value -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, null given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, null given Arg value -get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, null given +get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, null given Done diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 37f9230aad..58d398b006 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -342,7 +342,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil ZEND_PARSE_PARAMETERS_START(1, 4) Z_PARAM_PATH_STR(arg1) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(config_str, config_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(config_ht, config_str) Z_PARAM_STRING(enc, enc_len) Z_PARAM_BOOL(use_include_path) ZEND_PARSE_PARAMETERS_END(); @@ -354,7 +354,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil ZEND_PARSE_PARAMETERS_START(1, 3) Z_PARAM_STR(arg1) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(config_str, config_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(config_ht, config_str) Z_PARAM_STRING(enc, enc_len) ZEND_PARSE_PARAMETERS_END(); @@ -997,7 +997,7 @@ PHP_FUNCTION(tidy_parse_string) ZEND_PARSE_PARAMETERS_START(1, 3) Z_PARAM_STR(input) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(options_str, options_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(options_ht, options_str) Z_PARAM_STRING_OR_NULL(enc, enc_len) ZEND_PARSE_PARAMETERS_END(); @@ -1059,7 +1059,7 @@ PHP_FUNCTION(tidy_parse_file) ZEND_PARSE_PARAMETERS_START(1, 4) Z_PARAM_PATH_STR(inputfile) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(options_str, options_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(options_ht, options_str) Z_PARAM_STRING_OR_NULL(enc, enc_len) Z_PARAM_BOOL(use_include_path) ZEND_PARSE_PARAMETERS_END(); @@ -1352,7 +1352,7 @@ PHP_METHOD(tidy, __construct) ZEND_PARSE_PARAMETERS_START(0, 4) Z_PARAM_OPTIONAL Z_PARAM_PATH_STR_OR_NULL(inputfile) - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(options_str, options_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(options_ht, options_str) Z_PARAM_STRING_OR_NULL(enc, enc_len) Z_PARAM_BOOL(use_include_path) ZEND_PARSE_PARAMETERS_END(); @@ -1391,7 +1391,7 @@ PHP_METHOD(tidy, parseFile) ZEND_PARSE_PARAMETERS_START(1, 4) Z_PARAM_PATH_STR(inputfile) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(options_str, options_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(options_ht, options_str) Z_PARAM_STRING_OR_NULL(enc, enc_len) Z_PARAM_BOOL(use_include_path) ZEND_PARSE_PARAMETERS_END(); @@ -1431,7 +1431,7 @@ PHP_METHOD(tidy, parseString) ZEND_PARSE_PARAMETERS_START(1, 3) Z_PARAM_STR(input) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(options_str, options_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(options_ht, options_str) Z_PARAM_STRING_OR_NULL(enc, enc_len) ZEND_PARSE_PARAMETERS_END(); diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index 26edbb9045..deac062bfa 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -675,7 +675,7 @@ PHP_METHOD(XSLTProcessor, setParameter) ZEND_PARSE_PARAMETERS_START(2, 3) Z_PARAM_STRING(namespace, namespace_len) - Z_PARAM_STR_OR_ARRAY_HT(name, array_value) + Z_PARAM_ARRAY_HT_OR_STR(array_value, name) Z_PARAM_OPTIONAL Z_PARAM_STR_OR_NULL(value) ZEND_PARSE_PARAMETERS_END(); @@ -772,7 +772,7 @@ PHP_METHOD(XSLTProcessor, registerPHPFunctions) ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(restrict_str, restrict_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(restrict_ht, restrict_str) ZEND_PARSE_PARAMETERS_END(); intern = Z_XSL_P(id); diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index 18e7443313..0e4040d1bd 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -145,14 +145,14 @@ ZEND_FUNCTION(zend_leak_variable) } /* }}} */ -/* Tests Z_PARAM_STR_OR_OBJ */ +/* Tests Z_PARAM_OBJ_OR_STR */ ZEND_FUNCTION(zend_string_or_object) { zend_string *str; zend_object *object; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ(str, object) + Z_PARAM_OBJ_OR_STR(object, str) ZEND_PARSE_PARAMETERS_END(); if (str) { @@ -163,14 +163,14 @@ ZEND_FUNCTION(zend_string_or_object) } /* }}} */ -/* Tests Z_PARAM_STR_OR_OBJ_OR_NULL */ +/* Tests Z_PARAM_OBJ_OR_STR_OR_NULL */ ZEND_FUNCTION(zend_string_or_object_or_null) { zend_string *str; zend_object *object; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ_OR_NULL(str, object) + Z_PARAM_OBJ_OR_STR_OR_NULL(object, str) ZEND_PARSE_PARAMETERS_END(); if (str) { @@ -183,14 +183,14 @@ ZEND_FUNCTION(zend_string_or_object_or_null) } /* }}} */ -/* Tests Z_PARAM_STR_OR_OBJ_OF_CLASS */ +/* Tests Z_PARAM_OBJ_OF_CLASS_OR_STR */ ZEND_FUNCTION(zend_string_or_stdclass) { zend_string *str; zend_object *object; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ_OF_CLASS(str, object, zend_standard_class_def) + Z_PARAM_OBJ_OF_CLASS_OR_STR(object, zend_standard_class_def, str) ZEND_PARSE_PARAMETERS_END(); if (str) { @@ -201,14 +201,14 @@ ZEND_FUNCTION(zend_string_or_stdclass) } /* }}} */ -/* Tests Z_PARAM_STR_OR_OBJ_OF_CLASS_OR_NULL */ +/* Tests Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL */ ZEND_FUNCTION(zend_string_or_stdclass_or_null) { zend_string *str; zend_object *object; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR_OR_OBJ_OF_CLASS_OR_NULL(str, object, zend_standard_class_def) + Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL(object, zend_standard_class_def, str) ZEND_PARSE_PARAMETERS_END(); if (str) { diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 6ebbc42858..96baabacd4 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -2724,7 +2724,7 @@ PHP_METHOD(ZipArchive, extractTo) ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_PATH(pathto, pathto_len) Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(files_str, files_ht) + Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(files_ht, files_str) ZEND_PARSE_PARAMETERS_END(); ZIP_FROM_OBJECT(intern, self); |