restore PHP 7 compatibility

diff --git a/src/php_pq_misc.h b/src/php_pq_misc.h
index 8c0ea235e10b80b3e1ae1c6c9dad71e09d07b670..07bd5967a1c1c4ea28de2b77d4172f907be399eb 100644 (file)
--- a/src/php_pq_misc.h
+++ b/src/php_pq_misc.h
@@ -90,9 +90,6 @@ extern HashTable *php_pq_parse_array(php_pqres_t *res, const char *val_str, size
 #define php_pq_cast_object(objval_ptr, cast_type, retval_ptr) \
                (Z_OBJ_HT_P(objval_ptr)->cast_object && \
                                SUCCESS == Z_OBJ_HT_P(objval_ptr)->cast_object(objval_ptr, (retval_ptr), (cast_type)))
 #define php_pq_cast_object(objval_ptr, cast_type, retval_ptr) \
                (Z_OBJ_HT_P(objval_ptr)->cast_object && \
                                SUCCESS == Z_OBJ_HT_P(objval_ptr)->cast_object(objval_ptr, (retval_ptr), (cast_type)))

-# if PHP_VERSION_ID <= 70200
-zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv);
-# endif

 #endif
 
 
 #endif
 
 

diff --git a/src/php_pq_object.c b/src/php_pq_object.c
index f84bb28adaba5c50ffdf620221c8966288224610..6d80a1f5547f68364ac86ff424e40eef0d0c2f03 100644 (file)
--- a/src/php_pq_object.c
+++ b/src/php_pq_object.c
@@ -104,8 +104,10 @@ static int apply_pi_to_ht(zval *p, void *a)
 
                ZVAL_OBJ(&zobj, &arg->pq_obj->zo);
                property = zend_read_property_ex(arg->pq_obj->zo.ce, &zobj, pi->name, 0, &tmp_prop);
 
                ZVAL_OBJ(&zobj, &arg->pq_obj->zo);
                property = zend_read_property_ex(arg->pq_obj->zo.ce, &zobj, pi->name, 0, &tmp_prop);

-#else
+#elif PHP_VERSION_ID >= 70100

                property = zend_read_property_ex(arg->pq_obj->zo.ce, &arg->pq_obj->zo, pi->name, 0, &tmp_prop);
                property = zend_read_property_ex(arg->pq_obj->zo.ce, &arg->pq_obj->zo, pi->name, 0, &tmp_prop);

+#else
+               property = zend_read_property(arg->pq_obj->zo.ce, &arg->pq_obj->zo, pi->name->val, pi->name->len, 0, &tmp_prop);

 #endif
                zend_hash_update(arg->ht, pi->name, property);
        }
 #endif
                zend_hash_update(arg->ht, pi->name, property);
        }


@@ -240,7 +242,7 @@ zval *php_pq_object_read_prop(zval *object, zval *member, int type, void **cache
 
        if (SUCCESS != php_pq_object_read_prop_ex(Z_OBJ_P(object), member_str, type, tmp)) {
                zend_string_release(member_str);
 
        if (SUCCESS != php_pq_object_read_prop_ex(Z_OBJ_P(object), member_str, type, tmp)) {
                zend_string_release(member_str);

-               return zend_std_read_property(object, member, type, cache_slot, tmp);
+               return zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp);

        }
        zend_string_release(member_str);
 
        }
        zend_string_release(member_str);