diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-02 18:20:15 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-02 18:20:25 +0200 |
| commit | a42801abe3542be7fcb6ce46d1533e4cd4e5c612 (patch) | |
| tree | 1a2542610b9ff0c48c392cbff46f5fff832551cc | |
| parent | b8392803f93b5f13d72f1e650a8b37d190f5e980 (diff) | |
| parent | f0647edd88ca2a2d4e15b4019a3694ef1dbe33f9 (diff) | |
| download | php-git-a42801abe3542be7fcb6ce46d1533e4cd4e5c612.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/reflection/php_reflection.c | 10 | ||||
| -rw-r--r-- | ext/reflection/tests/bug66430.phpt | 42 |
3 files changed, 54 insertions, 0 deletions
@@ -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 diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index c2f6e198ad..db2da7209d 100644 --- a/ext/reflection/php_reflection.c +++ b/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++) { diff --git a/ext/reflection/tests/bug66430.phpt b/ext/reflection/tests/bug66430.phpt new file mode 100644 index 0000000000..6e35a0389e --- /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 |