diff --git a/NEWS b/NEWS index 6fba02d9c88..b56409b4afa 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ PHP NEWS Lundin) . Fixed bug #78752 (Segfault if GC triggered while generator stack frame is being destroyed). (Nikita) + . Fixed bug #78689 (Closure::fromCallable() doesn't handle + [Closure, '__invoke']). (Nikita) - COM: . Fixed bug #78694 (Appending to a variant array causes segfault). (cmb) diff --git a/Zend/tests/bug78689.phpt b/Zend/tests/bug78689.phpt new file mode 100644 index 00000000000..2273fd35320 --- /dev/null +++ b/Zend/tests/bug78689.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #78689: Closure::fromCallable() doesn't handle [Closure, '__invoke'] +--FILE-- + +--EXPECT-- +123 +123 diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 23ea9bc2e25..3efb7ea1166 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -268,8 +268,15 @@ static int zend_create_closure_from_callable(zval *return_value, zval *callable, mptr = fcc.function_handler; if (mptr->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { - memset(&call, 0, sizeof(zend_internal_function)); + /* For Closure::fromCallable([$closure, "__invoke"]) return $closure. */ + if (fcc.object && fcc.object->ce == zend_ce_closure + && zend_string_equals_literal(mptr->common.function_name, "__invoke")) { + ZVAL_OBJ(return_value, fcc.object); + zend_free_trampoline(mptr); + return SUCCESS; + } + memset(&call, 0, sizeof(zend_internal_function)); call.type = ZEND_INTERNAL_FUNCTION; call.handler = zend_closure_call_magic; call.function_name = mptr->common.function_name;