#include <php.h>
#include <ext/standard/info.h>
-#include "php_propro.h"
+#include "php_propro_api.h"
#define DEBUG_PROPRO 0
php_property_proxy_t *proxy = ecalloc(1, sizeof(*proxy));
ZVAL_COPY(&proxy->container, get_referenced_zval(container));
- zend_string_addref(member);
- proxy->member = member;
+ proxy->member = zend_string_copy(member);
return proxy;
}
#define debug_propro(l, f, obj, off, val)
#endif
-static php_property_proxy_object_t *new_propro(zend_class_entry *ce,
- php_property_proxy_t *proxy)
+php_property_proxy_object_t *php_property_proxy_object_new_ex(
+ zend_class_entry *ce, php_property_proxy_t *proxy)
{
php_property_proxy_object_t *o;
return o;
}
-static zend_object *create_obj(zend_class_entry *ce)
+zend_object *php_property_proxy_object_new(zend_class_entry *ce)
{
- return &new_propro(ce, NULL)->zo;
+ return &php_property_proxy_object_new_ex(ce, NULL)->zo;
}
static void destroy_obj(zend_object *object)
zval_ptr_dtor(&o->parent);
ZVAL_UNDEF(&o->parent);
}
+ zend_object_std_dtor(object);
}
static inline php_property_proxy_object_t *get_propro(zval *object)
static zval *get_proxied_value(zval *object, zval *return_value)
{
- zval *hash_value, *ref;
+ zval *hash_value, *ref, prop_tmp;
php_property_proxy_object_t *obj;
obj = get_propro(object);
switch (Z_TYPE_P(ref)) {
case IS_OBJECT:
RETVAL_ZVAL(zend_read_property(Z_OBJCE_P(ref), ref,
- obj->proxy->member->val, obj->proxy->member->len, 0),
+ obj->proxy->member->val, obj->proxy->member->len, 0, &prop_tmp),
0, 0);
break;
switch (Z_TYPE_P(ref)) {
case IS_OBJECT:
zend_update_property(Z_OBJCE_P(ref), ref, obj->proxy->member->val,
- obj->proxy->member->len, value TSRMLS_CC);
+ obj->proxy->member->len, value);
break;
default:
static zval *read_dimension(zval *object, zval *offset, int type, zval *return_value)
{
zval proxied_value;
- zval *o = offset;
+ zend_string *member = offset ? zval_get_string(offset) : NULL;
debug_propro(1, type == BP_VAR_R ? "dim_read" : "dim_read_ref",
get_propro(object), offset, NULL);
ZVAL_UNDEF(&proxied_value);
get_proxied_value(object, &proxied_value);
- if (o) {
- convert_to_string_ex(o);
- }
-
- if (BP_VAR_R == type && o && !Z_ISUNDEF(proxied_value)) {
+ if (BP_VAR_R == type && member && !Z_ISUNDEF(proxied_value)) {
if (Z_TYPE(proxied_value) == IS_ARRAY) {
zval *hash_value = zend_symtable_find(Z_ARRVAL(proxied_value),
- Z_STR_P(o));
+ member);
if (hash_value) {
RETVAL_ZVAL(hash_value, 1, 0);
}
}
} else {
- zend_string *member;
php_property_proxy_t *proxy;
php_property_proxy_object_t *proxy_obj;
set_proxied_value(object, &proxied_value);
}
- if (o) {
- member = Z_STR_P(o);
- } else {
+ if (!member) {
member = zend_long_to_str(zend_hash_next_free_element(
Z_ARRVAL(proxied_value)));
}
proxy = php_property_proxy_init(&proxied_value, member);
zval_ptr_dtor(&proxied_value);
- if (!o) {
- zend_string_release(member);
- }
-
- proxy_obj = new_propro(NULL, proxy);
+ proxy_obj = php_property_proxy_object_new_ex(NULL, proxy);
ZVAL_COPY(&proxy_obj->parent, object);
RETVAL_OBJ(&proxy_obj->zo);
}
- if (o && o != offset) {
- zval_ptr_dtor(o);
+ if (member) {
+ zend_string_release(member);
}
debug_propro(-1, type == BP_VAR_R ? "dim_read" : "dim_read_ref",
if (Z_ISUNDEF(proxied_value)) {
exists = 0;
} else {
- zval *o = offset;
-
- convert_to_string_ex(o);
+ zend_string *zs = zval_get_string(offset);
if (Z_TYPE(proxied_value) == IS_ARRAY) {
- zval *zentry = zend_symtable_find(Z_ARRVAL(proxied_value), Z_STR_P(o));
+ zval *zentry = zend_symtable_find(Z_ARRVAL(proxied_value), zs);
if (!zentry) {
exists = 0;
}
}
- if (o != offset) {
- zval_ptr_dtor(o);
- }
+ zend_string_release(zs);
}
debug_propro(-1, "dim_exists", get_propro(object), offset, NULL);
static void write_dimension(zval *object, zval *offset, zval *value)
{
- zval proxied_value, *o = offset;
+ zval proxied_value;
debug_propro(1, "dim_write", get_propro(object), offset, value);
SEPARATE_ZVAL(value);
Z_TRY_ADDREF_P(value);
- if (o) {
- convert_to_string_ex(o);
- zend_symtable_update(Z_ARRVAL(proxied_value), Z_STR_P(o), value);
+ if (offset) {
+ zend_string *zs = zval_get_string(offset);
+ zend_symtable_update(Z_ARRVAL(proxied_value), zs, value);
+ zend_string_release(zs);
} else {
zend_hash_next_index_insert(Z_ARRVAL(proxied_value), value);
}
- if (o && o != offset) {
- zval_ptr_dtor(o);
- }
-
set_proxied_value(object, &proxied_value);
debug_propro(-1, "dim_write", get_propro(object), offset, &proxied_value);
debug_propro(1, "dim_unset", get_propro(object), offset, NULL);
- get_proxied_value(object, &proxied_value TSRMLS_CC);
+ ZVAL_UNDEF(&proxied_value);
+ get_proxied_value(object, &proxied_value);
if (Z_TYPE(proxied_value) == IS_ARRAY) {
zval *o = offset;
INIT_NS_CLASS_ENTRY(ce, "php", "PropertyProxy",
php_property_proxy_method_entry);
php_property_proxy_class_entry = zend_register_internal_class(&ce);
- php_property_proxy_class_entry->create_object = create_obj;
+ php_property_proxy_class_entry->create_object = php_property_proxy_object_new;
php_property_proxy_class_entry->ce_flags |= ZEND_ACC_FINAL;
memcpy(&php_property_proxy_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
php_property_proxy_object_handlers.offset = XtOffsetOf(php_property_proxy_object_t, zo);
- php_property_proxy_object_handlers.dtor_obj = destroy_obj;
+ php_property_proxy_object_handlers.free_obj = destroy_obj;
php_property_proxy_object_handlers.set = set_proxied_value;
php_property_proxy_object_handlers.get = get_proxied_value;
php_property_proxy_object_handlers.cast_object = cast_proxied_value;