Fixed bug #66430

diff --git a/NEWS b/NEWS
index 7a6e0ea69da78fc310531cd6181f18a9a69f8740..c6e43e94b95718981502c21f5ed3c089dd575c97 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ PHP                                                                        NEWS
 - Reflection:
   . Fixed bug #76936 (Objects cannot access their private attributes while
     handling reflection errors). (Nikita)
+  . Fixed bug #66430 (ReflectionFunction::invoke does not invoke closure with
+    object scope). (Nikita)
 
 11 Oct 2018, PHP 7.2.11
 

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 3bd31e48a84f686e08d99aa98943ae42bea65682..03ae873aa2e9532dcee9dd4b3e14615bfe3dfc28 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1897,6 +1897,11 @@ ZEND_METHOD(reflection_function, invoke)
        fcc.called_scope = NULL;
        fcc.object = NULL;
 
+       if (!Z_ISUNDEF(intern->obj)) {
+               Z_OBJ_HT(intern->obj)->get_closure(
+                       &intern->obj, &fcc.called_scope, &fcc.function_handler, &fcc.object);
+       }
+
        result = zend_call_function(&fci, &fcc);
 
        if (result == FAILURE) {
@@ -1958,6 +1963,11 @@ ZEND_METHOD(reflection_function, invokeArgs)
        fcc.called_scope = NULL;
        fcc.object = NULL;
 
+       if (!Z_ISUNDEF(intern->obj)) {
+               Z_OBJ_HT(intern->obj)->get_closure(
+                       &intern->obj, &fcc.called_scope, &fcc.function_handler, &fcc.object);
+       }
+
        result = zend_call_function(&fci, &fcc);
 
        for (i = 0; i < argc; i++) {

diff --git a/ext/reflection/tests/bug66430.phpt b/ext/reflection/tests/bug66430.phpt
new file mode 100644 (file)
index 0000000..6e35a03
--- /dev/null
+++ b/ext/reflection/tests/bug66430.phpt
@@ -0,0 +1,42 @@
+--TEST--
+Bug #66430: ReflectionFunction::invoke does not invoke closure with object scope
+--FILE--
+<?php
+
+class Alpha {
+       public $message = "Valid representation";
+       
+       public function bravo() {
+               return $this->message;
+       }
+}
+
+$alpha = new Alpha();
+
+echo "alpha.bravo:                   ", $alpha->bravo().PHP_EOL;
+
+$reflection = new ReflectionObject($alpha);
+
+$method = $reflection->getMethod("bravo");
+$closure = $method->getClosure($alpha);
+
+$reflectionC = new ReflectionFunction($closure);
+
+echo "reflection of alpha.bravo:     ", $method->invoke($alpha).PHP_EOL;
+echo "closure of alpha.bravo:        ", $closure().PHP_EOL;
+echo "call_user_func of closure:     ", call_user_func($closure).PHP_EOL;
+echo PHP_EOL;
+echo "closure cl of c(alpha.bravo):  ", get_class($reflectionC->getClosureThis()).PHP_EOL;
+echo "scope cl of c(alpha.bravo):    ", $reflectionC->getClosureScopeClass()->getName().PHP_EOL;
+echo "reflection of c(alpha.bravo):  ", $reflectionC->invoke().PHP_EOL;
+
+?>
+--EXPECT--
+alpha.bravo:                   Valid representation
+reflection of alpha.bravo:     Valid representation
+closure of alpha.bravo:        Valid representation
+call_user_func of closure:     Valid representation
+
+closure cl of c(alpha.bravo):  Alpha
+scope cl of c(alpha.bravo):    Alpha
+reflection of c(alpha.bravo):  Valid representation