if (addref) {
Z_ADDREF_P(property);
}
- zend_hash_add(ht, pi->name, pi->name_length + 1, (void *) &property, sizeof(zval *), NULL);
+ zend_hash_update(ht, pi->name, pi->name_length + 1, (void *) &property, sizeof(zval *), NULL);
return ZEND_HASH_APPLY_KEEP;
}
return ht;
}
+HashTable *php_pq_object_properties(zval *object TSRMLS_DC)
+{
+ HashTable *ht = zend_get_std_object_handlers()->get_properties(object TSRMLS_CC);
+ php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+
+ zend_hash_apply_with_arguments(&obj->zo.ce->properties_info TSRMLS_CC, apply_pi_to_ht, 4, ht, object, obj, 1);
+
+ return ht;
+}
+
zend_class_entry *ancestor(zend_class_entry *ce)
{
while (ce->parent) {
{
php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
php_pq_object_prophandler_t *handler;
- zval *return_value;
+ zval *return_value = NULL;
if (!obj->intern) {
zend_error(E_WARNING, "%s not initialized", ancestor(obj->zo.ce)->name);
- } else if ((SUCCESS == zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) && handler->read) {
- if (type == BP_VAR_R) {
- ALLOC_ZVAL(return_value);
- Z_SET_REFCOUNT_P(return_value, 0);
- Z_UNSET_ISREF_P(return_value);
-
- handler->read(object, obj, return_value TSRMLS_CC);
- } else {
- zend_error(E_ERROR, "Cannot access %s properties by reference or array key/index", ancestor(obj->zo.ce)->name);
- return_value = NULL;
- }
- } else {
return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
+ } else if ((SUCCESS != zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) || !handler->read) {
+ return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
+ } else if (type != BP_VAR_R) {
+ zend_error(E_ERROR, "Cannot access %s properties by reference or array key/index", ancestor(obj->zo.ce)->name);
+ return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
+ } else {
+ ALLOC_ZVAL(return_value);
+ Z_SET_REFCOUNT_P(return_value, 0);
+ Z_UNSET_ISREF_P(return_value);
+
+ handler->read(object, obj, return_value TSRMLS_CC);
}
return return_value;