From d9cb4d61eaeabdfa0c12636668c9f4a29a253932 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Mon, 15 Jun 2015 16:38:24 +0200 Subject: [PATCH] current PHP7 engine already has fixed property access container zval --- php_propro.c | 12 ------------ php_propro.h | 14 -------------- 2 files changed, 26 deletions(-) diff --git a/php_propro.c b/php_propro.c index ac4d973..29627ba 100644 --- a/php_propro.c +++ b/php_propro.c @@ -50,18 +50,6 @@ void php_property_proxy_free(php_property_proxy_t **proxy) } } -zval *php_property_proxy_zval(zval *container, zend_string *member) -{ - php_property_proxy_t *proxy; - php_property_proxy_object_t *proxy_obj; - - proxy = php_property_proxy_init(container, member); - proxy_obj = php_property_proxy_object_new_ex(NULL, proxy); - - ZVAL_OBJ(&proxy_obj->myself, &proxy_obj->zo); - return &proxy_obj->myself; -} - static zend_class_entry *php_property_proxy_class_entry; static zend_object_handlers php_property_proxy_object_handlers; diff --git a/php_propro.h b/php_propro.h index 3c8c9f9..57bf845 100644 --- a/php_propro.h +++ b/php_propro.h @@ -87,8 +87,6 @@ struct php_property_proxy_object { php_property_proxy_t *proxy; /** Any parent property proxy object */ zval parent; - /** Bond, James Bond */ - zval myself; /** The std zend_object */ zend_object zo; }; @@ -99,18 +97,6 @@ PHP_PROPRO_API php_property_proxy_object_t *php_property_proxy_object_new_ex( PHP_PROPRO_API zend_object *php_property_proxy_object_new(zend_class_entry *ce); -/** - * Create a property proxy as zval suitable to return from the property handler. - * - * Wrapper for php_property_proxy_init() and php_property_proxy_object_new_ex() - * for use within a custom property handler. - * - * @param container the container holding the property - * @param member the name of the proxied property - * @return the new property proxy as zval - */ -PHP_PROPRO_API zval *php_property_proxy_zval(zval *container, zend_string *member); - /** * Create a property proxy * -- 2.30.2