- Fix Reflection class names

- Add ability to get the extension an internal class was defined in
# This is the patch Andi and me used to search for underscrores...

diff --git a/Zend/zend.c b/Zend/zend.c
index c01d0d9ac610c17abb65ede9b0ac7d078abcb89d..4e1c83d099a5276035f27bbd52f782091e8281b9 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -479,6 +479,7 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals TSRMLS
        EG(in_execution) = 0;
        EG(in_autoload) = NULL;
        EG(current_execute_data) = NULL;
+       EG(current_module) = NULL;
 }
 
 

diff --git a/Zend/zend.h b/Zend/zend.h
index b89b54ad73299f55559416224d5d8f8899ddd018..17783caee4a1c3f98a5c53acab1a0bd25647d170 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -339,6 +339,8 @@ struct _zend_class_entry {
        zend_uint line_end;
        char *doc_comment;
        zend_uint doc_comment_len;
+       
+       struct _zend_module_entry *module;
 };
 
 #include "zend_stream.h"

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 60696cfd17494083af865af77441634f34685ad4..a2bbf4c32cd7b3307c172174e026ecb19ae92951 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1165,10 +1165,13 @@ ZEND_API int zend_startup_module(zend_module_entry *module)
                if (module->module_startup_func) {
                        TSRMLS_FETCH();
 
+                       EG(current_module) = module;
                        if (module->module_startup_func(MODULE_PERSISTENT, module->module_number TSRMLS_CC)==FAILURE) {
                                zend_error(E_CORE_ERROR,"Unable to start %s module", module->name);
+                               EG(current_module) = NULL;
                                return FAILURE;
                        }
+                       EG(current_module) = NULL;
                }
                module->type = MODULE_PERSISTENT;
                zend_register_module(module);
@@ -1467,6 +1470,7 @@ static zend_class_entry *do_register_internal_class(zend_class_entry *orig_class
        class_entry->type = ZEND_INTERNAL_CLASS;
        zend_initialize_class_data(class_entry, 0 TSRMLS_CC);
        class_entry->ce_flags = ce_flags;
+       class_entry->module = EG(current_module);
 
        if (class_entry->builtin_functions) {
                zend_register_functions(class_entry, class_entry->builtin_functions, &class_entry->function_table, MODULE_PERSISTENT TSRMLS_CC);

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index faee34f5fbe6ec33e0853e9bee29ce37858d90b9..eb80cf9d98440fb9f862eff4a91614b3384dcea4 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -135,6 +135,7 @@ typedef struct _zend_function_entry {
                class_container.interfaces = NULL;      \
                class_container.get_iterator = NULL;    \
                class_container.iterator_funcs.funcs = NULL;  \
+               class_container.module = NULL;          \
        }
 
 int zend_next_free_module(void);

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 0668c0481ce358f72848c034531767170b997bba..1ce4c39295b951906605aa9db4dd0ffbe0e9fb64 100644 (file)
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -34,6 +34,7 @@
 #include "zend_fast_cache.h"
 #include "zend_objects.h"
 #include "zend_objects_API.h"
+#include "zend_modules.h"
 
 #ifdef ZEND_MULTIBYTE
 #include "zend_multibyte.h"
@@ -232,6 +233,7 @@ struct _zend_executor_globals {
 
        struct _zend_execute_data *current_execute_data;
 
+       struct _zend_module_entry *current_module;
 
        zend_property_info std_property_info;
 

diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c
index 5fb2aa9a4ad32e74cdd64393851386466056bef3..e19071986ff004b10156f44ec26af18542903670 100644 (file)
--- a/Zend/zend_reflection_api.c
+++ b/Zend/zend_reflection_api.c
@@ -26,6 +26,7 @@
 #include "zend_operators.h"
 #include "zend_constants.h"
 #include "zend_ini.h"
+#include "zend_interfaces.h"
 
 /* Class entry pointers */
 zend_class_entry *reflector_ptr;
@@ -265,7 +266,11 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
        } else {
                string_printf(str, "%s%s [ ", indent, (ce->ce_flags & ZEND_ACC_INTERFACE) ? "Interface" : "Class");
        }
-       string_printf(str, (ce->type == ZEND_USER_CLASS) ? "<user>  " : "<internal> ");
+       string_printf(str, (ce->type == ZEND_USER_CLASS) ? "<user" : "<internal");
+       if (ce->module) {
+               string_printf(str, ":%s", ce->module->name);
+       }
+       string_printf(str, "> ");
        if (ce->get_iterator != NULL) {
                string_printf(str, "<iterateable> ");
        }
@@ -698,6 +703,33 @@ static void reflection_class_factory(zend_class_entry *ce, zval *object TSRMLS_D
 }
 /* }}} */
 
+/* {{{ reflection_extension_factory */
+static void reflection_extension_factory(zval *object, char *name_str TSRMLS_DC)
+{
+       reflection_object *intern;
+       zval *name;
+       int name_len = strlen(name_str);
+       char *lcname;
+       struct _zend_module_entry *module;
+
+       lcname = do_alloca(name_len + 1);
+       zend_str_tolower_copy(lcname, name_str, name_len);
+       if (zend_hash_find(&module_registry, lcname, name_len + 1, (void **)&module) == FAILURE) {
+               free_alloca(lcname);
+               return;
+       }
+       free_alloca(lcname);
+
+       reflection_instanciate(reflection_extension_ptr, object TSRMLS_CC);
+       intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC);
+       MAKE_STD_ZVAL(name);
+       ZVAL_STRINGL(name, module->name, name_len, 1);
+       intern->ptr = module;
+       intern->free_ptr = 0;
+       zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &name, sizeof(zval *), NULL);
+}
+/* }}} */
+
 /* {{{ reflection_parameter_factory */
 static void reflection_parameter_factory(struct _zend_arg_info *arg_info, int offset, zval *object TSRMLS_DC)
 {
@@ -2505,6 +2537,40 @@ ZEND_METHOD(reflection_class, isIterateable)
 }
 /* }}} */
 
+/* {{{ proto public Reflection_Extension|NULL Reflection_Class::getExtension()
+   Returns NULL or the extension the class belongs to */
+ZEND_METHOD(reflection_class, getExtension)
+{
+       reflection_object *intern;
+       zend_class_entry *ce;
+
+       METHOD_NOTSTATIC;
+       GET_REFLECTION_OBJECT_PTR(ce);
+
+       if (ce->module) {
+               reflection_extension_factory(return_value, ce->module->name TSRMLS_CC);
+       }
+}
+/* }}} */
+
+/* {{{ proto public string|false Reflection_Class::getExtensionName()
+   Returns false or the name of the extension the class belongs to */
+ZEND_METHOD(reflection_class, getExtensionName)
+{
+       reflection_object *intern;
+       zend_class_entry *ce;
+
+       METHOD_NOTSTATIC;
+       GET_REFLECTION_OBJECT_PTR(ce);
+
+       if (ce->module) {
+               RETURN_STRING(ce->module->name, 1);
+       } else {
+               RETURN_FALSE;
+       }
+}
+/* }}} */
+
 /* {{{ proto public static mixed Reflection_Object::export(mixed argument, [, bool return]) throws Reflection_Exception
    Exports a reflection object. Returns the output if TRUE is specified for return, printing it otherwise. */
 ZEND_METHOD(reflection_object, export)
@@ -2989,6 +3055,56 @@ ZEND_METHOD(reflection_extension, getINIEntries)
 }
 /* }}} */
 
+/* {{{ add_extension_class */
+static int add_extension_class(zend_class_entry **pce, int num_args, va_list args, zend_hash_key *hash_key)
+{
+       zval *class_array = va_arg(args, zval*), *zclass;
+       struct _zend_module_entry *module = va_arg(args, struct _zend_module_entry*);
+       int add_reflection_class = va_arg(args, int);
+
+       if ((*pce)->module && !strcasecmp((*pce)->module->name, module->name)) {
+               if (add_reflection_class) {
+                       ALLOC_ZVAL(zclass);
+                       reflection_class_factory(*pce, zclass TSRMLS_CC);
+                       add_assoc_zval_ex(class_array, (*pce)->name, (*pce)->name_length + 1, zclass);
+               } else {
+                       add_next_index_stringl(class_array, (*pce)->name, (*pce)->name_length + 1, 1);
+               }
+       }
+       return ZEND_HASH_APPLY_KEEP;
+}
+/* }}} */
+
+/* {{{ proto public array Reflection_Extension::getClasses()
+   Returns an array containing Reflection_Class objects for all classes of this extension */
+ZEND_METHOD(reflection_extension, getClasses)
+{
+       reflection_object *intern;
+       zend_module_entry *module;
+
+       METHOD_NOTSTATIC_NUMPARAMS(0);  
+       GET_REFLECTION_OBJECT_PTR(module);
+
+       array_init(return_value);
+       zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t) add_extension_class, 3, return_value, module, 1 TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto public array Reflection_Extension::getClasses()
+   Returns an array containing all names of all classes of this extension */
+ZEND_METHOD(reflection_extension, getClassNames)
+{
+       reflection_object *intern;
+       zend_module_entry *module;
+
+       METHOD_NOTSTATIC_NUMPARAMS(0);  
+       GET_REFLECTION_OBJECT_PTR(module);
+
+       array_init(return_value);
+       zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t) add_extension_class, 3, return_value, module, 0 TSRMLS_CC);
+}
+/* }}} */
+
 /* {{{ method tables */
 static zend_function_entry reflection_exception_functions[] = {
        {NULL, NULL, NULL}
@@ -3076,6 +3192,8 @@ static zend_function_entry reflection_class_functions[] = {
        ZEND_ME(reflection_class, getDefaultProperties, NULL, 0)
        ZEND_ME(reflection_class, isIterateable, NULL, 0)
        ZEND_ME(reflection_class, implementsInterface, NULL, 0)
+       ZEND_ME(reflection_class, getExtension, NULL, 0)
+       ZEND_ME(reflection_class, getExtensionName, NULL, 0)
        {NULL, NULL, NULL}
 };
 
@@ -3125,6 +3243,8 @@ static zend_function_entry reflection_extension_functions[] = {
        ZEND_ME(reflection_extension, getFunctions, NULL, 0)
        ZEND_ME(reflection_extension, getConstants, NULL, 0)
        ZEND_ME(reflection_extension, getINIEntries, NULL, 0)
+       ZEND_ME(reflection_extension, getClasses, NULL, 0)
+       ZEND_ME(reflection_extension, getClassNames, NULL, 0)
        {NULL, NULL, NULL}
 };
 /* }}} */
@@ -3136,45 +3256,45 @@ ZEND_API void zend_register_reflection_api(TSRMLS_D) {
        memcpy(&reflection_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
        reflection_object_handlers.clone_obj = NULL;
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_exception", reflection_exception_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionException", reflection_exception_functions);
        reflection_exception_ptr = zend_register_internal_class_ex(&_reflection_entry, zend_exception_get_default(), NULL TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection", reflection_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "Reflection", reflection_functions);
        reflection_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflector", reflector_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "Reflector", reflector_functions);
        reflector_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflector_ptr->ce_flags = ZEND_ACC_ABSTRACT | ZEND_ACC_INTERFACE;
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_function", reflection_function_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionFunction", reflection_function_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_function_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_function_ptr, reflector_ptr TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_parameter", reflection_parameter_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionParameter", reflection_parameter_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_parameter_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_parameter_ptr, reflector_ptr TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_method", reflection_method_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionMethod", reflection_method_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_method_ptr = zend_register_internal_class_ex(&_reflection_entry, reflection_function_ptr, NULL TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_class", reflection_class_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionClass", reflection_class_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_class_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_class_ptr, reflector_ptr TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_object", reflection_object_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionObject", reflection_object_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_object_ptr = zend_register_internal_class_ex(&_reflection_entry, reflection_class_ptr, NULL TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_property", reflection_property_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionProperty", reflection_property_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_property_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_property_ptr, reflector_ptr TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_extension", reflection_extension_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionExtension", reflection_extension_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_extension_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_extension_ptr, reflector_ptr TSRMLS_CC);

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 5fb2aa9a4ad32e74cdd64393851386466056bef3..e19071986ff004b10156f44ec26af18542903670 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -26,6 +26,7 @@
 #include "zend_operators.h"
 #include "zend_constants.h"
 #include "zend_ini.h"
+#include "zend_interfaces.h"
 
 /* Class entry pointers */
 zend_class_entry *reflector_ptr;
@@ -265,7 +266,11 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
        } else {
                string_printf(str, "%s%s [ ", indent, (ce->ce_flags & ZEND_ACC_INTERFACE) ? "Interface" : "Class");
        }
-       string_printf(str, (ce->type == ZEND_USER_CLASS) ? "<user>  " : "<internal> ");
+       string_printf(str, (ce->type == ZEND_USER_CLASS) ? "<user" : "<internal");
+       if (ce->module) {
+               string_printf(str, ":%s", ce->module->name);
+       }
+       string_printf(str, "> ");
        if (ce->get_iterator != NULL) {
                string_printf(str, "<iterateable> ");
        }
@@ -698,6 +703,33 @@ static void reflection_class_factory(zend_class_entry *ce, zval *object TSRMLS_D
 }
 /* }}} */
 
+/* {{{ reflection_extension_factory */
+static void reflection_extension_factory(zval *object, char *name_str TSRMLS_DC)
+{
+       reflection_object *intern;
+       zval *name;
+       int name_len = strlen(name_str);
+       char *lcname;
+       struct _zend_module_entry *module;
+
+       lcname = do_alloca(name_len + 1);
+       zend_str_tolower_copy(lcname, name_str, name_len);
+       if (zend_hash_find(&module_registry, lcname, name_len + 1, (void **)&module) == FAILURE) {
+               free_alloca(lcname);
+               return;
+       }
+       free_alloca(lcname);
+
+       reflection_instanciate(reflection_extension_ptr, object TSRMLS_CC);
+       intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC);
+       MAKE_STD_ZVAL(name);
+       ZVAL_STRINGL(name, module->name, name_len, 1);
+       intern->ptr = module;
+       intern->free_ptr = 0;
+       zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &name, sizeof(zval *), NULL);
+}
+/* }}} */
+
 /* {{{ reflection_parameter_factory */
 static void reflection_parameter_factory(struct _zend_arg_info *arg_info, int offset, zval *object TSRMLS_DC)
 {
@@ -2505,6 +2537,40 @@ ZEND_METHOD(reflection_class, isIterateable)
 }
 /* }}} */
 
+/* {{{ proto public Reflection_Extension|NULL Reflection_Class::getExtension()
+   Returns NULL or the extension the class belongs to */
+ZEND_METHOD(reflection_class, getExtension)
+{
+       reflection_object *intern;
+       zend_class_entry *ce;
+
+       METHOD_NOTSTATIC;
+       GET_REFLECTION_OBJECT_PTR(ce);
+
+       if (ce->module) {
+               reflection_extension_factory(return_value, ce->module->name TSRMLS_CC);
+       }
+}
+/* }}} */
+
+/* {{{ proto public string|false Reflection_Class::getExtensionName()
+   Returns false or the name of the extension the class belongs to */
+ZEND_METHOD(reflection_class, getExtensionName)
+{
+       reflection_object *intern;
+       zend_class_entry *ce;
+
+       METHOD_NOTSTATIC;
+       GET_REFLECTION_OBJECT_PTR(ce);
+
+       if (ce->module) {
+               RETURN_STRING(ce->module->name, 1);
+       } else {
+               RETURN_FALSE;
+       }
+}
+/* }}} */
+
 /* {{{ proto public static mixed Reflection_Object::export(mixed argument, [, bool return]) throws Reflection_Exception
    Exports a reflection object. Returns the output if TRUE is specified for return, printing it otherwise. */
 ZEND_METHOD(reflection_object, export)
@@ -2989,6 +3055,56 @@ ZEND_METHOD(reflection_extension, getINIEntries)
 }
 /* }}} */
 
+/* {{{ add_extension_class */
+static int add_extension_class(zend_class_entry **pce, int num_args, va_list args, zend_hash_key *hash_key)
+{
+       zval *class_array = va_arg(args, zval*), *zclass;
+       struct _zend_module_entry *module = va_arg(args, struct _zend_module_entry*);
+       int add_reflection_class = va_arg(args, int);
+
+       if ((*pce)->module && !strcasecmp((*pce)->module->name, module->name)) {
+               if (add_reflection_class) {
+                       ALLOC_ZVAL(zclass);
+                       reflection_class_factory(*pce, zclass TSRMLS_CC);
+                       add_assoc_zval_ex(class_array, (*pce)->name, (*pce)->name_length + 1, zclass);
+               } else {
+                       add_next_index_stringl(class_array, (*pce)->name, (*pce)->name_length + 1, 1);
+               }
+       }
+       return ZEND_HASH_APPLY_KEEP;
+}
+/* }}} */
+
+/* {{{ proto public array Reflection_Extension::getClasses()
+   Returns an array containing Reflection_Class objects for all classes of this extension */
+ZEND_METHOD(reflection_extension, getClasses)
+{
+       reflection_object *intern;
+       zend_module_entry *module;
+
+       METHOD_NOTSTATIC_NUMPARAMS(0);  
+       GET_REFLECTION_OBJECT_PTR(module);
+
+       array_init(return_value);
+       zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t) add_extension_class, 3, return_value, module, 1 TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto public array Reflection_Extension::getClasses()
+   Returns an array containing all names of all classes of this extension */
+ZEND_METHOD(reflection_extension, getClassNames)
+{
+       reflection_object *intern;
+       zend_module_entry *module;
+
+       METHOD_NOTSTATIC_NUMPARAMS(0);  
+       GET_REFLECTION_OBJECT_PTR(module);
+
+       array_init(return_value);
+       zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t) add_extension_class, 3, return_value, module, 0 TSRMLS_CC);
+}
+/* }}} */
+
 /* {{{ method tables */
 static zend_function_entry reflection_exception_functions[] = {
        {NULL, NULL, NULL}
@@ -3076,6 +3192,8 @@ static zend_function_entry reflection_class_functions[] = {
        ZEND_ME(reflection_class, getDefaultProperties, NULL, 0)
        ZEND_ME(reflection_class, isIterateable, NULL, 0)
        ZEND_ME(reflection_class, implementsInterface, NULL, 0)
+       ZEND_ME(reflection_class, getExtension, NULL, 0)
+       ZEND_ME(reflection_class, getExtensionName, NULL, 0)
        {NULL, NULL, NULL}
 };
 
@@ -3125,6 +3243,8 @@ static zend_function_entry reflection_extension_functions[] = {
        ZEND_ME(reflection_extension, getFunctions, NULL, 0)
        ZEND_ME(reflection_extension, getConstants, NULL, 0)
        ZEND_ME(reflection_extension, getINIEntries, NULL, 0)
+       ZEND_ME(reflection_extension, getClasses, NULL, 0)
+       ZEND_ME(reflection_extension, getClassNames, NULL, 0)
        {NULL, NULL, NULL}
 };
 /* }}} */
@@ -3136,45 +3256,45 @@ ZEND_API void zend_register_reflection_api(TSRMLS_D) {
        memcpy(&reflection_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
        reflection_object_handlers.clone_obj = NULL;
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_exception", reflection_exception_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionException", reflection_exception_functions);
        reflection_exception_ptr = zend_register_internal_class_ex(&_reflection_entry, zend_exception_get_default(), NULL TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection", reflection_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "Reflection", reflection_functions);
        reflection_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflector", reflector_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "Reflector", reflector_functions);
        reflector_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflector_ptr->ce_flags = ZEND_ACC_ABSTRACT | ZEND_ACC_INTERFACE;
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_function", reflection_function_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionFunction", reflection_function_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_function_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_function_ptr, reflector_ptr TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_parameter", reflection_parameter_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionParameter", reflection_parameter_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_parameter_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_parameter_ptr, reflector_ptr TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_method", reflection_method_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionMethod", reflection_method_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_method_ptr = zend_register_internal_class_ex(&_reflection_entry, reflection_function_ptr, NULL TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_class", reflection_class_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionClass", reflection_class_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_class_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_class_ptr, reflector_ptr TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_object", reflection_object_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionObject", reflection_object_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_object_ptr = zend_register_internal_class_ex(&_reflection_entry, reflection_class_ptr, NULL TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_property", reflection_property_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionProperty", reflection_property_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_property_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_property_ptr, reflector_ptr TSRMLS_CC);
 
-       INIT_CLASS_ENTRY(_reflection_entry, "reflection_extension", reflection_extension_functions);
+       INIT_CLASS_ENTRY(_reflection_entry, "ReflectionExtension", reflection_extension_functions);
        _reflection_entry.create_object = reflection_objects_new;
        reflection_extension_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
        reflection_register_implement(reflection_extension_ptr, reflector_ptr TSRMLS_CC);