diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-03 10:50:16 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-03 10:50:16 +0200 |
| commit | 54aa76167b84b1f344d80988b7022d482c43f5ed (patch) | |
| tree | 610285bda876b8fbb60b3f416fe99925f1b8fec6 /ext | |
| parent | f0647edd88ca2a2d4e15b4019a3694ef1dbe33f9 (diff) | |
| parent | 945f315506538208705d370f39a6896371e48ebb (diff) | |
| download | php-git-54aa76167b84b1f344d80988b7022d482c43f5ed.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/reflection/php_reflection.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 03ae873aa2..00ce0a8272 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -3221,13 +3221,11 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic) fcc.called_scope = intern->ce; fcc.object = object ? Z_OBJ_P(object) : NULL; - if (!variadic) { - /* - * Copy the zend_function when calling via handler (e.g. Closure::__invoke()) - */ - if ((mptr->internal_function.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) { - fcc.function_handler = _copy_function(mptr); - } + /* + * Copy the zend_function when calling via handler (e.g. Closure::__invoke()) + */ + if ((mptr->internal_function.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) { + fcc.function_handler = _copy_function(mptr); } result = zend_call_function(&fci, &fcc); |