Update for new read_property API

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 1163e61d4b9806a0cc907178c6c92ac0d559828d..e6a3ff97e0f80ef627167cc2f30a952936669cf6 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -200,7 +200,7 @@ static void dom_register_prop_handler(HashTable *prop_handler, char *name, dom_r
 /* }}} */
 
 /* {{{ dom_read_property */
-zval *dom_read_property(zval *object, zval *member, zend_bool silent TSRMLS_DC)
+zval *dom_read_property(zval *object, zval *member, int type TSRMLS_DC)
 {
        dom_object *obj;
        zval tmp_member;
@@ -232,7 +232,7 @@ zval *dom_read_property(zval *object, zval *member, zend_bool silent TSRMLS_DC)
                }
        } else {
                std_hnd = zend_get_std_object_handlers();
-               retval = std_hnd->read_property(object, member, silent TSRMLS_CC);
+               retval = std_hnd->read_property(object, member, type TSRMLS_CC);
        }
 
        if (member == &tmp_member) {

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 8404618a3ea872b2f1f2651f829dda04e88d6cfb..75d7f45444b311a8165e47ef9b1e6a0b495529eb 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -160,7 +160,7 @@ static int mysqli_write_na(mysqli_object *obj, zval *newval TSRMLS_DC)
 /* }}} */
 
 /* {{{ mysqli_read_property */
-zval *mysqli_read_property(zval *object, zval *member, zend_bool silent TSRMLS_DC)
+zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
 {
        zval tmp_member;
        zval *retval;
@@ -197,7 +197,7 @@ zval *mysqli_read_property(zval *object, zval *member, zend_bool silent TSRMLS_D
                }
        } else {
                std_hnd = zend_get_std_object_handlers();
-               retval = std_hnd->read_property(object, member, silent TSRMLS_CC);
+               retval = std_hnd->read_property(object, member, type TSRMLS_CC);
        }
 
        if (member == &tmp_member) {

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 54c924cb8ed469cc4d9c70b2707d46a102ea611c..c6f064f6bb5254451a27ab6198d0440cfa8df77e 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -255,9 +255,9 @@ static zval * sxe_prop_dim_read(zval *object, zval *member, zend_bool elements,
 
 /* {{{ sxe_property_read()
  */
-static zval * sxe_property_read(zval *object, zval *member, zend_bool silent TSRMLS_DC)
+static zval * sxe_property_read(zval *object, zval *member, int type TSRMLS_DC)
 {
-       return sxe_prop_dim_read(object, member, 1, 0, silent TSRMLS_CC);
+       return sxe_prop_dim_read(object, member, 1, 0, type == BP_VAR_IS TSRMLS_CC);
 }
 /* }}} */