Merge bitbucket.org:mike_php_net/ext-propro release-0.1.0
authorMichael Wallner <mike@php.net>
Sat, 16 Feb 2013 23:10:59 +0000 (00:10 +0100)
committerMichael Wallner <mike@php.net>
Sat, 16 Feb 2013 23:10:59 +0000 (00:10 +0100)
.gitignore
CREDITS [new file with mode: 0644]
LICENSE [new file with mode: 0644]
config.m4 [new file with mode: 0644]
package.xml [new file with mode: 0644]
php_propro.c [new file with mode: 0644]
php_propro.h [new file with mode: 0644]
tests/001.phpt [new file with mode: 0644]
tests/002.phpt [new file with mode: 0644]

index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..20c5e8b98fe81182da1f40c102f0dc8bc7eb3bc8 100644 (file)
@@ -0,0 +1,23 @@
+
+# /
+*~
+/*.tgz
+/.deps
+/*.lo
+/*.la
+/config.[^m]*
+/configure*
+/lib*
+/ac*.m4
+/ltmain.sh
+/install-sh
+/Make*
+/mk*
+/missing
+/.libs
+/build
+/include
+/modules
+/autom4te*
+/.dep.inc
+run-tests.php
diff --git a/CREDITS b/CREDITS
new file mode 100644 (file)
index 0000000..28b53ed
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1 @@
+propro
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..c26019a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2013, Michael Wallner <mike@php.net>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright 
+      notice, this list of conditions and the following disclaimer in the 
+      documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE 
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/config.m4 b/config.m4
new file mode 100644 (file)
index 0000000..925eebb
--- /dev/null
+++ b/config.m4
@@ -0,0 +1,7 @@
+PHP_ARG_ENABLE(propro, whether to enable property proxy support,
+[  --enable-propro           Enable property proxy support])
+
+if test "$PHP_PROPRO" != "no"; then
+       PHP_INSTALL_HEADERS(ext/propro, php_propro.h)
+       PHP_NEW_EXTENSION(propro, php_propro.c, $ext_shared)
+fi
diff --git a/package.xml b/package.xml
new file mode 100644 (file)
index 0000000..bdc20de
--- /dev/null
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package 
+ packagerversion="1.4.11" 
+ version="2.0" 
+ xmlns="http://pear.php.net/dtd/package-2.0" 
+ xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" 
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
+ <name>propro</name>
+ <channel>pecl.php.net</channel>
+ <summary>Property proxy</summary>
+ <description>A reusable split-off of pecl_http's property proxy API.</description>
+ <lead>
+  <name>Michael Wallner</name>
+  <user>mike</user>
+  <email>mike@php.net</email>
+  <active>yes</active>
+ </lead>
+ <date>2013-02-16</date>
+ <version>
+  <release>0.1.0</release>
+  <api>0.1.0</api>
+ </version>
+ <stability>
+  <release>beta</release>
+  <api>beta</api>
+ </stability>
+ <license>BSD, revised</license>
+ <notes><![CDATA[
+* Initial split-off release
+]]></notes>
+ <contents>
+  <dir name="/">
+   <file role="doc" name="CREDITS" />
+   <file role="doc" name="LICENSE" />
+   <file role="src" name="config.m4" />
+   <file role="src" name="php_propro.h" />
+   <file role="src" name="php_propro.c" />
+   <dir name="tests">
+    <file role="test" name="001.phpt" />
+    <file role="test" name="002.phpt" />
+   </dir>
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.3</min>
+   </php>
+   <pearinstaller>
+    <min>1.4.0</min>
+   </pearinstaller>
+  </required>
+ </dependencies>
+ <providesextension>propro</providesextension>
+ <extsrcrelease>
+  <configureoption default="yes" name="enable-propro" prompt="whether to enable property proxy support" />
+ </extsrcrelease>
+</package>
+
diff --git a/php_propro.c b/php_propro.c
new file mode 100644 (file)
index 0000000..b63caa7
--- /dev/null
@@ -0,0 +1,533 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: propro                                                     |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2013 Michael Wallner <mike@php.net>                  |
+    +--------------------------------------------------------------------+
+*/
+
+
+#ifdef HAVE_CONFIG_H
+#      include "config.h"
+#endif
+
+#include <php.h>
+#include <ext/standard/info.h>
+
+#include "php_propro.h"
+
+typedef int STATUS;
+
+#define DEBUG_PROPRO 0
+
+#if PHP_VERSION_ID < 50400
+#      define object_properties_init(o, ce) zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*))
+#endif
+
+PHP_PROPRO_API php_property_proxy_t *php_property_proxy_init(zval *container, const char *member_str, size_t member_len TSRMLS_DC)
+{
+       php_property_proxy_t *proxy = ecalloc(1, sizeof(*proxy));
+
+       Z_ADDREF_P(container);
+       proxy->container = container;
+       proxy->member_str = estrndup(member_str, member_len);
+       proxy->member_len = member_len;
+
+       return proxy;
+}
+
+PHP_PROPRO_API void php_property_proxy_free(php_property_proxy_t **proxy)
+{
+       if (*proxy) {
+               zval_ptr_dtor(&(*proxy)->container);
+               efree((*proxy)->member_str);
+               efree(*proxy);
+               *proxy = NULL;
+       }
+}
+
+static zend_class_entry *php_property_proxy_class_entry;
+static zend_object_handlers php_property_proxy_object_handlers;
+
+PHP_PROPRO_API zend_class_entry *php_property_proxy_get_class_entry(void)
+{
+       return php_property_proxy_class_entry;
+}
+
+PHP_PROPRO_API zend_object_value php_property_proxy_object_new(zend_class_entry *ce TSRMLS_DC)
+{
+       return php_property_proxy_object_new_ex(ce, NULL, NULL TSRMLS_CC);
+}
+
+static void php_property_proxy_object_free(void *object TSRMLS_DC)
+{
+       php_property_proxy_object_t *o = object;
+
+#if DEBUG_PROPRO
+       fprintf(stderr, "#PP %p free\n", o);
+#endif
+
+       if (o->proxy) {
+               php_property_proxy_free(&o->proxy);
+       }
+       if (o->parent) {
+               zend_objects_store_del_ref_by_handle_ex(o->parent->zv.handle, o->parent->zv.handlers TSRMLS_CC);
+               o->parent = NULL;
+       }
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(o);
+}
+
+PHP_PROPRO_API zend_object_value php_property_proxy_object_new_ex(zend_class_entry *ce, php_property_proxy_t *proxy, php_property_proxy_object_t **ptr TSRMLS_DC)
+{
+       php_property_proxy_object_t *o;
+
+       o = ecalloc(1, sizeof(*o));
+       zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
+       object_properties_init((zend_object *) o, ce);
+
+       if (ptr) {
+               *ptr = o;
+       }
+       o->proxy = proxy;
+
+       o->zv.handle = zend_objects_store_put(o, NULL, php_property_proxy_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_property_proxy_object_handlers;
+
+#if DEBUG_PROPRO
+       fprintf(stderr, "#PP %p init\n", o);
+#endif
+
+       return o->zv;
+}
+
+#if DEBUG_PROPRO
+/* we do not really care about TS when debugging */
+static int level = 1;
+static const char space[] = "                               ";
+static const char *inoutstr[] = {"< return",""," > enter"};
+static void _walk(php_property_proxy_object_t *obj TSRMLS_DC)
+{
+       if (obj) {
+               _walk(obj->parent TSRMLS_CC);
+               fprintf(stderr, ".%s", obj->proxy->member_str);
+       }
+}
+
+static void debug_propro(int inout, const char *f, zval *object, zval *offset, zval *value TSRMLS_DC)
+{
+       php_property_proxy_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+
+       fprintf(stderr, "#PP %p %s %s %s ", obj, &space[sizeof(space)-level], inoutstr[inout+1], f);
+
+       level += inout;
+
+       _walk(obj TSRMLS_CC);
+
+       if (*f++=='d'
+       &&      *f++=='i'
+       &&      *f++=='m'
+       ) {
+               char *offset_str = "[]";
+               zval *o = offset;
+
+               if (o) {
+                       convert_to_string_ex(&o);
+                       offset_str = Z_STRVAL_P(o);
+               }
+
+               fprintf(stderr, ".%s", offset_str);
+
+               if (o && o != offset) {
+                       zval_ptr_dtor(&o);
+               }
+       }
+       if (value) {
+               const char *t[] = {
+                               "NULL",
+                               "int",
+                               "float",
+                               "bool",
+                               "Array",
+                               "Object",
+                               "string",
+                               "resource",
+                               "const",
+                               "const Array",
+                               "callable"
+               };
+               fprintf(stderr, " = (%s) ", t[Z_TYPE_P(value)&0xf]);
+               zend_print_flat_zval_r(value TSRMLS_CC);
+       }
+
+       fprintf(stderr, "\n");
+}
+#else
+#define debug_propro(l, f, obj, off, val)
+#endif
+
+static zval *get_parent_proxied_value(zval *object TSRMLS_DC);
+static zval *get_proxied_value(zval *object TSRMLS_DC);
+static zval *read_dimension(zval *object, zval *offset, int type TSRMLS_DC);
+static STATUS cast_proxied_value(zval *object, zval *return_value, int type TSRMLS_DC);
+static void write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC);
+static void set_proxied_value(zval **object, zval *value TSRMLS_DC);
+
+static zval *get_parent_proxied_value(zval *object TSRMLS_DC)
+{
+       zval *value = NULL;
+       php_property_proxy_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+
+       if (obj->proxy) {
+               if (obj->parent) {
+                       zval *parent;
+
+                       MAKE_STD_ZVAL(parent);
+                       parent->type = IS_OBJECT;
+                       parent->value.obj = obj->parent->zv;
+                       zend_objects_store_add_ref_by_handle(obj->parent->zv.handle TSRMLS_CC);
+                       value = get_proxied_value(parent TSRMLS_CC);
+                       zval_ptr_dtor(&parent);
+               }
+       }
+
+       return value;
+}
+
+static zval *get_proxied_value(zval *object TSRMLS_DC)
+{
+       zval **hash_value, *value = NULL;
+       php_property_proxy_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+
+       debug_propro(1, "get", object, NULL, NULL TSRMLS_CC);
+
+       if (obj->proxy) {
+               if (obj->parent) {
+                       zval *parent_value = get_parent_proxied_value(object TSRMLS_CC);
+
+                       if (parent_value && parent_value != obj->proxy->container) {
+                               Z_ADDREF_P(parent_value);
+                               zval_ptr_dtor(&obj->proxy->container);
+                               obj->proxy->container = parent_value;
+                       }
+               }
+               switch (Z_TYPE_P(obj->proxy->container)) {
+               case IS_OBJECT:
+                       value = zend_read_property(Z_OBJCE_P(obj->proxy->container), obj->proxy->container, obj->proxy->member_str, obj->proxy->member_len, 0 TSRMLS_CC);
+                       break;
+
+               case IS_ARRAY:
+                       if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(obj->proxy->container), obj->proxy->member_str, obj->proxy->member_len + 1, (void *) &hash_value)) {
+                               value = *hash_value;
+                       }
+                       break;
+               }
+       }
+
+       debug_propro(-1, "get", object, NULL, value TSRMLS_CC);
+
+       return value;
+}
+
+static STATUS cast_proxied_value(zval *object, zval *return_value, int type TSRMLS_DC)
+{
+       zval *proxied_value;
+
+       if ((proxied_value = get_proxied_value(object TSRMLS_CC))) {
+               RETVAL_ZVAL(proxied_value, 1, 0);
+               if (Z_TYPE_P(proxied_value) != type) {
+                       convert_to_explicit_type(return_value, type);
+               }
+               return SUCCESS;
+       }
+
+       return FAILURE;
+}
+
+static void set_proxied_value(zval **object, zval *value TSRMLS_DC)
+{
+       php_property_proxy_object_t *obj = zend_object_store_get_object(*object TSRMLS_CC);
+
+       debug_propro(1, "set", *object, NULL, value TSRMLS_CC);
+
+       if (obj->proxy) {
+               if (obj->parent) {
+                       zval *parent_value = get_parent_proxied_value(*object TSRMLS_CC);
+
+                       if (parent_value && parent_value != obj->proxy->container) {
+                               Z_ADDREF_P(parent_value);
+                               zval_ptr_dtor(&obj->proxy->container);
+                               obj->proxy->container = parent_value;
+                       }
+               }
+
+               switch (Z_TYPE_P(obj->proxy->container)) {
+               case IS_OBJECT:
+                       zend_update_property(Z_OBJCE_P(obj->proxy->container), obj->proxy->container, obj->proxy->member_str, obj->proxy->member_len, value TSRMLS_CC);
+                       break;
+
+               case IS_ARRAY:
+                       Z_ADDREF_P(value);
+                       zend_symtable_update(Z_ARRVAL_P(obj->proxy->container), obj->proxy->member_str, obj->proxy->member_len + 1, (void *) &value, sizeof(zval *), NULL);
+                       break;
+               }
+
+               if (obj->parent) {
+                       zval *zparent;
+                       MAKE_STD_ZVAL(zparent);
+                       zparent->type = IS_OBJECT;
+                       zparent->value.obj = obj->parent->zv;
+                       zend_objects_store_add_ref_by_handle(obj->parent->zv.handle TSRMLS_CC);
+                       set_proxied_value(&zparent, obj->proxy->container TSRMLS_CC);
+                       zval_ptr_dtor(&zparent);
+               }
+       }
+
+       debug_propro(-1, "set", *object, NULL, NULL TSRMLS_CC);
+}
+
+static zval *read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
+{
+       zval *value = NULL;
+       zval *proxied_value;
+       zval *o = offset;
+
+       debug_propro(1, type == BP_VAR_R ? "dim_read" : "dim_read_ref", object, offset, NULL TSRMLS_CC);
+
+       proxied_value = get_proxied_value(object TSRMLS_CC);
+       convert_to_string_ex(&o);
+
+       if (BP_VAR_R == type && proxied_value) {
+               if (Z_TYPE_P(proxied_value) == IS_ARRAY) {
+                       zval **hash_value;
+                       if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(proxied_value), Z_STRVAL_P(o), Z_STRLEN_P(o), (void *) &hash_value)) {
+                               Z_ADDREF_PP(hash_value);
+                               value = *hash_value;
+                       }
+               }
+       } else {
+               php_property_proxy_t *proxy;
+               php_property_proxy_object_t *proxy_obj;
+
+               if (proxied_value) {
+                       convert_to_array(proxied_value);
+                       Z_ADDREF_P(proxied_value);
+               } else {
+                       MAKE_STD_ZVAL(proxied_value);
+                       array_init(proxied_value);
+                       set_proxied_value(&object, proxied_value TSRMLS_CC);
+               }
+
+               proxy = php_property_proxy_init(proxied_value, Z_STRVAL_P(o), Z_STRLEN_P(o) TSRMLS_CC);
+               zval_ptr_dtor(&proxied_value);
+               MAKE_STD_ZVAL(value);
+               Z_SET_REFCOUNT_P(value, 0);
+               value->type = IS_OBJECT;
+               value->value.obj = php_property_proxy_object_new_ex(php_property_proxy_get_class_entry(), proxy, &proxy_obj TSRMLS_CC);
+               proxy_obj->parent = zend_object_store_get_object(object TSRMLS_CC);
+               zend_objects_store_add_ref_by_handle(proxy_obj->parent->zv.handle TSRMLS_CC);
+       }
+       if (o && o != offset) {
+               zval_ptr_dtor(&o);
+       }
+
+       debug_propro(-1, type == BP_VAR_R ? "dim_read" : "dim_read_ref", object, offset, value TSRMLS_CC);
+
+       return value;
+}
+
+static int has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC)
+{
+       zval *proxied_value;
+       int exists = 0;
+
+       debug_propro(1, "dim_exists", object, offset, NULL TSRMLS_CC);
+
+       proxied_value = get_proxied_value(object TSRMLS_CC);
+       if (!proxied_value) {
+               exists = 0;
+       } else {
+               zval *o = offset;
+
+               convert_to_string_ex(&o);
+
+               if (Z_TYPE_P(proxied_value) == IS_ARRAY) {
+                       zval **zentry;
+
+                       if (SUCCESS != zend_symtable_find(Z_ARRVAL_P(proxied_value), Z_STRVAL_P(o), Z_STRLEN_P(o) + 1, (void *) &zentry)) {
+                               exists = 0;
+                       } else {
+                               if (check_empty) {
+                                       exists = Z_TYPE_PP(zentry) != IS_NULL;
+                               } else {
+                                       exists = 1;
+                               }
+                       }
+               }
+
+               if (o != offset) {
+                       zval_ptr_dtor(&o);
+               }
+       }
+
+       debug_propro(-1, "dim_exists", object, offset, NULL TSRMLS_CC);
+
+       return exists;
+}
+
+static void write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC)
+{
+       zval *proxied_value, *o = offset;
+
+       debug_propro(1, "dim_write", object, offset, value TSRMLS_CC);
+
+       proxied_value = get_proxied_value(object TSRMLS_CC);
+
+       if (proxied_value) {
+               convert_to_array(proxied_value);
+               Z_ADDREF_P(proxied_value);
+       } else {
+               MAKE_STD_ZVAL(proxied_value);
+               array_init(proxied_value);
+       }
+
+       if (Z_REFCOUNT_P(value) > 1) {
+               SEPARATE_ZVAL(&value);
+       }
+       Z_ADDREF_P(value);
+
+       if (o) {
+               convert_to_string_ex(&o);
+               zend_symtable_update(Z_ARRVAL_P(proxied_value), Z_STRVAL_P(o), Z_STRLEN_P(o) + 1, (void *) &value, sizeof(zval *), NULL);
+       } else {
+               zend_hash_next_index_insert(Z_ARRVAL_P(proxied_value), (void *) &value, sizeof(zval *), NULL);
+       }
+
+       if (o && o != offset) {
+               zval_ptr_dtor(&o);
+       }
+
+       set_proxied_value(&object, proxied_value TSRMLS_CC);
+
+       debug_propro(-1, "dim_write", object, offset, proxied_value TSRMLS_CC);
+
+       zval_ptr_dtor(&proxied_value);
+}
+
+static void unset_dimension(zval *object, zval *offset TSRMLS_DC)
+{
+       zval *proxied_value;
+
+       debug_propro(1, "dim_unset", object, offset, NULL TSRMLS_CC);
+
+       proxied_value = get_proxied_value(object TSRMLS_CC);
+
+       if (proxied_value && Z_TYPE_P(proxied_value) == IS_ARRAY) {
+               zval *o = offset;
+
+               convert_to_string_ex(&o);
+
+               if (SUCCESS == zend_symtable_del(Z_ARRVAL_P(proxied_value), Z_STRVAL_P(o), Z_STRLEN_P(o) + 1)) {
+                       set_proxied_value(&object, proxied_value TSRMLS_CC);
+               }
+
+               if (o != offset) {
+                       zval_ptr_dtor(&o);
+               }
+       }
+
+       debug_propro(-1, "dim_unset", object, offset, proxied_value TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_propro_construct, 0, 0, 2)
+       ZEND_ARG_INFO(1, object)
+       ZEND_ARG_INFO(0, member)
+       ZEND_ARG_OBJ_INFO(0, parent, php\\PropertyProxy, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(propro, __construct) {
+       zend_error_handling zeh;
+       zval *container, *parent = NULL;
+       char *member_str;
+       int member_len;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|O!", &container, &member_str, &member_len, &parent, php_property_proxy_class_entry)) {
+               php_property_proxy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               obj->proxy = php_property_proxy_init(container, member_str, member_len TSRMLS_CC);
+               if (parent) {
+                       zend_objects_store_add_ref(parent TSRMLS_CC);
+                       obj->parent = zend_object_store_get_object(parent TSRMLS_CC);
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+static const zend_function_entry php_property_proxy_method_entry[] = {
+       PHP_ME(propro, __construct, ai_propro_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       {0}
+};
+
+static PHP_MINIT_FUNCTION(propro)
+{
+       zend_class_entry ce = {0};
+
+       INIT_NS_CLASS_ENTRY(ce, "php", "PropertyProxy", php_property_proxy_method_entry);
+       php_property_proxy_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
+       php_property_proxy_class_entry->create_object = php_property_proxy_object_new;
+       php_property_proxy_class_entry->ce_flags |= ZEND_ACC_FINAL_CLASS;
+
+       memcpy(&php_property_proxy_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       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;
+       php_property_proxy_object_handlers.read_dimension = read_dimension;
+       php_property_proxy_object_handlers.write_dimension = write_dimension;
+       php_property_proxy_object_handlers.has_dimension = has_dimension;
+       php_property_proxy_object_handlers.unset_dimension = unset_dimension;
+
+       return SUCCESS;
+}
+
+PHP_MINFO_FUNCTION(propro)
+{
+       php_info_print_table_start();
+       php_info_print_table_header(2, "Property proxy support", "enabled");
+       php_info_print_table_row(2, "Extension version", PHP_PROPRO_VERSION);
+       php_info_print_table_end();
+}
+
+static const zend_function_entry propro_functions[] = {
+       {0}
+};
+
+zend_module_entry propro_module_entry = {
+       STANDARD_MODULE_HEADER,
+       "propro",
+       propro_functions,
+       PHP_MINIT(propro),
+       NULL,
+       NULL,
+       NULL,
+       PHP_MINFO(propro),
+       PHP_PROPRO_VERSION,
+       STANDARD_MODULE_PROPERTIES
+};
+
+#ifdef COMPILE_DL_PROPRO
+ZEND_GET_MODULE(propro)
+#endif
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/php_propro.h b/php_propro.h
new file mode 100644 (file)
index 0000000..f26cab0
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: propro                                                     |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2013 Michael Wallner <mike@php.net>                  |
+    +--------------------------------------------------------------------+
+*/
+
+#ifndef PHP_PROPRO_H
+#define PHP_PROPRO_H
+
+extern zend_module_entry propro_module_entry;
+#define phpext_propro_ptr &propro_module_entry
+
+#define PHP_PROPRO_VERSION "0.1.0"
+
+#ifdef PHP_WIN32
+#      define PHP_PROPRO_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#      define PHP_PROPRO_API __attribute__ ((visibility("default")))
+#else
+#      define PHP_PROPRO_API
+#endif
+
+#ifdef ZTS
+#      include <TSRM/TSRM.h>
+#endif
+
+typedef struct php_property_proxy {
+       zval *container;
+       char *member_str;
+       size_t member_len;
+} php_property_proxy_t;
+
+typedef struct php_property_proxy_object {
+       zend_object zo;
+       zend_object_value zv;
+       php_property_proxy_t *proxy;
+       struct php_property_proxy_object *parent;
+} php_property_proxy_object_t;
+
+PHP_PROPRO_API php_property_proxy_t *php_property_proxy_init(zval *container, const char *member_str, size_t member_len TSRMLS_DC);
+PHP_PROPRO_API void php_property_proxy_free(php_property_proxy_t **proxy);
+
+PHP_PROPRO_API zend_class_entry *php_property_proxy_get_class_entry(void);
+
+PHP_PROPRO_API zend_object_value php_property_proxy_object_new(zend_class_entry *ce TSRMLS_DC);
+PHP_PROPRO_API zend_object_value php_property_proxy_object_new_ex(zend_class_entry *ce, php_property_proxy_t *proxy, php_property_proxy_object_t **ptr TSRMLS_DC);
+
+#endif /* PHP_PROPRO_H */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/tests/001.phpt b/tests/001.phpt
new file mode 100644 (file)
index 0000000..45b07db
--- /dev/null
@@ -0,0 +1,64 @@
+--TEST--
+property proxy
+--SKIPIF--
+<?php if (!extension_loaded("propro")) print "skip"; ?>
+--FILE--
+<?php
+
+echo "Test\n";
+
+class c {
+       private $prop;
+       private $anon;
+       function __get($p) {
+               return new php\PropertyProxy($this, $p);
+       }
+}
+
+$c = new c;
+
+$p = $c->prop;
+$a = $c->anon;
+
+var_dump($c);
+
+$a = 123; 
+echo $a,"\n";
+
+$p["foo"] = 123;
+$p["bar"]["baz"]["a"]["b"]=987;
+
+var_dump($c);
+
+?>
+DONE
+--EXPECTF--
+Test
+object(c)#%d (2) {
+  ["prop":"c":private]=>
+  NULL
+  ["anon":"c":private]=>
+  NULL
+}
+123
+object(c)#%d (2) {
+  ["prop":"c":private]=>
+  array(2) {
+    ["foo"]=>
+    int(123)
+    ["bar"]=>
+    array(1) {
+      ["baz"]=>
+      array(1) {
+        ["a"]=>
+        array(1) {
+          ["b"]=>
+          int(987)
+        }
+      }
+    }
+  }
+  ["anon":"c":private]=>
+  int(123)
+}
+DONE
diff --git a/tests/002.phpt b/tests/002.phpt
new file mode 100644 (file)
index 0000000..95c9c02
--- /dev/null
@@ -0,0 +1,100 @@
+--TEST--
+property proxy
+--SKIPIF--
+<?php if (!extension_loaded("propro")) print "skip"; ?>
+--FILE--
+<?php
+
+echo "Test\n";
+
+class c {
+       private $storage = array();
+       function __get($p) {
+               return new php\PropertyProxy($this->storage, $p);
+       }
+       function __set($p, $v) {
+               $this->storage[$p] = $v;
+       }
+}
+
+$c = new c;
+$c->data["foo"] = 1;
+var_dump(
+       isset($c->data["foo"]),
+       isset($c->data["bar"])
+);
+
+var_dump($c);
+
+$c->data[] = 1;
+$c->data[] = 2;
+$c->data[] = 3;
+$c->data["bar"][] = 123;
+$c->data["bar"][] = 456;
+
+var_dump($c);
+unset($c->data["bar"][0]);
+
+var_dump($c);
+
+?>
+DONE
+--EXPECTF--
+Test
+bool(true)
+bool(false)
+object(c)#%d (1) {
+  ["storage":"c":private]=>
+  array(1) {
+    ["data"]=>
+    array(1) {
+      ["foo"]=>
+      int(1)
+    }
+  }
+}
+object(c)#%d (1) {
+  ["storage":"c":private]=>
+  array(1) {
+    ["data"]=>
+    array(5) {
+      ["foo"]=>
+      int(1)
+      [0]=>
+      int(1)
+      [1]=>
+      int(2)
+      [2]=>
+      int(3)
+      ["bar"]=>
+      array(2) {
+        [0]=>
+        int(123)
+        [1]=>
+        int(456)
+      }
+    }
+  }
+}
+object(c)#%d (1) {
+  ["storage":"c":private]=>
+  array(1) {
+    ["data"]=>
+    array(5) {
+      ["foo"]=>
+      int(1)
+      [0]=>
+      int(1)
+      [1]=>
+      int(2)
+      [2]=>
+      int(3)
+      ["bar"]=>
+      array(1) {
+        [1]=>
+        int(456)
+      }
+    }
+  }
+}
+DONE