X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_object.c;h=77207ea82f35136f83f36603ed407b7652e143ee;hp=c471edfcf56d83a7f0bf090bfb7081d8babc6ca1;hb=753359f19c5d29f08faca43ee735c49c217230a7;hpb=4be7248e5507090aeb09ade52e3de372e2a11dd5

diff --git a/src/php_pq_object.c b/src/php_pq_object.c
index c471edf..77207ea 100644
--- a/src/php_pq_object.c
+++ b/src/php_pq_object.c
@@ -99,13 +99,6 @@ HashTable *php_pq_object_properties(zval *object TSRMLS_DC)
 	return ht;
 }
 
-HashTable *php_pq_object_gc(zval *object, zval ***gc_argv, int *gc_argc TSRMLS_DC)
-{
-	*gc_argv = NULL;
-	*gc_argc = 0;
-	return NULL;
-}
-
 zend_class_entry *ancestor(zend_class_entry *ce)
 {
 	while (ce->parent) {
@@ -118,23 +111,22 @@ zval *php_pq_object_read_prop(zval *object, zval *member, int type, const zend_l
 {
 	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 {
+		php_error(E_RECOVERABLE_ERROR, "%s not initialized", ancestor(obj->zo.ce)->name);
+		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) {
+		php_error(E_WARNING, "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;
@@ -145,7 +137,10 @@ void php_pq_object_write_prop(zval *object, zval *member, zval *value, const zen
 	php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
 	php_pq_object_prophandler_t *handler;
 
-	if (SUCCESS == zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
+	if (!obj->intern) {
+		php_error(E_RECOVERABLE_ERROR, "%s not initialized", ancestor(obj->zo.ce)->name);
+		zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC);
+	} else if (SUCCESS == zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
 		if (handler->write) {
 			handler->write(object, obj, value TSRMLS_CC);
 		}