summaryrefslogtreecommitdiff
path: root/ext/reflection/php_reflection.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-03-21 21:29:02 +0800
committerXinchen Hui <laruence@php.net>2013-03-21 21:32:06 +0800
commit39a173b79bcb5b77ef28c83c7da65621e78e717a (patch)
treec23e5e4445d97bc11ef2034142e3b3864eeb2afe /ext/reflection/php_reflection.c
parent7dce0194c815cdc75a780b6471660042aed7bd7a (diff)
downloadphp-git-39a173b79bcb5b77ef28c83c7da65621e78e717a.tar.gz
Fix bug in reflectionClass relate to #64239
Diffstat (limited to 'ext/reflection/php_reflection.c')
-rw-r--r--ext/reflection/php_reflection.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 25ecbad68e..6c4d806236 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1298,7 +1298,8 @@ static void reflection_method_factory(zend_class_entry *ce, zend_function *metho
}
MAKE_STD_ZVAL(name);
MAKE_STD_ZVAL(classname);
- ZVAL_STRING(name, method->common.function_name, 1);
+ ZVAL_STRING(name, (method->common.scope && method->common.scope->trait_aliases)?
+ zend_resolve_method_name(ce, method) : method->common.function_name, 1);
ZVAL_STRINGL(classname, method->common.scope->name, method->common.scope->name_length, 1);
reflection_instantiate(reflection_method_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC);