Skip to content

Commit 54aa761

Browse files
committed
Merge branch 'PHP-7.1' into PHP-7.2
2 parents f0647ed + 945f315 commit 54aa761

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

ext/reflection/php_reflection.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3221,13 +3221,11 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic)
32213221
fcc.called_scope = intern->ce;
32223222
fcc.object = object ? Z_OBJ_P(object) : NULL;
32233223

3224-
if (!variadic) {
3225-
/*
3226-
* Copy the zend_function when calling via handler (e.g. Closure::__invoke())
3227-
*/
3228-
if ((mptr->internal_function.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
3229-
fcc.function_handler = _copy_function(mptr);
3230-
}
3224+
/*
3225+
* Copy the zend_function when calling via handler (e.g. Closure::__invoke())
3226+
*/
3227+
if ((mptr->internal_function.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
3228+
fcc.function_handler = _copy_function(mptr);
32313229
}
32323230

32333231
result = zend_call_function(&fci, &fcc);

0 commit comments

Comments
 (0)