com php-src: Fixed bug #69802 (Reflection on Closure::_ _invoke borks type hint class name) (onr mo re problem): Zend/tests/bug69802_2.phpt
Zend/zend_closures.c ext/reflection/php_reflection .c

Commit: 3180b8e100285e5bd9088e9981608dfd14f6ff27 Author: Dmitry Stogov <dmitry@zend.com> Tue, 16 Jun 2015 13:29:17 +0300 Parents: ed84bff44569d3b7e2f79255208e69bbe755d6a9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3180b8e100285e5bd9088e9981608dfd14f6ff27 Log: Fixed bug #69802 (Reflection on Closure::__invoke borks type hint class name) (onr more problem) Bugs: https://bugs.php.net/69802 Changed paths: A Zend/tests/bug69802_2.phpt M Zend/zend_closures.c M ext/reflection/php_reflection.c Diff: diff --git a/Zend/tests/bug69802_2.phpt b/Zend/tests/bug69802_2.phpt new file mode 100644 index 0000000..a2de302 --- /dev/null +++ b/Zend/tests/bug69802_2.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #69802 (Reflection on Closure::__invoke borks type hint class name) +--FILE-- +<?php +$f = (new ReflectionFunction('iterator_to_array'))->getClosure(); +$r = new ReflectionMethod($f, '__invoke'); +var_dump($r->getParameters()[0]->getClass()); +?> +--EXPECT-- +object(ReflectionClass)#4 (1) { + ["name"]=> + string(11) "Traversable" +} diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 2d38fb2..b28810a 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -214,7 +214,11 @@ ZEND_API zend_function *zend_get_closure_invoke_method(zend_object *object) /* { * ZEND_ACC_USER_ARG_INFO flag to prevent invalid usage by Reflection */ invoke->type = ZEND_INTERNAL_FUNCTION; invoke->internal_function.fn_flags = - ZEND_ACC_PUBLIC | ZEND_ACC_CALL_VIA_HANDLER | ZEND_ACC_USER_ARG_INFO | (closure->func.common.fn_flags & keep_flags); + ZEND_ACC_PUBLIC | ZEND_ACC_CALL_VIA_HANDLER | (closure->func.common.fn_flags & keep_flags); + if (closure->func.type != ZEND_INTERNAL_FUNCTION || (closure->func.common.fn_flags & ZEND_ACC_USER_ARG_INFO)) { + invoke->internal_function.fn_flags |= + ZEND_ACC_USER_ARG_INFO; + } invoke->internal_function.handler = ZEND_MN(Closure___invoke); invoke->internal_function.module = 0; invoke->internal_function.scope = zend_ce_closure; @@ -488,7 +492,7 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent closure = (zend_closure *)Z_OBJ_P(res); - closure->func = *func; + memcpy(&closure->func, func, func->type == ZEND_USER_FUNCTION ? sizeof(zend_op_array) : sizeof(zend_internal_function)); closure->func.common.prototype = (zend_function*)closure; closure->func.common.fn_flags |= ZEND_ACC_CLOSURE; diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 195ea70..4a2d7cc 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2654,7 +2654,7 @@ ZEND_METHOD(reflection_parameter, getClass) ce = ce->parent; } else { if (param->fptr->type == ZEND_INTERNAL_FUNCTION && - (param->fptr->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS)) { + !(param->fptr->common.fn_flags & ZEND_ACC_USER_ARG_INFO)) { zend_string *name = zend_string_init(class_name, class_name_len, 0); ce = zend_lookup_class(name); zend_string_release(name);