Merge branch 'PHP-7.2' into PHP-7.3

Author: nikic

NEWS

@@ -15,6 +15,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)
 
 27 Sep 2018, PHP 7.3.0RC2
 

ext/reflection/php_reflection.c

@@ -1862,6 +1862,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) {
@@ -1920,6 +1925,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++) {

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