mirror of
https://github.com/php/php-src.git
synced 2025-08-17 06:28:50 +02:00
Merge branch 'PHP-7.3'
This commit is contained in:
commit
a659d16adf
1 changed files with 5 additions and 7 deletions
|
@ -3146,14 +3146,12 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic)
|
||||||
fcc.called_scope = intern->ce;
|
fcc.called_scope = intern->ce;
|
||||||
fcc.object = object ? Z_OBJ_P(object) : NULL;
|
fcc.object = object ? Z_OBJ_P(object) : NULL;
|
||||||
|
|
||||||
if (!variadic) {
|
|
||||||
/*
|
/*
|
||||||
* Copy the zend_function when calling via handler (e.g. Closure::__invoke())
|
* Copy the zend_function when calling via handler (e.g. Closure::__invoke())
|
||||||
*/
|
*/
|
||||||
if ((mptr->internal_function.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
|
if ((mptr->internal_function.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
|
||||||
fcc.function_handler = _copy_function(mptr);
|
fcc.function_handler = _copy_function(mptr);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
result = zend_call_function(&fci, &fcc);
|
result = zend_call_function(&fci, &fcc);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue