- MFH: Need to unmangle the class name here

diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c
index ddc5fd1684821abfb2bc8233a6f9e6e38f493aea..a2d0e618b5eb5a34412398d146048eeddebf00a9 100644 (file)
--- a/Zend/zend_reflection_api.c
+++ b/Zend/zend_reflection_api.c
@@ -2867,7 +2867,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;
@@ -2932,8 +2932,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 ddc5fd1684821abfb2bc8233a6f9e6e38f493aea..a2d0e618b5eb5a34412398d146048eeddebf00a9 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2867,7 +2867,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;
@@ -2932,8 +2932,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));