projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
restore PHP 7 compatibility
[m6w6/ext-pq]
/
src
/
php_pq_object.c
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);
-#el
se
+#el
if 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);