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/com_dotnet | |
| 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/com_dotnet')
| -rw-r--r-- | ext/com_dotnet/com_handlers.c | 2 | ||||
| -rw-r--r-- | ext/com_dotnet/com_saproxy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index 607b2e08f3..6f63a1fbd8 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -423,7 +423,7 @@ static union _zend_function *com_constructor_get(zend_object *object TSRMLS_DC) } } -static zend_string* com_class_name_get(const zend_object *object, int parent TSRMLS_DC) +static zend_string* com_class_name_get(const zend_object *object TSRMLS_DC) { php_com_dotnet_object *obj = (php_com_dotnet_object *)object; diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index e4d3ebb7df..ddee9bc179 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -333,7 +333,7 @@ static union _zend_function *saproxy_constructor_get(zend_object *object TSRMLS_ return NULL; } -static zend_string* saproxy_class_name_get(const zend_object *object, int parent TSRMLS_DC) +static zend_string* saproxy_class_name_get(const zend_object *object TSRMLS_DC) { return zend_string_copy(php_com_saproxy_class_entry->name); } |