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_builtin_functions.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_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |