diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-03-29 01:32:44 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-03-29 01:32:44 +0100 |
| commit | cf099ba2ee4e438bae16c3670a14ce0c4390529a (patch) | |
| tree | 062683b6a7226ded35262e94c933b9bd81199314 /ext/reflection/php_reflection.c | |
| parent | f21eff8954d5956842795ea5653a9a5b8d62caa3 (diff) | |
| download | php-cf099ba2ee4e438bae16c3670a14ce0c4390529a.tar.gz | |
Imported Upstream version 5.5.0~beta2upstream/5.5.0_beta2
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 15befa2fc..b65ccaa26 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); |