diff options
| author | Nikita Popov <nikic@php.net> | 2014-10-09 19:15:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-10-09 20:48:27 +0200 |
| commit | df79b9b27af70afe502979c84a981d36ed9d86a8 (patch) | |
| tree | 4a642d706985c960bbfeea70f195aeefe8eb4631 /Zend/zend_object_handlers.c | |
| parent | c061c8294514fb8eae7b96f77839312244a50048 (diff) | |
| download | php-git-df79b9b27af70afe502979c84a981d36ed9d86a8.tar.gz | |
Update get_class_name semantics
* get_class_name is now only used for displaying the class name
in debugging functions like var_dump, print_r, etc. It is no
longer used in get_class() etc.
* As it is no longer used in get_parent_class() the parent
argument is now gone. This also fixes incorrect parent classes
being reported in COM.
* get_class_name is now always required (previously some places
made it optional and some required it) and is also required
to return a non-NULL value.
* Remove zend_get_object_classname. This also fixes a number of
potential leaks due to incorrect usage of this function.
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index c02cda64b9..6679cb1e46 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1525,20 +1525,9 @@ exit: } /* }}} */ -zend_string* zend_std_object_get_class_name(const zend_object *zobj, int parent TSRMLS_DC) /* {{{ */ +zend_string *zend_std_object_get_class_name(const zend_object *zobj TSRMLS_DC) /* {{{ */ { - zend_class_entry *ce; - - if (parent) { - if (!zobj->ce->parent) { - return NULL; - } - ce = zobj->ce->parent; - } else { - ce = zobj->ce; - } - - return zend_string_copy(ce->name); + return zend_string_copy(zobj->ce->name); } /* }}} */ |