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 /ext/standard/php_incomplete_class.h | |
| 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 'ext/standard/php_incomplete_class.h')
| -rw-r--r-- | ext/standard/php_incomplete_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_incomplete_class.h b/ext/standard/php_incomplete_class.h index 7be152f1c0..177e960765 100644 --- a/ext/standard/php_incomplete_class.h +++ b/ext/standard/php_incomplete_class.h @@ -35,7 +35,7 @@ } \ incomplete_class = 1; \ } else { \ - class_name = zend_get_object_classname(Z_OBJ_P(struc) TSRMLS_CC); \ + class_name = zend_string_copy(Z_OBJCE_P(struc)->name); \ } #define PHP_CLEANUP_CLASS_ATTRIBUTES() \ |