This commit was manufactured by cvs2svn to create tagphp-4.3.0dev_zend2_alpha3

'php_4_3_0_dev_zend2_alpha3'.

1 files changed, 254 insertions, 21 deletions

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 9c131e2626..caae823cc9 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -8,6 +8,23 @@
 
 #define DEBUG_OBJECT_HANDLERS 0
 
+/*
+  __X accessors explanation:
+
+  if we have __get and property that is not part of the properties array is
+  requested, we call __get handler. If it fails, we return uninitialized.
+
+  if we have __set and property that is not part of the properties array is
+  set, we call __set handler. If it fails, we do not change the array.
+
+  for both handlers above, when we are inside __get/__set, no further calls for
+  __get/__set for these objects will be made, to prevent endless recursion and
+  enable accessors to change properties array.
+
+  if we have __call and method which is not part of the class function table is
+  called, we cal __call handler. 
+*/
+
 static HashTable *zend_std_get_properties(zval *object TSRMLS_DC)
 {
 	zend_object *zobj;
@@ -15,11 +32,109 @@ static HashTable *zend_std_get_properties(zval *object TSRMLS_DC)
 	return zobj->properties;
 }
 
+static zval *zend_std_call_getter(zval *object, zval *member TSRMLS_DC)
+{
+	zval **call_args[1];
+	zval *retval = NULL;
+	zval __get_name;
+	int call_result;
+	
+	/* __get handler is called with two arguments:
+	   property name
+	   return value for the object (by reference)
+
+	   it should return whether the call was successfull or not
+	*/
+	INIT_PZVAL(&__get_name);
+	ZVAL_STRINGL(&__get_name, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1, 0);
+
+	call_args[0] = &member;
+
+	/* go call the __get handler */
+	call_result = call_user_function_ex(NULL,
+										&object,
+										&__get_name,
+										&retval,
+										1, call_args,
+										0, NULL TSRMLS_CC);
+
+	/* 
+	   call_result is if call_user_function gone OK.
+	   retval returns the value that is received
+	*/
+	
+
+	if(call_result == FAILURE) {
+		zend_error(E_ERROR, "Could not call __get handler for class %s", Z_OBJCE_P(object)->name);
+		return NULL;
+	}
+
+	retval->refcount--;
+	
+	return retval;
+}
+
+static int zend_std_call_setter(zval *object, zval *member, zval *value TSRMLS_DC)
+{
+	zval **call_args[2];
+	zval *retval = NULL;
+	zval __set_name;
+	int call_result;
+	int ret;
+	
+	/* __set handler is called with two arguments:
+	   property name
+	   value to be set
+
+	   it should return whether the call was successfull or not
+	*/
+	INIT_PZVAL(&__set_name);
+	ZVAL_STRINGL(&__set_name, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1, 0);
+
+	call_args[0] = &member;
+	value->refcount++;
+	call_args[1] = &value;
+
+	/* go call the __set handler */
+	call_result = call_user_function_ex(NULL,
+										&object,
+										&__set_name,
+										&retval,
+										2, call_args,
+										0, NULL TSRMLS_CC);
+
+	/* 
+	   call_result is if call_user_function gone OK.
+	   retval shows if __get method went OK.
+	*/
+	
+
+	if(call_result == FAILURE) {
+		zend_error(E_ERROR, "Could not call __set handler for class %s", Z_OBJCE_P(object)->name);
+		return FAILURE;
+	}
+
+	zval_ptr_dtor(&value);
+
+	if (retval && zval_is_true(retval)) {
+		ret = SUCCESS;
+	} else {
+		ret = FAILURE;
+	}
+
+	if(retval) {
+		zval_ptr_dtor(&retval);
+	}
+	
+	return ret;
+}
+
 zval *zend_std_read_property(zval *object, zval *member, int type TSRMLS_DC)
 {
 	zend_object *zobj;
 	zval tmp_member;
 	zval **retval;
+	zval *rv = NULL;
 	
 	zobj = Z_OBJ_P(object);
 
@@ -35,25 +150,38 @@ zval *zend_std_read_property(zval *object, zval *member, int type TSRMLS_DC)
 #endif			
 	
 	if (zend_hash_find(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &retval) == FAILURE) {
-		switch (type) {
-			case BP_VAR_R: 
-				zend_error(E_NOTICE,"Undefined property:  %s", Z_STRVAL_P(member));
-				/* break missing intentionally */
-			case BP_VAR_IS:
-				retval = &EG(uninitialized_zval_ptr);
-				break;
-			case BP_VAR_RW:
-				zend_error(E_NOTICE,"Undefined property:  %s", Z_STRVAL_P(member));
-				/* break missing intentionally */
-			case BP_VAR_W: {
+		if(zobj->ce->__get && !zobj->in_get) {
+			/* have getter - try with it! */
+			zobj->in_get = 1; /* prevent circular getting */
+			rv = zend_std_call_getter(object, member TSRMLS_CC);
+			zobj->in_get = 0;
+
+			if(rv) {
+				retval = &rv;
+			} else {
+				retval = &EG(uninitialized_zval_ptr);	
+			}
+		} else {
+			switch (type) {
+				case BP_VAR_R: 
+					zend_error(E_NOTICE,"Undefined property:  %s", Z_STRVAL_P(member));
+					/* break missing intentionally */
+				case BP_VAR_IS:
+					retval = &EG(uninitialized_zval_ptr);
+					break;
+				case BP_VAR_RW:
+					zend_error(E_NOTICE,"Undefined property:  %s", Z_STRVAL_P(member));
+					/* break missing intentionally */
+				case BP_VAR_W: {
 					zval *new_zval = &EG(uninitialized_zval);
-				
+					
 					new_zval->refcount++;
 					zend_hash_update(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, &new_zval, sizeof(zval *), (void **) &retval);
-			}
+				}
 				break;
 				EMPTY_SWITCH_DEFAULT_CASE()
-				
+					
+					}
 		}
 	}
 	if (member == &tmp_member) {
@@ -67,6 +195,7 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM
 	zend_object *zobj;
 	zval tmp_member;
 	zval **variable_ptr;
+	int setter_done = 0;
 	
 	zobj = Z_OBJ_P(object);
 
@@ -88,10 +217,21 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM
 				FREE_ZVAL(*variable_ptr);
 			}
 		}
+	} else {
+		if(zobj->ce->__set && !zobj->in_set) {
+			zobj->in_set = 1; /* prevent circular setting */
+			if(zend_std_call_setter(object, member, value TSRMLS_CC) != SUCCESS) {
+//				zend_error(E_NOTICE,"Cannot set undefined property: %s", Z_STRVAL_P(member));
+			}
+			setter_done = 1;
+			zobj->in_set = 0;
+		}
 	}
 
-	value->refcount++;
-	zend_hash_update(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, &value, sizeof(zval *), NULL);
+	if(!setter_done) {
+		value->refcount++;
+		zend_hash_update(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, &value, sizeof(zval *), NULL);
+	}
 	if (member == &tmp_member) {
 		zval_dtor(member);
 	}
@@ -117,11 +257,19 @@ static zval **zend_std_get_property_ptr(zval *object, zval *member TSRMLS_DC)
 #endif			
 
 	if (zend_hash_find(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &retval) == FAILURE) {
-		zval *new_zval = &EG(uninitialized_zval);
+		zval *new_zval;
+
+		if(!zobj->ce->__get) {
+			/* we don't have getter - will just add it */
+			new_zval = &EG(uninitialized_zval);
 
-		zend_error(E_NOTICE, "Undefined property: %s", Z_STRVAL_P(member));
-		new_zval->refcount++;
-		zend_hash_update(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, &new_zval, sizeof(zval *), (void **) &retval);
+			zend_error(E_NOTICE, "Undefined property: %s", Z_STRVAL_P(member));
+			new_zval->refcount++;
+			zend_hash_update(zobj->properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, &new_zval, sizeof(zval *), (void **) &retval);
+		} else {
+			/* we do have getter - fail and let it try again with usual get/set */
+			retval = NULL;
+		}
 	}
 	if (member == &tmp_member) {
 		zval_dtor(member);
@@ -148,12 +296,86 @@ static void zend_std_unset_property(zval *object, zval *member TSRMLS_DC)
 	}
 }
 
+static void zend_std_call_user_call(INTERNAL_FUNCTION_PARAMETERS)
+{
+	zval ***args;
+	zend_internal_function *func = (zend_internal_function *)EG(function_state_ptr)->function;
+	zval method_name, method_args, __call_name;
+	zval *method_name_ptr, *method_args_ptr;
+	zval **call_args[2];
+	zval *method_result_ptr = NULL;
+	int i, call_result;
+	
+	args = (zval ***)emalloc(ZEND_NUM_ARGS() * sizeof(zval **));
+
+	if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
+		efree(args);
+		zend_error(E_ERROR, "Cannot get arguments for __call");
+		RETURN_FALSE;
+	}
+
+	method_name_ptr = &method_name;
+	INIT_PZVAL(method_name_ptr);
+	ZVAL_STRING(method_name_ptr, func->function_name, 0); /* no dup - it's a copy */
+
+	method_args_ptr = &method_args;
+	INIT_PZVAL(method_args_ptr);
+	array_init(method_args_ptr);
+
+	for(i=0; i<ZEND_NUM_ARGS(); i++) {
+		zval_add_ref(args[i]);
+		add_next_index_zval(method_args_ptr, *args[i]);
+	}
+
+	efree(args);
+	
+	INIT_PZVAL(&__call_name);
+	ZVAL_STRINGL(&__call_name, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1, 0);
+	
+	/* __call handler is called with two arguments:
+	   method name
+	   array of method parameters
+
+	*/
+	call_args[0] = &method_name_ptr;
+	call_args[1] = &method_args_ptr;
+
+	/* go call the __call handler */
+	call_result = call_user_function_ex(NULL,
+										&this_ptr,
+										&__call_name,
+										&method_result_ptr,
+										2, call_args,
+										0, NULL TSRMLS_CC);
+
+	/* call_result is if call_user_function gone OK.
+	   method_result_ptr is the true result of the called method
+	*/
+	
+	if(method_result_ptr) {
+		*return_value = *method_result_ptr;
+		zval_copy_ctor(return_value);
+		zval_ptr_dtor(&method_result_ptr);
+	}
+	
+	if(call_result == FAILURE) {
+		zend_error(E_ERROR, "Could not call __call handler for class %s", Z_OBJCE_P(this_ptr)->name);
+	}
+
+	/* now destruct all auxiliaries */
+	zval_dtor(method_args_ptr);
+	zval_dtor(method_name_ptr);
+
+	/* destruct the function also, then - we have allocated it in get_method */
+	efree(func);
+}
+
 static union _zend_function *zend_std_get_method(zval *object, char *method_name, int method_len TSRMLS_DC)
 {
 	zend_object *zobj;
 	zend_function *func_method;
 	char *lc_method_name;
-
+	
 	lc_method_name = do_alloca(method_len+1);
 	/* Create a zend_copy_str_tolower(dest, src, src_length); */
 	memcpy(lc_method_name, method_name, method_len+1);
@@ -161,6 +383,17 @@ static union _zend_function *zend_std_get_method(zval *object, char *method_name
 		
 	zobj = Z_OBJ_P(object);
 	if(zend_hash_find(&zobj->ce->function_table, lc_method_name, method_len+1, (void **)&func_method) == FAILURE) {
+		if(zobj->ce->__call != NULL) {
+			zend_internal_function *call_user_call = emalloc(sizeof(zend_internal_function));
+			call_user_call->type = ZEND_INTERNAL_FUNCTION;
+			call_user_call->handler = zend_std_call_user_call;
+			call_user_call->arg_types = NULL;
+			call_user_call->scope = NULL;
+			call_user_call->function_name = estrndup(method_name, method_len);
+
+			free_alloca(lc_method_name);
+			return (union _zend_function *)call_user_call;
+		}
 		zend_error(E_ERROR, "Call to undefined function %s()", method_name);
 	}