Use better data structures (incomplete)

1 files changed, 294 insertions, 294 deletions

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 6ec094ac3c..92457fa0f7 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -66,9 +66,9 @@ static void spl_filesystem_file_free_line(spl_filesystem_object *intern TSRMLS_D
 		efree(intern->u.file.current_line);
 		intern->u.file.current_line = NULL;
 	}
-	if (intern->u.file.current_zval) {
+	if (!ZVAL_IS_UNDEF(&intern->u.file.current_zval)) {
 		zval_ptr_dtor(&intern->u.file.current_zval);
-		intern->u.file.current_zval = NULL;
+		ZVAL_UNDEF(&intern->u.file.current_zval);
 	}
 } /* }}} */
 
@@ -102,9 +102,11 @@ static void spl_filesystem_object_free_storage(void *object TSRMLS_DC) /* {{{ */
 		break;
 	case SPL_FS_FILE:
 		if (intern->u.file.stream) {
+			/*
 			if (intern->u.file.zcontext) {
-/*				zend_list_delref(Z_RESVAL_P(intern->zcontext));*/
+			   zend_list_delref(Z_RESVAL_P(intern->zcontext));
 			}
+			*/
 			if (!intern->u.file.stream->is_persistent) {
 				php_stream_free(intern->u.file.stream, PHP_STREAM_FREE_CLOSE);
 			} else {
@@ -144,9 +146,8 @@ static void spl_filesystem_object_free_storage(void *object TSRMLS_DC) /* {{{ */
    - clone
    - new
  */
-static zend_object_value spl_filesystem_object_new_ex(zend_class_entry *class_type, spl_filesystem_object **obj TSRMLS_DC)
+static zend_object *spl_filesystem_object_new_ex(zend_class_entry *class_type TSRMLS_DC)
 {
-	zend_object_value retval;
 	spl_filesystem_object *intern;
 
 	intern = emalloc(sizeof(spl_filesystem_object));
@@ -154,35 +155,33 @@ static zend_object_value spl_filesystem_object_new_ex(zend_class_entry *class_ty
 	/* intern->type = SPL_FS_INFO; done by set 0 */
 	intern->file_class = spl_ce_SplFileObject;
 	intern->info_class = spl_ce_SplFileInfo;
-	if (obj) *obj = intern;
 
 	zend_object_std_init(&intern->std, class_type TSRMLS_CC);
 	object_properties_init(&intern->std, class_type);
 
-	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) spl_filesystem_object_free_storage, NULL TSRMLS_CC);
-	retval.handlers = &spl_filesystem_object_handlers;
-	return retval;
+	zend_objects_store_put(&intern->std TSRMLS_CC);
+	intern->std.handlers = &spl_filesystem_object_handlers;
+	return &intern->std;
 }
 /* }}} */
 
 /* {{{ spl_filesystem_object_new */
 /* See spl_filesystem_object_new_ex */
-static zend_object_value spl_filesystem_object_new(zend_class_entry *class_type TSRMLS_DC)
+static zend_object *spl_filesystem_object_new(zend_class_entry *class_type TSRMLS_DC)
 {
-	return spl_filesystem_object_new_ex(class_type, NULL TSRMLS_CC);
+	return spl_filesystem_object_new_ex(class_type TSRMLS_CC);
 }
 /* }}} */
 
-/* {{{ spl_filesystem_object_new_ex */
-static zend_object_value spl_filesystem_object_new_check(zend_class_entry *class_type TSRMLS_DC)
+/* {{{ spl_filesystem_object_new_check */
+static zend_object *spl_filesystem_object_new_check(zend_class_entry *class_type TSRMLS_DC)
 {
-	zend_object_value ret = spl_filesystem_object_new_ex(class_type, NULL TSRMLS_CC);
-	ret.handlers = &spl_filesystem_object_check_handlers;
-	return ret;
+	spl_filesystem_object *ret = (spl_filesystem_object *)spl_filesystem_object_new_ex(class_type TSRMLS_CC);
+	ret->std.handlers = &spl_filesystem_object_check_handlers;
+	return &ret->std;
 }
 /* }}} */
 
-
 PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, int *len TSRMLS_DC) /* {{{ */
 {
 #ifdef HAVE_GLOB
@@ -270,7 +269,7 @@ static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path TS
 
 static int spl_filesystem_file_open(spl_filesystem_object *intern, int use_include_path, int silent TSRMLS_DC) /* {{{ */
 {
-	zval  tmp;
+	zval tmp;
 
 	intern->type = SPL_FS_FILE;
 
@@ -282,7 +281,7 @@ static int spl_filesystem_file_open(spl_filesystem_object *intern, int use_inclu
 		return FAILURE;
 	}
 
-	intern->u.file.context = php_stream_context_from_zval(intern->u.file.zcontext, 0);
+	intern->u.file.context = php_stream_context_from_zval(&intern->u.file.zcontext, 0);
 	intern->u.file.stream = php_stream_open_wrapper_ex(intern->file_name, intern->u.file.open_mode, (use_include_path ? USE_PATH : 0) | REPORT_ERRORS, NULL, intern->u.file.context);
 
 	if (!intern->file_name_len || !intern->u.file.stream) {
@@ -294,7 +293,7 @@ static int spl_filesystem_file_open(spl_filesystem_object *intern, int use_inclu
 		return FAILURE;
 	}
 
-	if (intern->u.file.zcontext) {
+	if (!ZVAL_IS_UNDEF(&intern->u.file.zcontext)) {
 		zend_list_addref(Z_RESVAL_P(intern->u.file.zcontext));
 	}
 
@@ -315,7 +314,7 @@ static int spl_filesystem_file_open(spl_filesystem_object *intern, int use_inclu
 	intern->u.file.enclosure = '"';
 	intern->u.file.escape = '\\';
 
-	zend_hash_find(&intern->std.ce->function_table, "getcurrentline", sizeof("getcurrentline"), (void **) &intern->u.file.func_getCurr);
+	intern->u.file.func_getCurr = zend_hash_str_find_ptr(&intern->std.ce->function_table, "getcurrentline", sizeof("getcurrentline") - 1);
 
 	return SUCCESS;
 } /* }}} */
@@ -327,45 +326,41 @@ static int spl_filesystem_file_open(spl_filesystem_object *intern, int use_inclu
    Open the directory
    Clone other members (properties)
  */
-static zend_object_value spl_filesystem_object_clone(zval *zobject TSRMLS_DC)
+static zend_object *spl_filesystem_object_clone(zval *zobject TSRMLS_DC)
 {
-	zend_object_value new_obj_val;
 	zend_object *old_object;
 	zend_object *new_object;
-	zend_object_handle handle = Z_OBJ_HANDLE_P(zobject);
 	spl_filesystem_object *intern;
 	spl_filesystem_object *source;
 	int index, skip_dots;
 
-	old_object = zend_objects_get_address(zobject TSRMLS_CC);
+	old_object = Z_OBJ_P(zobject);
 	source = (spl_filesystem_object*)old_object;
-
-	new_obj_val = spl_filesystem_object_new_ex(old_object->ce, &intern TSRMLS_CC);
-	new_object = &intern->std;
+	new_object = spl_filesystem_object_new_ex(old_object->ce TSRMLS_CC);
 
 	intern->flags = source->flags;
 
 	switch (source->type) {
-	case SPL_FS_INFO:
-		intern->_path_len = source->_path_len;
-		intern->_path = estrndup(source->_path, source->_path_len);
-		intern->file_name_len = source->file_name_len;
-		intern->file_name = estrndup(source->file_name, intern->file_name_len);
-		break;
-	case SPL_FS_DIR:
-		spl_filesystem_dir_open(intern, source->_path TSRMLS_CC);
-		/* read until we hit the position in which we were before */
-		skip_dots = SPL_HAS_FLAG(source->flags, SPL_FILE_DIR_SKIPDOTS);
-		for(index = 0; index < source->u.dir.index; ++index) {
-			do {
-				spl_filesystem_dir_read(intern TSRMLS_CC);
-			} while (skip_dots && spl_filesystem_is_dot(intern->u.dir.entry.d_name));
-		}
-		intern->u.dir.index = index;
-		break;
-	case SPL_FS_FILE:
-		php_error_docref(NULL TSRMLS_CC, E_ERROR, "An object of class %s cannot be cloned", old_object->ce->name);
-		break;
+		case SPL_FS_INFO:
+			intern->_path_len = source->_path_len;
+			intern->_path = estrndup(source->_path, source->_path_len);
+			intern->file_name_len = source->file_name_len;
+			intern->file_name = estrndup(source->file_name, intern->file_name_len);
+			break;
+		case SPL_FS_DIR:
+			spl_filesystem_dir_open(intern, source->_path TSRMLS_CC);
+			/* read until we hit the position in which we were before */
+			skip_dots = SPL_HAS_FLAG(source->flags, SPL_FILE_DIR_SKIPDOTS);
+			for(index = 0; index < source->u.dir.index; ++index) {
+				do {
+					spl_filesystem_dir_read(intern TSRMLS_CC);
+				} while (skip_dots && spl_filesystem_is_dot(intern->u.dir.entry.d_name));
+			}
+			intern->u.dir.index = index;
+			break;
+		case SPL_FS_FILE:
+			php_error_docref(NULL TSRMLS_CC, E_ERROR, "An object of class %s cannot be cloned", old_object->ce->name->val);
+			break;
 	}
 	
 	intern->file_class = source->file_class;
@@ -373,13 +368,13 @@ static zend_object_value spl_filesystem_object_clone(zval *zobject TSRMLS_DC)
 	intern->oth = source->oth;
 	intern->oth_handler = source->oth_handler;
 
-	zend_objects_clone_members(new_object, new_obj_val, old_object, handle TSRMLS_CC);
+	zend_objects_clone_members(new_object, old_object TSRMLS_CC);
 
 	if (intern->oth_handler && intern->oth_handler->clone) {
 		intern->oth_handler->clone(source, intern TSRMLS_CC);
 	}
 
-	return new_obj_val;
+	return new_object;
 }
 /* }}} */
 
@@ -394,7 +389,7 @@ void spl_filesystem_info_set_filename(spl_filesystem_object *intern, char *path,
 	intern->file_name = use_copy ? estrndup(path, len) : path;
 	intern->file_name_len = len;
 
-	while(IS_SLASH_AT(intern->file_name, intern->file_name_len-1) && intern->file_name_len > 1) {
+	while (IS_SLASH_AT(intern->file_name, intern->file_name_len-1) && intern->file_name_len > 1) {
 		intern->file_name[intern->file_name_len-1] = 0;
 		intern->file_name_len--;
 	}
@@ -417,10 +412,10 @@ void spl_filesystem_info_set_filename(spl_filesystem_object *intern, char *path,
 	intern->_path = estrndup(path, intern->_path_len);
 } /* }}} */
 
-static spl_filesystem_object * spl_filesystem_object_create_info(spl_filesystem_object *source, char *file_path, int file_path_len, int use_copy, zend_class_entry *ce, zval *return_value TSRMLS_DC) /* {{{ */
+static spl_filesystem_object *spl_filesystem_object_create_info(spl_filesystem_object *source, char *file_path, int file_path_len, int use_copy, zend_class_entry *ce, zval *return_value TSRMLS_DC) /* {{{ */
 {
 	spl_filesystem_object *intern;
-	zval *arg1;
+	zval arg1;
 	zend_error_handling error_handling;
 
 	if (!file_path || !file_path_len) {
@@ -445,13 +440,13 @@ static spl_filesystem_object * spl_filesystem_object_create_info(spl_filesystem_
 
 	zend_update_class_constants(ce TSRMLS_CC);
 
-	return_value->value.obj = spl_filesystem_object_new_ex(ce, &intern TSRMLS_CC);
+	intern = (spl_filesystem_object*)spl_filesystem_object_new_ex(ce TSRMLS_CC);
+	return_value->value.obj = &intern->std;
 	Z_TYPE_P(return_value) = IS_OBJECT;
 
 	if (ce->constructor->common.scope != spl_ce_SplFileInfo) {
-		MAKE_STD_ZVAL(arg1);
-		ZVAL_STRINGL(arg1, file_path, file_path_len, use_copy);
-		zend_call_method_with_1_params(&return_value, ce, &ce->constructor, "__construct", NULL, arg1);
+		ZVAL_STRINGL(&arg1, file_path, file_path_len);
+		zend_call_method_with_1_params(return_value, ce, &ce->constructor, "__construct", NULL, &arg1);
 		zval_ptr_dtor(&arg1);
 	} else {
 		spl_filesystem_info_set_filename(intern, file_path, file_path_len, use_copy TSRMLS_CC);
@@ -461,99 +456,99 @@ static spl_filesystem_object * spl_filesystem_object_create_info(spl_filesystem_
 	return intern;
 } /* }}} */
 
-static spl_filesystem_object * spl_filesystem_object_create_type(int ht, spl_filesystem_object *source, int type, zend_class_entry *ce, zval *return_value TSRMLS_DC) /* {{{ */
+static spl_filesystem_object *spl_filesystem_object_create_type(int ht, spl_filesystem_object *source, int type, zend_class_entry *ce, zval *return_value TSRMLS_DC) /* {{{ */
 {
 	spl_filesystem_object *intern;
 	zend_bool use_include_path = 0;
-	zval *arg1, *arg2;
+	zval arg1, arg2;
 	zend_error_handling error_handling;
 
 	zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling TSRMLS_CC);
 
 	switch (source->type) {
-	case SPL_FS_INFO:
-	case SPL_FS_FILE:
-		break;
-	case SPL_FS_DIR:
-		if (!source->u.dir.entry.d_name[0]) {
-			zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC, "Could not open file");
-			zend_restore_error_handling(&error_handling TSRMLS_CC);
-			return NULL;
-		}
+		case SPL_FS_INFO:
+		case SPL_FS_FILE:
+			break;
+		case SPL_FS_DIR:
+			if (!source->u.dir.entry.d_name[0]) {
+				zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC, "Could not open file");
+				zend_restore_error_handling(&error_handling TSRMLS_CC);
+				return NULL;
+			}
 	}
 
 	switch (type) {
-	case SPL_FS_INFO:
-		ce = ce ? ce : source->info_class;
+		case SPL_FS_INFO:
+			ce = ce ? ce : source->info_class;
 
-		zend_update_class_constants(ce TSRMLS_CC);
+			zend_update_class_constants(ce TSRMLS_CC);
 
-		return_value->value.obj = spl_filesystem_object_new_ex(ce, &intern TSRMLS_CC);
-		Z_TYPE_P(return_value) = IS_OBJECT;
+			intern = (spl_filesystem_object*)spl_filesystem_object_new_ex(ce TSRMLS_CC);
+			return_value->value.obj = &intern->std;
+			Z_TYPE_P(return_value) = IS_OBJECT;
 
-		spl_filesystem_object_get_file_name(source TSRMLS_CC);
-		if (ce->constructor->common.scope != spl_ce_SplFileInfo) {
-			MAKE_STD_ZVAL(arg1);
-			ZVAL_STRINGL(arg1, source->file_name, source->file_name_len, 1);
-			zend_call_method_with_1_params(&return_value, ce, &ce->constructor, "__construct", NULL, arg1);
-			zval_ptr_dtor(&arg1);
-		} else {
-			intern->file_name = estrndup(source->file_name, source->file_name_len);
-			intern->file_name_len = source->file_name_len;
-			intern->_path = spl_filesystem_object_get_path(source, &intern->_path_len TSRMLS_CC);
-			intern->_path = estrndup(intern->_path, intern->_path_len);
-		}
-		break;
-	case SPL_FS_FILE:
-		ce = ce ? ce : source->file_class;
+			spl_filesystem_object_get_file_name(source TSRMLS_CC);
+			if (ce->constructor->common.scope != spl_ce_SplFileInfo) {
+				ZVAL_STRINGL(&arg1, source->file_name, source->file_name_len);
+				zend_call_method_with_1_params(return_value, ce, &ce->constructor, "__construct", NULL, &arg1);
+				zval_ptr_dtor(&arg1);
+			} else {
+				intern->file_name = estrndup(source->file_name, source->file_name_len);
+				intern->file_name_len = source->file_name_len;
+				intern->_path = spl_filesystem_object_get_path(source, &intern->_path_len TSRMLS_CC);
+				intern->_path = estrndup(intern->_path, intern->_path_len);
+			}
+			break;
+		case SPL_FS_FILE:
+			ce = ce ? ce : source->file_class;
 
-		zend_update_class_constants(ce TSRMLS_CC);
+			zend_update_class_constants(ce TSRMLS_CC);
 
-		return_value->value.obj = spl_filesystem_object_new_ex(ce, &intern TSRMLS_CC);
-		Z_TYPE_P(return_value) = IS_OBJECT;
-	
-		spl_filesystem_object_get_file_name(source TSRMLS_CC);
+			intern = (spl_filesystem_object*)spl_filesystem_object_new_ex(ce TSRMLS_CC);
 
-		if (ce->constructor->common.scope != spl_ce_SplFileObject) {
-			MAKE_STD_ZVAL(arg1);
-			MAKE_STD_ZVAL(arg2);
-			ZVAL_STRINGL(arg1, source->file_name, source->file_name_len, 1);
-			ZVAL_STRINGL(arg2, "r", 1, 1);
-			zend_call_method_with_2_params(&return_value, ce, &ce->constructor, "__construct", NULL, arg1, arg2);
-			zval_ptr_dtor(&arg1);
-			zval_ptr_dtor(&arg2);
-		} else {
-			intern->file_name = source->file_name;
-			intern->file_name_len = source->file_name_len;
-			intern->_path = spl_filesystem_object_get_path(source, &intern->_path_len TSRMLS_CC);
-			intern->_path = estrndup(intern->_path, intern->_path_len);
-		
-			intern->u.file.open_mode = "r";
-			intern->u.file.open_mode_len = 1;
-		
-			if (ht && zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sbr", 
-					&intern->u.file.open_mode, &intern->u.file.open_mode_len, 
-					&use_include_path, &intern->u.file.zcontext) == FAILURE) {
-				zend_restore_error_handling(&error_handling TSRMLS_CC);
-				intern->u.file.open_mode = NULL;
-				intern->file_name = NULL;
-				zval_dtor(return_value);
-				Z_TYPE_P(return_value) = IS_NULL;
-				return NULL;
-			}
-		
-			if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == FAILURE) {
-				zend_restore_error_handling(&error_handling TSRMLS_CC);
-				zval_dtor(return_value);
-				Z_TYPE_P(return_value) = IS_NULL;
-				return NULL;
+			return_value->value.obj = &intern->std;
+			Z_TYPE_P(return_value) = IS_OBJECT;
+
+			spl_filesystem_object_get_file_name(source TSRMLS_CC);
+
+			if (ce->constructor->common.scope != spl_ce_SplFileObject) {
+				ZVAL_STRINGL(&arg1, source->file_name, source->file_name_len);
+				ZVAL_STRINGL(&arg2, "r", 1);
+				zend_call_method_with_2_params(return_value, ce, &ce->constructor, "__construct", NULL, &arg1, &arg2);
+				zval_ptr_dtor(&arg1);
+				zval_ptr_dtor(&arg2);
+			} else {
+				intern->file_name = source->file_name;
+				intern->file_name_len = source->file_name_len;
+				intern->_path = spl_filesystem_object_get_path(source, &intern->_path_len TSRMLS_CC);
+				intern->_path = estrndup(intern->_path, intern->_path_len);
+
+				intern->u.file.open_mode = "r";
+				intern->u.file.open_mode_len = 1;
+
+				if (ht && zend_parse_parameters(ht TSRMLS_CC, "|sbr", 
+							&intern->u.file.open_mode, &intern->u.file.open_mode_len, 
+							&use_include_path, &intern->u.file.zcontext) == FAILURE) {
+					zend_restore_error_handling(&error_handling TSRMLS_CC);
+					intern->u.file.open_mode = NULL;
+					intern->file_name = NULL;
+					zval_ptr_dtor(return_value);
+					ZVAL_NULL(return_value);
+					return NULL;
+				}
+
+				if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == FAILURE) {
+					zend_restore_error_handling(&error_handling TSRMLS_CC);
+					zval_ptr_dtor(return_value);
+					ZVAL_NULL(return_value);
+					return NULL;
+				}
 			}
-		}
-		break;
-	case SPL_FS_DIR:	
-		zend_restore_error_handling(&error_handling TSRMLS_CC);
-		zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC, "Operation not supported");
-		return NULL;
+			break;
+		case SPL_FS_DIR:	
+			zend_restore_error_handling(&error_handling TSRMLS_CC);
+			zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC, "Operation not supported");
+			return NULL;
 	}
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
 	return NULL;
@@ -567,27 +562,27 @@ static int spl_filesystem_is_invalid_or_dot(const char * d_name) /* {{{ */
 
 static char *spl_filesystem_object_get_pathname(spl_filesystem_object *intern, int *len TSRMLS_DC) { /* {{{ */
 	switch (intern->type) {
-	case SPL_FS_INFO:
-	case SPL_FS_FILE:
-		*len = intern->file_name_len;
-		return intern->file_name;
-	case SPL_FS_DIR:
-		if (intern->u.dir.entry.d_name[0]) {
-			spl_filesystem_object_get_file_name(intern TSRMLS_CC);
+		case SPL_FS_INFO:
+		case SPL_FS_FILE:
 			*len = intern->file_name_len;
 			return intern->file_name;
-		}
+		case SPL_FS_DIR:
+			if (intern->u.dir.entry.d_name[0]) {
+				spl_filesystem_object_get_file_name(intern TSRMLS_CC);
+				*len = intern->file_name_len;
+				return intern->file_name;
+			}
 	}
 	*len = 0;
 	return NULL;
 }
 /* }}} */
 
-static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp TSRMLS_DC) /* {{{ */
+static HashTable *spl_filesystem_object_get_debug_info(zval *obj, int *is_temp TSRMLS_DC) /* {{{ */
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(obj TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(obj);
+	zval tmp;
 	HashTable *rv;
-	zval *tmp, zrv;
 	char *pnstr, *path;
 	int  pnlen, path_len;
 	char stmp[2];
@@ -601,14 +596,12 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
 	ALLOC_HASHTABLE(rv);
 	ZEND_INIT_SYMTABLE_EX(rv, zend_hash_num_elements(intern->std.properties) + 3, 0);
 
-	INIT_PZVAL(&zrv);
-	Z_ARRVAL(zrv) = rv;
-
-	zend_hash_copy(rv, intern->std.properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+	zend_hash_copy(rv, intern->std.properties, (copy_ctor_func_t) zval_add_ref);
 
 	pnstr = spl_gen_private_prop_name(spl_ce_SplFileInfo, "pathName", sizeof("pathName")-1, &pnlen TSRMLS_CC);
 	path = spl_filesystem_object_get_pathname(intern, &path_len TSRMLS_CC);
-	add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, path, path_len, 1);
+	ZVAL_STRINGL(&tmp, path, path_len);
+	zend_symtable_str_update(rv, pnstr, pnlen, &tmp);
 	efree(pnstr);
 
 	if (intern->file_name) {
@@ -616,42 +609,48 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
 		spl_filesystem_object_get_path(intern, &path_len TSRMLS_CC);
 		
 		if (path_len && path_len < intern->file_name_len) {
-			add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->file_name + path_len + 1, intern->file_name_len - (path_len + 1), 1);
+			ZVAL_STRINGL(&tmp, intern->file_name + path_len + 1, intern->file_name_len - (path_len + 1));
 		} else {
-			add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->file_name, intern->file_name_len, 1);
+			ZVAL_STRINGL(&tmp, intern->file_name, intern->file_name_len);
 		}
+		zend_symtable_str_update(rv, pnstr, pnlen, &tmp);
 		efree(pnstr);
 	}
 	if (intern->type == SPL_FS_DIR) {
 #ifdef HAVE_GLOB
 		pnstr = spl_gen_private_prop_name(spl_ce_DirectoryIterator, "glob", sizeof("glob")-1, &pnlen TSRMLS_CC);
 		if (php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) {
-			add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->_path, intern->_path_len, 1);
+			ZVAL_STRINGL(&tmp, intern->_path, intern->_path_len);
 		} else {
-			add_assoc_bool_ex(&zrv, pnstr, pnlen+1, 0);
+			ZVAL_BOOL(&tmp, 0);
 		}
+		zend_symtable_str_update(rv, pnstr, pnlen, &tmp);
 		efree(pnstr);
 #endif
 		pnstr = spl_gen_private_prop_name(spl_ce_RecursiveDirectoryIterator, "subPathName", sizeof("subPathName")-1, &pnlen TSRMLS_CC);
 		if (intern->u.dir.sub_path) {
-			add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->u.dir.sub_path, intern->u.dir.sub_path_len, 1);
+			ZVAL_STRINGL(&tmp, intern->u.dir.sub_path, intern->u.dir.sub_path_len);
 		} else {
-			add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, "", 0, 1);
+			ZVAL_STRINGL(&tmp, "", 0);
 		}
+		zend_symtable_str_update(rv, pnstr, pnlen, &tmp);
 		efree(pnstr);
 	}
 	if (intern->type == SPL_FS_FILE) {
 		pnstr = spl_gen_private_prop_name(spl_ce_SplFileObject, "openMode", sizeof("openMode")-1, &pnlen TSRMLS_CC);
-		add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->u.file.open_mode, intern->u.file.open_mode_len, 1);
+		ZVAL_STRINGL(&tmp, intern->u.file.open_mode, intern->u.file.open_mode_len);
+		zend_symtable_str_update(rv, pnstr, pnlen, &tmp);
 		efree(pnstr);
 		stmp[1] = '\0';
 		stmp[0] = intern->u.file.delimiter;
 		pnstr = spl_gen_private_prop_name(spl_ce_SplFileObject, "delimiter", sizeof("delimiter")-1, &pnlen TSRMLS_CC);
-		add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, stmp, 1, 1);
+		ZVAL_STRINGL(&tmp, stmp, 1);
+		zend_symtable_str_update(rv, pnstr, pnlen, &tmp);
 		efree(pnstr);
 		stmp[0] = intern->u.file.enclosure;
 		pnstr = spl_gen_private_prop_name(spl_ce_SplFileObject, "enclosure", sizeof("enclosure")-1, &pnlen TSRMLS_CC);
-		add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, stmp, 1, 1);
+		ZVAL_STRINGL(&tmp, stmp, 1);
+		zend_symtable_str_update(rv, pnstr, pnlen, &tmp);
 		efree(pnstr);
 	}
 
@@ -659,17 +658,19 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
 }
 /* }}} */
 
-zend_function *spl_filesystem_object_get_method_check(zval **object_ptr, char *method, int method_len, const struct _zend_literal *key TSRMLS_DC) /* {{{ */
+zend_function *spl_filesystem_object_get_method_check(zval *object_ptr, zend_string *method, const struct _zend_literal *key TSRMLS_DC) /* {{{ */
 {
-	spl_filesystem_object *fsobj = zend_object_store_get_object(*object_ptr TSRMLS_CC);
+	spl_filesystem_object *fsobj = (spl_filesystem_object*)Z_OBJ_P(object_ptr);
 	
 	if (fsobj->u.dir.entry.d_name[0] == '\0' && fsobj->orig_path == NULL) {
-		method = "_bad_state_ex";
-		method_len = sizeof("_bad_state_ex") - 1;
-		key = NULL;
+		zend_function *func;
+		zend_string *tmp = STR_INIT("_bad_state_ex", sizeof("_bad_state_ex") - 1, 0);
+		func = zend_get_std_object_handlers()->get_method(object_ptr, tmp, NULL TSRMLS_CC);
+		STR_RELEASE(tmp);
+		return func;
 	}
 	
-	return zend_get_std_object_handlers()->get_method(object_ptr, method, method_len, key TSRMLS_CC);
+	return zend_get_std_object_handlers()->get_method(object_ptr, method, key TSRMLS_CC);
 }
 /* }}} */
 
@@ -709,7 +710,7 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, long ctor_fla
 		return;
 	}
 
-	intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	if (intern->_path) {
 		/* object is alreay initialized */
 		zend_restore_error_handling(&error_handling TSRMLS_CC);
@@ -747,7 +748,7 @@ SPL_METHOD(DirectoryIterator, __construct)
    Rewind dir back to the start */
 SPL_METHOD(DirectoryIterator, rewind)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -765,7 +766,7 @@ SPL_METHOD(DirectoryIterator, rewind)
    Return current dir entry */
 SPL_METHOD(DirectoryIterator, key)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -794,7 +795,7 @@ SPL_METHOD(DirectoryIterator, current)
    Move to next entry */
 SPL_METHOD(DirectoryIterator, next)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	int skip_dots = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_SKIPDOTS);
 	
 	if (zend_parse_parameters_none() == FAILURE) {
@@ -816,9 +817,9 @@ SPL_METHOD(DirectoryIterator, next)
    Seek to the given position */
 SPL_METHOD(DirectoryIterator, seek)
 {
-	spl_filesystem_object *intern    = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
-	zval                  *retval    = NULL;
-	long                   pos;
+	spl_filesystem_object *intern    = (spl_filesystem_object*)Z_OBJ_P(getThis());
+	zval retval;
+	long pos;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &pos) == FAILURE) {
 		return;
@@ -826,26 +827,20 @@ SPL_METHOD(DirectoryIterator, seek)
 
 	if (intern->u.dir.index > pos) {
 		/* we first rewind */
-		zend_call_method_with_0_params(&this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_rewind, "rewind", &retval);
-		if (retval) {
-			zval_ptr_dtor(&retval);
-		}
+		zend_call_method_with_0_params(this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_rewind, "rewind", NULL);
 	}
 
 	while (intern->u.dir.index < pos) {
 		int valid = 0;
-		zend_call_method_with_0_params(&this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_valid, "valid", &retval);
-		if (retval) {
-			valid = zend_is_true(retval TSRMLS_CC);
+		zend_call_method_with_0_params(this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_valid, "valid", &retval);
+		if (!ZVAL_IS_UNDEF(&retval)) {
+			valid = zend_is_true(&retval TSRMLS_CC);
 			zval_ptr_dtor(&retval);
 		}
 		if (!valid) {
 			break;
 		}
-		zend_call_method_with_0_params(&this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_next, "next", &retval);
-		if (retval) {
-			zval_ptr_dtor(&retval);
-		}
+		zend_call_method_with_0_params(this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_next, "next", NULL);
 	}
 } /* }}} */
 
@@ -853,7 +848,7 @@ SPL_METHOD(DirectoryIterator, seek)
    Check whether dir contains more entries */
 SPL_METHOD(DirectoryIterator, valid)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -867,7 +862,7 @@ SPL_METHOD(DirectoryIterator, valid)
    Return the path */
 SPL_METHOD(SplFileInfo, getPath)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char *path;
 	int path_len;
 	
@@ -876,7 +871,7 @@ SPL_METHOD(SplFileInfo, getPath)
 	}
 
   	path = spl_filesystem_object_get_path(intern, &path_len TSRMLS_CC);
-	RETURN_STRINGL(path, path_len, 1);
+	RETURN_STRINGL(path, path_len);
 }
 /* }}} */
 
@@ -884,7 +879,7 @@ SPL_METHOD(SplFileInfo, getPath)
    Return filename only */
 SPL_METHOD(SplFileInfo, getFilename)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	int path_len;
 	
 	if (zend_parse_parameters_none() == FAILURE) {
@@ -894,9 +889,9 @@ SPL_METHOD(SplFileInfo, getFilename)
 	spl_filesystem_object_get_path(intern, &path_len TSRMLS_CC);
 	
 	if (path_len && path_len < intern->file_name_len) {
-		RETURN_STRINGL(intern->file_name + path_len + 1, intern->file_name_len - (path_len + 1), 1);
+		RETURN_STRINGL(intern->file_name + path_len + 1, intern->file_name_len - (path_len + 1));
 	} else {
-		RETURN_STRINGL(intern->file_name, intern->file_name_len, 1);
+		RETURN_STRINGL(intern->file_name, intern->file_name_len);
 	}
 }
 /* }}} */
@@ -905,13 +900,13 @@ SPL_METHOD(SplFileInfo, getFilename)
    Return filename of current dir entry */
 SPL_METHOD(DirectoryIterator, getFilename)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
-	RETURN_STRING(intern->u.dir.entry.d_name, 1);
+	RETURN_STRING(intern->u.dir.entry.d_name);
 }
 /* }}} */
 
@@ -919,7 +914,7 @@ SPL_METHOD(DirectoryIterator, getFilename)
    Returns file extension component of path */
 SPL_METHOD(SplFileInfo, getExtension)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char *fname = NULL;
 	const char *p;
 	size_t flen;
@@ -944,7 +939,7 @@ SPL_METHOD(SplFileInfo, getExtension)
 	p = zend_memrchr(fname, '.', flen);
 	if (p) {
 		idx = p - fname;
-		RETVAL_STRINGL(fname + idx + 1, flen - idx - 1, 1);
+		RETVAL_STRINGL(fname + idx + 1, flen - idx - 1);
 		efree(fname);
 		return;
 	} else {
@@ -960,7 +955,7 @@ SPL_METHOD(SplFileInfo, getExtension)
    Returns the file extension component of path */
 SPL_METHOD(DirectoryIterator, getExtension)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char *fname = NULL;
 	const char *p;
 	size_t flen;
@@ -975,7 +970,7 @@ SPL_METHOD(DirectoryIterator, getExtension)
 	p = zend_memrchr(fname, '.', flen);
 	if (p) {
 		idx = p - fname;
-		RETVAL_STRINGL(fname + idx + 1, flen - idx - 1, 1);
+		RETVAL_STRINGL(fname + idx + 1, flen - idx - 1);
 		efree(fname);
 		return;
 	} else {
@@ -991,7 +986,7 @@ SPL_METHOD(DirectoryIterator, getExtension)
    Returns filename component of path */
 SPL_METHOD(SplFileInfo, getBasename)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char *fname, *suffix = 0;
 	size_t flen;
 	int slen = 0, path_len;
@@ -1012,7 +1007,8 @@ SPL_METHOD(SplFileInfo, getBasename)
 
 	php_basename(fname, flen, suffix, slen, &fname, &flen TSRMLS_CC);
 
-	RETURN_STRINGL(fname, flen, 0);
+	RETVAL_STRINGL(fname, flen);
+	efree(fname);
 }
 /* }}}*/   
 
@@ -1020,7 +1016,7 @@ SPL_METHOD(SplFileInfo, getBasename)
    Returns filename component of current dir entry */
 SPL_METHOD(DirectoryIterator, getBasename)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char *suffix = 0, *fname;
 	int slen = 0;
 	size_t flen;
@@ -1031,7 +1027,8 @@ SPL_METHOD(DirectoryIterator, getBasename)
 
 	php_basename(intern->u.dir.entry.d_name, strlen(intern->u.dir.entry.d_name), suffix, slen, &fname, &flen TSRMLS_CC);
 
-	RETURN_STRINGL(fname, flen, 0);
+	RETVAL_STRINGL(fname, flen);
+	efree(fname);
 }
 /* }}} */
 
@@ -1039,7 +1036,7 @@ SPL_METHOD(DirectoryIterator, getBasename)
    Return path and filename */
 SPL_METHOD(SplFileInfo, getPathname)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char *path;
 	int path_len;
 
@@ -1048,7 +1045,7 @@ SPL_METHOD(SplFileInfo, getPathname)
 	}
 	path = spl_filesystem_object_get_pathname(intern, &path_len TSRMLS_CC);
 	if (path != NULL) {
-		RETURN_STRINGL(path, path_len, 1);
+		RETURN_STRINGL(path, path_len);
 	} else {
 		RETURN_FALSE;
 	}
@@ -1059,17 +1056,17 @@ SPL_METHOD(SplFileInfo, getPathname)
    Return getPathname() or getFilename() depending on flags */
 SPL_METHOD(FilesystemIterator, key)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
 	if (SPL_FILE_DIR_KEY(intern, SPL_FILE_DIR_KEY_AS_FILENAME)) {
-		RETURN_STRING(intern->u.dir.entry.d_name, 1);
+		RETURN_STRING(intern->u.dir.entry.d_name);
 	} else {
 		spl_filesystem_object_get_file_name(intern TSRMLS_CC);
-		RETURN_STRINGL(intern->file_name, intern->file_name_len, 1);
+		RETURN_STRINGL(intern->file_name, intern->file_name_len);
 	}
 }
 /* }}} */
@@ -1078,7 +1075,7 @@ SPL_METHOD(FilesystemIterator, key)
    Return getFilename(), getFileInfo() or $this depending on flags */
 SPL_METHOD(FilesystemIterator, current)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -1086,7 +1083,7 @@ SPL_METHOD(FilesystemIterator, current)
 
 	if (SPL_FILE_DIR_CURRENT(intern, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) {
 		spl_filesystem_object_get_file_name(intern TSRMLS_CC);
-		RETURN_STRINGL(intern->file_name, intern->file_name_len, 1);
+		RETURN_STRINGL(intern->file_name, intern->file_name_len);
 	} else if (SPL_FILE_DIR_CURRENT(intern, SPL_FILE_DIR_CURRENT_AS_FILEINFO)) {
 		spl_filesystem_object_get_file_name(intern TSRMLS_CC);
 		spl_filesystem_object_create_type(0, intern, SPL_FS_INFO, NULL, return_value TSRMLS_CC);
@@ -1101,7 +1098,7 @@ SPL_METHOD(FilesystemIterator, current)
    Returns true if current entry is '.' or  '..' */
 SPL_METHOD(DirectoryIterator, isDot)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -1134,7 +1131,7 @@ SPL_METHOD(SplFileInfo, __construct)
 		return;
 	}
 
-	intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	spl_filesystem_info_set_filename(intern, path, len, 1 TSRMLS_CC);
 
@@ -1148,7 +1145,7 @@ SPL_METHOD(SplFileInfo, __construct)
 #define FileInfoFunction(func_name, func_num) \
 SPL_METHOD(SplFileInfo, func_name) \
 { \
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC); \
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis()); \
 	zend_error_handling error_handling; \
 	if (zend_parse_parameters_none() == FAILURE) { \
 		return; \
@@ -1240,7 +1237,7 @@ FileInfoFunction(isLink, FS_IS_LINK)
    Return the target of a symbolic link */
 SPL_METHOD(SplFileInfo, getLinkTarget)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	int ret;
 	char buff[MAXPATHLEN];
 	zend_error_handling error_handling;
@@ -1276,7 +1273,7 @@ SPL_METHOD(SplFileInfo, getLinkTarget)
 		/* Append NULL to the end of the string */
 		buff[ret] = '\0';
 
-		RETVAL_STRINGL(buff, ret, 1);
+		RETVAL_STRINGL(buff, ret);
 	}
 
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
@@ -1288,7 +1285,7 @@ SPL_METHOD(SplFileInfo, getLinkTarget)
    Return the resolved path */
 SPL_METHOD(SplFileInfo, getRealPath)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char buff[MAXPATHLEN];
 	char *filename;
 	zend_error_handling error_handling;
@@ -1316,7 +1313,7 @@ SPL_METHOD(SplFileInfo, getRealPath)
 			RETVAL_FALSE;
 		} else
 #endif
-		RETVAL_STRING(buff, 1);
+		RETVAL_STRING(buff);
 	} else {
 		RETVAL_FALSE;
 	}
@@ -1330,9 +1327,9 @@ SPL_METHOD(SplFileInfo, getRealPath)
    Open the current file */
 SPL_METHOD(SplFileInfo, openFile)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 
-	spl_filesystem_object_create_type(ht, intern, SPL_FS_FILE, NULL, return_value TSRMLS_CC);
+	spl_filesystem_object_create_type(ZEND_NUM_ARGS(), intern, SPL_FS_FILE, NULL, return_value TSRMLS_CC);
 }
 /* }}} */
 
@@ -1340,7 +1337,7 @@ SPL_METHOD(SplFileInfo, openFile)
    Class to use in openFile() */
 SPL_METHOD(SplFileInfo, setFileClass)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	zend_class_entry *ce = spl_ce_SplFileObject;
 	zend_error_handling error_handling;
 	
@@ -1358,7 +1355,7 @@ SPL_METHOD(SplFileInfo, setFileClass)
    Class to use in getFileInfo(), getPathInfo() */
 SPL_METHOD(SplFileInfo, setInfoClass)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	zend_class_entry *ce = spl_ce_SplFileInfo;
 	zend_error_handling error_handling;
 	
@@ -1376,14 +1373,14 @@ SPL_METHOD(SplFileInfo, setInfoClass)
    Get/copy file info */
 SPL_METHOD(SplFileInfo, getFileInfo)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	zend_class_entry *ce = intern->info_class;
 	zend_error_handling error_handling;
 	
 	zend_replace_error_handling(EH_THROW, spl_ce_UnexpectedValueException, &error_handling TSRMLS_CC);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) == SUCCESS) {
-		spl_filesystem_object_create_type(ht, intern, SPL_FS_INFO, ce, return_value TSRMLS_CC);
+		spl_filesystem_object_create_type(ZEND_NUM_ARGS(), intern, SPL_FS_INFO, ce, return_value TSRMLS_CC);
 	}
 
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
@@ -1394,7 +1391,7 @@ SPL_METHOD(SplFileInfo, getFileInfo)
    Get/copy file info */
 SPL_METHOD(SplFileInfo, getPathInfo)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	zend_class_entry *ce = intern->info_class;
 	zend_error_handling error_handling;
 	
@@ -1415,7 +1412,7 @@ SPL_METHOD(SplFileInfo, getPathInfo)
 }
 /* }}} */
 
-/* {{{ */
+/* {{{  proto SplFileInfo::_bad_state_ex(void) */
 SPL_METHOD(SplFileInfo, _bad_state_ex)
 {
 	zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC,
@@ -1436,7 +1433,7 @@ SPL_METHOD(FilesystemIterator, __construct)
    Rewind dir back to the start */
 SPL_METHOD(FilesystemIterator, rewind)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	int skip_dots = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_SKIPDOTS);
 
 	if (zend_parse_parameters_none() == FAILURE) {
@@ -1457,7 +1454,7 @@ SPL_METHOD(FilesystemIterator, rewind)
    Get handling flags */
 SPL_METHOD(FilesystemIterator, getFlags)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -1470,7 +1467,7 @@ SPL_METHOD(FilesystemIterator, getFlags)
    Set handling flags */
 SPL_METHOD(FilesystemIterator, setFlags)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	long flags;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) == FAILURE) {
@@ -1486,7 +1483,7 @@ SPL_METHOD(FilesystemIterator, setFlags)
 SPL_METHOD(RecursiveDirectoryIterator, hasChildren)
 {
 	zend_bool allow_links = 0;
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &allow_links) == FAILURE) {
 		return;
@@ -1510,8 +1507,8 @@ SPL_METHOD(RecursiveDirectoryIterator, hasChildren)
    Returns an iterator for the current entry if it is a directory */
 SPL_METHOD(RecursiveDirectoryIterator, getChildren)
 {
-	zval *zpath, *zflags;
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	zval zpath, zflags;
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	spl_filesystem_object *subdir;
 	char slash = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_UNIXPATHS) ? '/' : DEFAULT_SLASH;
 	
@@ -1522,17 +1519,15 @@ SPL_METHOD(RecursiveDirectoryIterator, getChildren)
 	spl_filesystem_object_get_file_name(intern TSRMLS_CC);
 
 	if (SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) {
-		RETURN_STRINGL(intern->file_name, intern->file_name_len, 1);
+		RETURN_STRINGL(intern->file_name, intern->file_name_len);
 	} else {
-		MAKE_STD_ZVAL(zflags);
-		MAKE_STD_ZVAL(zpath);
-		ZVAL_LONG(zflags, intern->flags);
-		ZVAL_STRINGL(zpath, intern->file_name, intern->file_name_len, 1);
-		spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, zpath, zflags TSRMLS_CC);
+		ZVAL_LONG(&zflags, intern->flags);
+		ZVAL_STRINGL(&zpath, intern->file_name, intern->file_name_len);
+		spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, &zpath, &zflags TSRMLS_CC);
 		zval_ptr_dtor(&zpath);
 		zval_ptr_dtor(&zflags);
 		
-		subdir = (spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
+		subdir = (spl_filesystem_object*)Z_OBJ_P(return_value);
 		if (subdir) {
 			if (intern->u.dir.sub_path && intern->u.dir.sub_path[0]) {
 				subdir->u.dir.sub_path_len = spprintf(&subdir->u.dir.sub_path, 0, "%s%c%s", intern->u.dir.sub_path, slash, intern->u.dir.entry.d_name);
@@ -1552,16 +1547,16 @@ SPL_METHOD(RecursiveDirectoryIterator, getChildren)
    Get sub path */
 SPL_METHOD(RecursiveDirectoryIterator, getSubPath)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
 	if (intern->u.dir.sub_path) {
-		RETURN_STRINGL(intern->u.dir.sub_path, intern->u.dir.sub_path_len, 1);
+		RETURN_STRINGL(intern->u.dir.sub_path, intern->u.dir.sub_path_len);
 	} else {
-		RETURN_STRINGL("", 0, 1);
+		RETURN_STR(STR_EMPTY_ALLOC());
 	}
 }
 /* }}} */
@@ -1570,7 +1565,7 @@ SPL_METHOD(RecursiveDirectoryIterator, getSubPath)
    Get sub path and file name */
 SPL_METHOD(RecursiveDirectoryIterator, getSubPathname)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char *sub_name;
 	int len;
 	char slash = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_UNIXPATHS) ? '/' : DEFAULT_SLASH;
@@ -1581,9 +1576,10 @@ SPL_METHOD(RecursiveDirectoryIterator, getSubPathname)
 
 	if (intern->u.dir.sub_path) {
 		len = spprintf(&sub_name, 0, "%s%c%s", intern->u.dir.sub_path, slash, intern->u.dir.entry.d_name);
-		RETURN_STRINGL(sub_name, len, 0);
+		RETVAL_STRINGL(sub_name, len);
+		efree(sub_name);
 	} else {
-		RETURN_STRING(intern->u.dir.entry.d_name, 1);
+		RETURN_STRING(intern->u.dir.entry.d_name);
 	}
 }
 /* }}} */
@@ -1609,7 +1605,7 @@ SPL_METHOD(GlobIterator, __construct)
    Return the number of directories and files found by globbing */
 SPL_METHOD(GlobIterator, count)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -1628,7 +1624,7 @@ SPL_METHOD(GlobIterator, count)
 /* {{{ forward declarations to the iterator handlers */
 static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter TSRMLS_DC);
 static int spl_filesystem_dir_it_valid(zend_object_iterator *iter TSRMLS_DC);
-static void spl_filesystem_dir_it_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC);
+static zval *spl_filesystem_dir_it_current_data(zend_object_iterator *iter TSRMLS_DC);
 static void spl_filesystem_dir_it_current_key(zend_object_iterator *iter, zval *key TSRMLS_DC);
 static void spl_filesystem_dir_it_move_forward(zend_object_iterator *iter TSRMLS_DC);
 static void spl_filesystem_dir_it_rewind(zend_object_iterator *iter TSRMLS_DC);
@@ -1653,7 +1649,7 @@ zend_object_iterator *spl_filesystem_dir_get_iterator(zend_class_entry *ce, zval
 	if (by_ref) {
 		zend_error(E_ERROR, "An iterator cannot be used with foreach by reference");
 	}
-	dir_object = (spl_filesystem_object*)zend_object_store_get_object(object TSRMLS_CC);
+	dir_object = (spl_filesystem_object*)Z_OBJ_P(object);
 	iterator   = spl_filesystem_object_to_iterator(dir_object);
 
 	/* initialize iterator if it wasn't gotten before */
@@ -1664,7 +1660,7 @@ zend_object_iterator *spl_filesystem_dir_get_iterator(zend_class_entry *ce, zval
 		 * doesn't check whether it's set */
 		iterator->current = object;
 	}
-	zval_add_ref(&object);
+	zval_add_ref(object);
 	
 	return (zend_object_iterator*)iterator;
 }
@@ -1676,8 +1672,8 @@ static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter TSRMLS_DC)
 	spl_filesystem_iterator *iterator = (spl_filesystem_iterator *)iter;
 
 	if (iterator->intern.data) {
-		zval *object =  iterator->intern.data;
-		zval_ptr_dtor(&object);
+		zval *object = iterator->intern.data;
+		zval_ptr_dtor(object);
 	}
 	/* Otherwise we were called from the owning object free storage handler as
 	 * it sets
@@ -1697,11 +1693,11 @@ static int spl_filesystem_dir_it_valid(zend_object_iterator *iter TSRMLS_DC)
 /* }}} */
 
 /* {{{ spl_filesystem_dir_it_current_data */
-static void spl_filesystem_dir_it_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC)
+static zval *spl_filesystem_dir_it_current_data(zend_object_iterator *iter TSRMLS_DC)
 {
 	spl_filesystem_iterator *iterator = (spl_filesystem_iterator *)iter;
 	
-	*data = &iterator->current;
+	return iterator->current;
 }
 /* }}} */
 
@@ -1748,17 +1744,17 @@ static void spl_filesystem_tree_it_dtor(zend_object_iterator *iter TSRMLS_DC)
 
 	if (iterator->intern.data) {
 		zval *object = 	iterator->intern.data;
-		zval_ptr_dtor(&object);
+		zval_ptr_dtor(object);
 	} else {
 		if (iterator->current) {
-			zval_ptr_dtor(&iterator->current);
+			zval_ptr_dtor(iterator->current);
 		}
 	}
 }
 /* }}} */
 
 /* {{{ spl_filesystem_tree_it_current_data */
-static void spl_filesystem_tree_it_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC)
+static zval *spl_filesystem_tree_it_current_data(zend_object_iterator *iter TSRMLS_DC)
 {
 	spl_filesystem_iterator *iterator = (spl_filesystem_iterator *)iter;
 	spl_filesystem_object   *object   = spl_filesystem_iterator_to_object(iterator);
@@ -1767,7 +1763,7 @@ static void spl_filesystem_tree_it_current_data(zend_object_iterator *iter, zval
 		if (!iterator->current) {
 			ALLOC_INIT_ZVAL(iterator->current);
 			spl_filesystem_object_get_file_name(object TSRMLS_CC);
-			ZVAL_STRINGL(iterator->current, object->file_name, object->file_name_len, 1);
+			ZVAL_STRINGL(iterator->current, object->file_name, object->file_name_len);
 		}
 		*data = &iterator->current;
 	} else if (SPL_FILE_DIR_CURRENT(object, SPL_FILE_DIR_CURRENT_AS_FILEINFO)) {
@@ -1789,10 +1785,10 @@ static void spl_filesystem_tree_it_current_key(zend_object_iterator *iter, zval
 	spl_filesystem_object *object = spl_filesystem_iterator_to_object((spl_filesystem_iterator *)iter);
 
 	if (SPL_FILE_DIR_KEY(object, SPL_FILE_DIR_KEY_AS_FILENAME)) {
-		ZVAL_STRING(key, object->u.dir.entry.d_name, 1);
+		ZVAL_STRING(key, object->u.dir.entry.d_name);
 	} else {
 		spl_filesystem_object_get_file_name(object TSRMLS_CC);
-		ZVAL_STRINGL(key, object->file_name, object->file_name_len, 1);
+		ZVAL_STRINGL(key, object->file_name, object->file_name_len);
 	}
 }
 /* }}} */
@@ -1812,7 +1808,7 @@ static void spl_filesystem_tree_it_move_forward(zend_object_iterator *iter TSRML
 		object->file_name = NULL;
 	}
 	if (iterator->current) {
-		zval_ptr_dtor(&iterator->current);
+		zval_ptr_dtor(iterator->current);
 		iterator->current = NULL;
 	}
 }
@@ -1832,7 +1828,7 @@ static void spl_filesystem_tree_it_rewind(zend_object_iterator *iter TSRMLS_DC)
 		spl_filesystem_dir_read(object TSRMLS_CC);
 	} while (spl_filesystem_is_dot(object->u.dir.entry.d_name));
 	if (iterator->current) {
-		zval_ptr_dtor(&iterator->current);
+		zval_ptr_dtor(iterator->current);
 		iterator->current = NULL;
 	}
 }
@@ -1858,7 +1854,7 @@ zend_object_iterator *spl_filesystem_tree_get_iterator(zend_class_entry *ce, zva
 	if (by_ref) {
 		zend_error(E_ERROR, "An iterator cannot be used with foreach by reference");
 	}
-	dir_object = (spl_filesystem_object*)zend_object_store_get_object(object TSRMLS_CC);
+	dir_object = (spl_filesystem_object*)Z_OBJ_P(object);
 	iterator   = spl_filesystem_object_to_iterator(dir_object);
 
 	/* initialize iterator if wasn't gotten before */
@@ -1866,7 +1862,7 @@ zend_object_iterator *spl_filesystem_tree_get_iterator(zend_class_entry *ce, zva
 		iterator->intern.data = object;
 		iterator->intern.funcs = &spl_filesystem_tree_it_funcs;
 	}
-	zval_add_ref(&object);
+	zval_add_ref(object);
 	
 	return (zend_object_iterator*)iterator;
 }
@@ -1875,7 +1871,7 @@ zend_object_iterator *spl_filesystem_tree_get_iterator(zend_class_entry *ce, zva
 /* {{{ spl_filesystem_object_cast */
 static int spl_filesystem_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(readobj TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(readobj);
 
 	if (type == IS_STRING) {
 		if (Z_OBJCE_P(readobj)->__tostring) {
@@ -1889,11 +1885,11 @@ static int spl_filesystem_object_cast(zval *readobj, zval *writeobj, int type TS
 				zval retval;
 				zval *retval_ptr = &retval;
 
-				ZVAL_STRINGL(retval_ptr, intern->file_name, intern->file_name_len, 1);
+				ZVAL_STRINGL(retval_ptr, intern->file_name, intern->file_name_len);
 				zval_dtor(readobj);
 				ZVAL_ZVAL(writeobj, retval_ptr, 0, 0);
 			} else {
-				ZVAL_STRINGL(writeobj, intern->file_name, intern->file_name_len, 1);
+				ZVAL_STRINGL(writeobj, intern->file_name, intern->file_name_len);
 			}
 			return SUCCESS;
 		case SPL_FS_DIR:
@@ -1901,11 +1897,11 @@ static int spl_filesystem_object_cast(zval *readobj, zval *writeobj, int type TS
 				zval retval;
 				zval *retval_ptr = &retval;
 
-				ZVAL_STRING(retval_ptr, intern->u.dir.entry.d_name, 1);
+				ZVAL_STRING(retval_ptr, intern->u.dir.entry.d_name);
 				zval_dtor(readobj);
 				ZVAL_ZVAL(writeobj, retval_ptr, 0, 0);
 			} else {
-				ZVAL_STRING(writeobj, intern->u.dir.entry.d_name, 1);
+				ZVAL_STRING(writeobj, intern->u.dir.entry.d_name);
 			}
 			return SUCCESS;
 		}
@@ -2100,17 +2096,17 @@ static int spl_filesystem_file_call(spl_filesystem_object *intern, zend_function
 	int result;
 	int num_args = pass_num_args + (arg2 ? 2 : 1);
 
-	zval ***params = (zval***)safe_emalloc(num_args, sizeof(zval**), 0);
+	zval *params = (zval*)safe_emalloc(num_args, sizeof(zval), 0);
 
-	params[0] = &zresource_ptr;
+	params[0] = *zresource_ptr;
 	
 	if (arg2) {
-		params[1] = &arg2;
+		params[1] = *arg2;
 	}
 
-	zend_get_parameters_array_ex(pass_num_args, params+(arg2 ? 2 : 1));
+	zend_get_parameters_array_ex(pass_num_args, params + (arg2 ? 2 : 1));
 
-	ZVAL_STRING(&z_fname, func_ptr->common.function_name, 0);
+	ZVAL_STRING(&z_fname, func_ptr->common.function_name);
 
 	fci.size = sizeof(fci);
 	fci.function_table = EG(function_table);
@@ -2129,6 +2125,7 @@ static int spl_filesystem_file_call(spl_filesystem_object *intern, zend_function
 	fcic.object_ptr = NULL;
 
 	result = zend_call_function(&fci, &fcic TSRMLS_CC);
+	zval_ptr_dtor(&z_fname);
 	
 	if (result == FAILURE) {
 		RETVAL_FALSE;
@@ -2283,7 +2280,7 @@ static void spl_filesystem_file_rewind(zval * this_ptr, spl_filesystem_object *i
    Construct a new file object */
 SPL_METHOD(SplFileObject, __construct)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	zend_bool use_include_path = 0;
 	char *p1, *p2;
 	char *tmp_path;
@@ -2346,7 +2343,7 @@ SPL_METHOD(SplTempFileObject, __construct)
 {
 	long max_memory = PHP_STREAM_MAX_MEM;
 	char tmp_fname[48];
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	zend_error_handling error_handling;
 
 	zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling TSRMLS_CC);
@@ -2381,7 +2378,7 @@ SPL_METHOD(SplTempFileObject, __construct)
    Rewind the file and read the first line */
 SPL_METHOD(SplFileObject, rewind)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2394,7 +2391,7 @@ SPL_METHOD(SplFileObject, rewind)
    Return whether end of file is reached */
 SPL_METHOD(SplFileObject, eof)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2407,7 +2404,7 @@ SPL_METHOD(SplFileObject, eof)
    Return !eof() */
 SPL_METHOD(SplFileObject, valid)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2424,7 +2421,7 @@ SPL_METHOD(SplFileObject, valid)
    Rturn next line from file */
 SPL_METHOD(SplFileObject, fgets)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2440,7 +2437,7 @@ SPL_METHOD(SplFileObject, fgets)
    Return current line from file */
 SPL_METHOD(SplFileObject, current)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2461,7 +2458,7 @@ SPL_METHOD(SplFileObject, current)
    Return line number */
 SPL_METHOD(SplFileObject, key)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2478,7 +2475,7 @@ SPL_METHOD(SplFileObject, key)
    Read next line */
 SPL_METHOD(SplFileObject, next)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2495,7 +2492,7 @@ SPL_METHOD(SplFileObject, next)
    Set file handling flags */
 SPL_METHOD(SplFileObject, setFlags)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &intern->flags) == FAILURE) {
 		return;
@@ -2506,7 +2503,7 @@ SPL_METHOD(SplFileObject, setFlags)
    Get file handling flags */
 SPL_METHOD(SplFileObject, getFlags)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2521,7 +2518,7 @@ SPL_METHOD(SplFileObject, setMaxLineLen)
 {
 	long max_len;
 
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &max_len) == FAILURE) {
 		return;
@@ -2539,7 +2536,7 @@ SPL_METHOD(SplFileObject, setMaxLineLen)
    Get maximum line length */
 SPL_METHOD(SplFileObject, getMaxLineLen)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -2573,7 +2570,7 @@ SPL_METHOD(SplFileObject, getChildren)
 #define FileFunction(func_name) \
 SPL_METHOD(SplFileObject, func_name) \
 { \
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC); \
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis()); \
 	FileFunctionCall(func_name, ZEND_NUM_ARGS(), NULL); \
 }
 /* }}} */
@@ -2582,7 +2579,7 @@ SPL_METHOD(SplFileObject, func_name) \
    Return current line as csv */
 SPL_METHOD(SplFileObject, fgetcsv)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char delimiter = intern->u.file.delimiter, enclosure = intern->u.file.enclosure, escape = intern->u.file.escape;
 	char *delim = NULL, *enclo = NULL, *esc = NULL;
 	int d_len = 0, e_len = 0, esc_len = 0;
@@ -2623,7 +2620,7 @@ SPL_METHOD(SplFileObject, fgetcsv)
    Output a field array as a CSV line */
 SPL_METHOD(SplFileObject, fputcsv)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char delimiter = intern->u.file.delimiter, enclosure = intern->u.file.enclosure, escape = intern->u.file.escape;
 	char *delim = NULL, *enclo = NULL;
 	int d_len = 0, e_len = 0, ret;
@@ -2660,7 +2657,7 @@ SPL_METHOD(SplFileObject, fputcsv)
    Set the delimiter and enclosure character used in fgetcsv */
 SPL_METHOD(SplFileObject, setCsvControl)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char delimiter = ',', enclosure = '"', escape='\\';
 	char *delim = NULL, *enclo = NULL, *esc = NULL;
 	int d_len = 0, e_len = 0, esc_len = 0;
@@ -2703,7 +2700,7 @@ SPL_METHOD(SplFileObject, setCsvControl)
    Get the delimiter and enclosure character used in fgetcsv */
 SPL_METHOD(SplFileObject, getCsvControl)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char delimiter[2], enclosure[2];
 
 	array_init(return_value);
@@ -2727,7 +2724,7 @@ FileFunction(flock)
    Flush the file */
 SPL_METHOD(SplFileObject, fflush)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 
 	RETURN_BOOL(!php_stream_flush(intern->u.file.stream));
 } /* }}} */
@@ -2736,7 +2733,7 @@ SPL_METHOD(SplFileObject, fflush)
    Return current file position */
 SPL_METHOD(SplFileObject, ftell)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);	
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());	
 	long ret = php_stream_tell(intern->u.file.stream);
 
 	if (ret == -1) {
@@ -2750,7 +2747,7 @@ SPL_METHOD(SplFileObject, ftell)
    Return current file position */
 SPL_METHOD(SplFileObject, fseek)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	long pos, whence = SEEK_SET;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &pos, &whence) == FAILURE) {
@@ -2765,7 +2762,7 @@ SPL_METHOD(SplFileObject, fseek)
    Get a character form the file */
 SPL_METHOD(SplFileObject, fgetc)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char buf[2];
 	int result;
 
@@ -2790,7 +2787,7 @@ SPL_METHOD(SplFileObject, fgetc)
    Get a line from file pointer and strip HTML tags */
 SPL_METHOD(SplFileObject, fgetss)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	zval *arg2 = NULL;
 	MAKE_STD_ZVAL(arg2);
 
@@ -2812,7 +2809,7 @@ SPL_METHOD(SplFileObject, fgetss)
    Output all remaining data from a file pointer */
 SPL_METHOD(SplFileObject, fpassthru)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 
 	RETURN_LONG(php_stream_passthru(intern->u.file.stream));
 } /* }}} */
@@ -2821,7 +2818,7 @@ SPL_METHOD(SplFileObject, fpassthru)
    Implements a mostly ANSI compatible fscanf() */
 SPL_METHOD(SplFileObject, fscanf)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 
 	spl_filesystem_file_free_line(intern TSRMLS_CC);
 	intern->u.file.current_line_num++;
@@ -2834,7 +2831,7 @@ SPL_METHOD(SplFileObject, fscanf)
    Binary-safe file write */
 SPL_METHOD(SplFileObject, fwrite)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	char *str;
 	int str_len;
 	long length = 0;
@@ -2862,7 +2859,7 @@ FileFunction(fstat)
    Truncate file to 'size' length */
 SPL_METHOD(SplFileObject, ftruncate)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	long size;
 	
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &size) == FAILURE) {
@@ -2881,7 +2878,7 @@ SPL_METHOD(SplFileObject, ftruncate)
    Seek to specified line */
 SPL_METHOD(SplFileObject, seek)
 {
-	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	spl_filesystem_object *intern = (spl_filesystem_object*)Z_OBJ_P(getThis());
 	long line_pos;
 	
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &line_pos) == FAILURE) {
@@ -3017,9 +3014,12 @@ PHP_MINIT_FUNCTION(spl_directory)
 	spl_filesystem_object_handlers.clone_obj       = spl_filesystem_object_clone;
 	spl_filesystem_object_handlers.cast_object     = spl_filesystem_object_cast;
 	spl_filesystem_object_handlers.get_debug_info  = spl_filesystem_object_get_debug_info;
+	spl_filesystem_object_handlers.dtor_obj = zend_objects_destroy_object;
+	spl_filesystem_object_handlers.free_obj = spl_filesystem_object_free_storage;
 	spl_ce_SplFileInfo->serialize = zend_class_serialize_deny;
 	spl_ce_SplFileInfo->unserialize = zend_class_unserialize_deny;
 
+
 	REGISTER_SPL_SUB_CLASS_EX(DirectoryIterator, SplFileInfo, spl_filesystem_object_new, spl_DirectoryIterator_functions);
 	zend_class_implements(spl_ce_DirectoryIterator TSRMLS_CC, 1, zend_ce_iterator);
 	REGISTER_SPL_IMPLEMENTS(DirectoryIterator, SeekableIterator);