diff options
| author | Xinchen Hui <laruence@php.net> | 2013-03-21 21:32:32 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-03-21 21:32:32 +0800 |
| commit | 534aec8a52955b841e30428b5efd1eff975b5e0d (patch) | |
| tree | 3ad2b8c461de0e7f247c0336f119c458b0170625 /ext/reflection/php_reflection.c | |
| parent | 9d31c0de0c73280f8f8e86c179875072d185c2d7 (diff) | |
| parent | 39a173b79bcb5b77ef28c83c7da65621e78e717a (diff) | |
| download | php-git-534aec8a52955b841e30428b5efd1eff975b5e0d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 15befa2fc7..b65ccaa26d 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); |