administrativa

diff --git a/package.xml b/package.xml
index f8f9d287f61b7257a48c8904ebfc865d3b0af0a5..ca4cc70524111990092b4feee15bc5f34836f743 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -21,8 +21,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </lead>
  <date>2013-12-05</date>
  <version>
-  <release>1.0.1</release>
-  <api>1.0.0</api>
+  <release>2.0.0-dev</release>
+  <api>2.0.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -30,7 +30,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Internals documentation at http://php.github.io/php/pecl-php-propro
 ]]></notes>
  <contents>
   <dir name="/">
@@ -45,15 +44,14 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <dir name="tests">
     <file role="test" name="001.phpt" />
     <file role="test" name="002.phpt" />
+    <file role="test" name="003.phpt" />
    </dir>
   </dir>
  </contents>
  <dependencies>
   <required>
    <php>
-    <min>5.3.0</min>
-    <max>7.0.0</max>
-    <exclude>7.0.0</exclude>
+    <min>7.0.0</min>
    </php>
    <pearinstaller>
     <min>1.4.0</min>

diff --git a/php_propro.h b/php_propro.h
index 57bf845875e7ca7cc42ed0961e28c49d40de81bb..67520910acde33a4b1dcb4bedebd300930b7033a 100644 (file)
--- a/php_propro.h
+++ b/php_propro.h
@@ -13,8 +13,6 @@
 #ifndef PHP_PROPRO_H
 #define PHP_PROPRO_H
 
-#ifndef DOXYGEN
-
 extern zend_module_entry propro_module_entry;
 #define phpext_propro_ptr &propro_module_entry
 
@@ -34,97 +32,6 @@ extern zend_module_entry propro_module_entry;
 
 #define PHP_PROPRO_PTR(zo) (void*)(((char*)(zo))-(zo)->handlers->offset)
 
-#endif /* DOXYGEN */
-
-/**
- * The internal property proxy.
- *
- * Container for the object/array holding the proxied property.
- */
-struct php_property_proxy {
-       /** The container holding the property */
-       zval container;
-       /** The name of the proxied property */
-       zend_string *member;
-};
-typedef struct php_property_proxy php_property_proxy_t;
-
-/**
- * The userland object.
- *
- * Return an object instance of php\\PropertyProxy to make your C-struct
- * member accessible by reference from PHP userland.
- *
- * Example:
- * ~~~~~~~~~~{.c}
- * static zval *my_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp)
- * {
- *    zval *return_value;
- *    zend_string *member_name = zval_get_string(member);
- *    my_prophandler_t *handler = my_get_prophandler(member_name);
- *
- *    if (!handler || type == BP_VAR_R || type == BP_VAR_IS) {
- *     return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp);
- *
- *     if (handler) {
- *             handler->read(object, tmp);
- *
- *             zval_ptr_dtor(return_value);
- *             ZVAL_COPY_VALUE(return_value, tmp);
- *     }
- *    } else {
- *     return_value = php_property_proxy_zval(object, member_name);
- *    }
- *
- *    zend_string_release(member_name);
- *
- *    return return_value;
- * }
- * ~~~~~~~~~~
- */
-struct php_property_proxy_object {
-       /** The actual property proxy */
-       php_property_proxy_t *proxy;
-       /** Any parent property proxy object */
-       zval parent;
-       /** The std zend_object */
-       zend_object zo;
-};
-typedef struct php_property_proxy_object php_property_proxy_object_t;
-
-PHP_PROPRO_API php_property_proxy_object_t *php_property_proxy_object_new_ex(
-               zend_class_entry *ce, php_property_proxy_t *proxy);
-
-PHP_PROPRO_API zend_object *php_property_proxy_object_new(zend_class_entry *ce);
-
-/**
- * Create a property proxy
- *
- * The property proxy will forward reads and writes to itself to the
- * proxied property with name \a member_str of \a container.
- *
- * @param container the container holding the property
- * @param member the name of the proxied property
- * @return a new property proxy
- */
-PHP_PROPRO_API php_property_proxy_t *php_property_proxy_init(zval *container,
-               zend_string *member);
-
-/**
- * Destroy and free a property proxy.
- *
- * The destruction of the property proxy object calls this.
- *
- * @param proxy a pointer to the allocated property proxy
- */
-PHP_PROPRO_API void php_property_proxy_free(php_property_proxy_t **proxy);
-
-/**
- * Get the zend_class_entry of php\\PropertyProxy
- * @return the class entry pointer
- */
-PHP_PROPRO_API zend_class_entry *php_property_proxy_get_class_entry(void);
-
 #endif /* PHP_PROPRO_H */