summaryrefslogtreecommitdiff
path: root/ext/reflection/php_reflection.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-10-02 18:20:15 +0200
committerNikita Popov <nikita.ppv@gmail.com>2018-10-02 18:20:25 +0200
commita42801abe3542be7fcb6ce46d1533e4cd4e5c612 (patch)
tree1a2542610b9ff0c48c392cbff46f5fff832551cc /ext/reflection/php_reflection.c
parentb8392803f93b5f13d72f1e650a8b37d190f5e980 (diff)
parentf0647edd88ca2a2d4e15b4019a3694ef1dbe33f9 (diff)
downloadphp-git-a42801abe3542be7fcb6ce46d1533e4cd4e5c612.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'ext/reflection/php_reflection.c')
-rw-r--r--ext/reflection/php_reflection.c10
1 files changed, 10 insertions, 0 deletions
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++) {