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/pcre/php_pcre.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 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) |