From: Marcus Boerger Date: Mon, 27 Dec 2004 15:13:26 +0000 (+0000) Subject: - Need to unmangle the class name here X-Git-Tag: RELEASE_0_2~455 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7be33a225e49057b671fd80d1f815c7d8c16492b;p=php - Need to unmangle the class name here --- diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c index 29d3b7674e..92f5859e53 100644 --- a/Zend/zend_reflection_api.c +++ b/Zend/zend_reflection_api.c @@ -3061,7 +3061,7 @@ ZEND_METHOD(reflection_property, export) ZEND_METHOD(reflection_property, __construct) { zval *propname, *classname; - char *name_str; + char *name_str, *class_name, *prop_name; int name_len; zval *object; reflection_object *intern; @@ -3126,8 +3126,9 @@ ZEND_METHOD(reflection_property, __construct) ZVAL_STRINGL(classname, ce->name, ce->name_length, 1); zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL); + zend_unmangle_property_name(property_info->name, &class_name, &prop_name); MAKE_STD_ZVAL(propname); - ZVAL_STRING(propname, property_info->name, 1); + ZVAL_STRING(propname, prop_name, 1); zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &propname, sizeof(zval *), NULL); reference = (property_reference*) emalloc(sizeof(property_reference)); diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 29d3b7674e..92f5859e53 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -3061,7 +3061,7 @@ ZEND_METHOD(reflection_property, export) ZEND_METHOD(reflection_property, __construct) { zval *propname, *classname; - char *name_str; + char *name_str, *class_name, *prop_name; int name_len; zval *object; reflection_object *intern; @@ -3126,8 +3126,9 @@ ZEND_METHOD(reflection_property, __construct) ZVAL_STRINGL(classname, ce->name, ce->name_length, 1); zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL); + zend_unmangle_property_name(property_info->name, &class_name, &prop_name); MAKE_STD_ZVAL(propname); - ZVAL_STRING(propname, property_info->name, 1); + ZVAL_STRING(propname, prop_name, 1); zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &propname, sizeof(zval *), NULL); reference = (property_reference*) emalloc(sizeof(property_reference));