diff options
| -rw-r--r-- | Zend/tests/closure_061.phpt | 33 | ||||
| -rw-r--r-- | ext/reflection/php_reflection.c | 7 |
2 files changed, 39 insertions, 1 deletions
diff --git a/Zend/tests/closure_061.phpt b/Zend/tests/closure_061.phpt index a87303498e..83ad16d2e1 100644 --- a/Zend/tests/closure_061.phpt +++ b/Zend/tests/closure_061.phpt @@ -64,6 +64,15 @@ $tests = [ [new DLL, null], [new DLL, ClsUnrelated::class], ]], + + [function() {}, [ + [null, null], + [new Cls, null], + [new Cls, 'Cls'], + [null, 'Cls'], + [null, 'stdClass'], + [new stdClass, null], + ]], ]; set_error_handler(function($errno, $errstr) { @@ -79,6 +88,9 @@ foreach ($tests as list($fn, $bindings)) { $c = (new ReflectionFunction($fn))->getClosure(); $fnStr = $fn; } + if ($fn instanceof Closure) { + $fnStr = "(function() {})"; + } echo "$fnStr()\n" . str_repeat('-', strlen($fnStr) + 2), "\n\n"; @@ -206,3 +218,24 @@ Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure bindTo(new SplDoublyLinkedList, ClsUnrelated::class): Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure() + +(function() {})() +----------------- + +bindTo(null, null): +Success! + +bindTo(new Cls, null): +Success! + +bindTo(new Cls, Cls::class): +Success! + +bindTo(null, Cls::class): +Success! + +bindTo(null, stdClass::class): +Cannot bind closure to scope of internal class stdClass + +bindTo(new stdClass, null): +Success! diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index a095120e18..df905bf5cc 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1762,7 +1762,12 @@ ZEND_METHOD(reflection_function, getClosure) } GET_REFLECTION_OBJECT_PTR(fptr); - zend_create_fake_closure(return_value, fptr, NULL, NULL, NULL); + if (!Z_ISUNDEF(intern->obj)) { + /* Closures are immutable objects */ + ZVAL_COPY(return_value, &intern->obj); + } else { + zend_create_fake_closure(return_value, fptr, NULL, NULL, NULL); + } } /* }}} */ |