php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2' into PHP-7.3

Browse Source
This commit is contained in:
Nikita Popov
2018-10-02 18:20:15 +02:00
parent b8392803f9 f0647edd88
commit a42801abe3
3 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/reflection/php_reflection.c
+10
View File
@@ -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
+42
View File
@@ -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