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 /Zend/zend_API.c | |
| 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 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; |