MFH: First part of count/handlers related fixes

10 files changed, 179 insertions, 22 deletions

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 523729e70c..873209dd0f 100755
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -65,10 +65,11 @@ typedef struct _spl_array_object {
 	HashPosition      pos;
 	int               ar_flags;
 	int               is_self;
-	zend_function *   fptr_offset_get;
-	zend_function *   fptr_offset_set;
-	zend_function *   fptr_offset_has;
-	zend_function *   fptr_offset_del;
+	zend_function     *fptr_offset_get;
+	zend_function     *fptr_offset_set;
+	zend_function     *fptr_offset_has;
+	zend_function     *fptr_offset_del;
+	zend_function     *fptr_count;
 	zend_class_entry* ce_get_iterator;
 } spl_array_object;
 
@@ -201,6 +202,10 @@ static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type, s
 		if (intern->fptr_offset_del->common.scope == parent) {
 			intern->fptr_offset_del = NULL;
 		}
+		zend_hash_find(&class_type->function_table, "count",        sizeof("count"),        (void **) &intern->fptr_count);
+		if (intern->fptr_count->common.scope == parent) {
+			intern->fptr_count = NULL;
+		}
 	}
 	/* Cache iterator functions if ArrayIterator or derived. Check current's */
 	/* cache since only current is always required */
@@ -1171,9 +1176,8 @@ SPL_METHOD(Array, seek)
 	zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Seek position %ld is out of range", opos);
 } /* }}} */
 
-int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
+int inline spl_array_object_count_elements_helper(spl_array_object *intern, long *count TSRMLS_DC) /* {{{ */
 {
-	spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
 	HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
 	HashPosition pos;
 
@@ -1200,14 +1204,37 @@ int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /* {{{
 	}
 } /* }}} */
 
+int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
+{
+	spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
+
+	if (intern->fptr_count) {
+		zval *rv;
+		zend_call_method_with_0_params(&object, intern->std.ce, &intern->fptr_count, "count", &rv);
+		if (rv) {
+			zval_ptr_dtor(&intern->retval);
+			MAKE_STD_ZVAL(intern->retval);
+			ZVAL_ZVAL(intern->retval, rv, 1, 1);
+			convert_to_long(intern->retval);
+			*count = (long) Z_LVAL_P(intern->retval);
+			return SUCCESS;
+		}
+		*count = 0;
+		return FAILURE;
+	}
+	return spl_array_object_count_elements_helper(intern, count TSRMLS_CC);
+} /* }}} */
+
 /* {{{ proto int ArrayObject::count()
        proto int ArrayIterator::count()
  Return the number of elements in the Iterator. */
 SPL_METHOD(Array, count)
 {
 	long count;
+	spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	spl_array_object_count_elements_helper(intern, &count TSRMLS_CC);
 
-	spl_array_object_count_elements(getThis(), &count TSRMLS_CC);
 	RETURN_LONG(count);
 } /* }}} */
 
@@ -1226,9 +1253,9 @@ static void spl_array_method(INTERNAL_FUNCTION_PARAMETERS, char *fname, int fnam
 			zend_throw_exception(spl_ce_BadMethodCallException, "Function expects exactly one argument", 0 TSRMLS_CC);
 			return;
 		}
-		zend_call_method(NULL, NULL, NULL, fname, fname_len, &return_value, 2, &tmp, arg TSRMLS_CC);
+		zend_call_method(NULL, NULL, NULL, fname, fname_len, return_value_ptr, 2, &tmp, arg TSRMLS_CC);
 	} else {
-		zend_call_method(NULL, NULL, NULL, fname, fname_len, &return_value, 1, &tmp, NULL TSRMLS_CC);
+		zend_call_method(NULL, NULL, NULL, fname, fname_len, return_value_ptr, 1, &tmp, NULL TSRMLS_CC);
 	}
 } /* }}} */
 
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index d9594ce3e2..536a02532c 100644
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -92,6 +92,7 @@ struct _spl_dllist_object {
 	zend_function         *fptr_offset_set;
 	zend_function         *fptr_offset_has;
 	zend_function         *fptr_offset_del;
+	zend_function         *fptr_count;
 	zend_class_entry      *ce_get_iterator;
 };
 
@@ -434,6 +435,10 @@ static zend_object_value spl_dllist_object_new_ex(zend_class_entry *class_type,
 		if (intern->fptr_offset_del->common.scope == parent) {
 			intern->fptr_offset_del = NULL;
 		}
+		zend_hash_find(&class_type->function_table, "count",        sizeof("count"),        (void **) &intern->fptr_count);
+		if (intern->fptr_count->common.scope == parent) {
+			intern->fptr_count = NULL;
+		}
 	}
 
 	return retval;
@@ -469,8 +474,22 @@ static int spl_dllist_object_count_elements(zval *object, long *count TSRMLS_DC)
 {
 	spl_dllist_object *intern = (spl_dllist_object*)zend_object_store_get_object(object TSRMLS_CC);
 
-	*count = spl_ptr_llist_count(intern->llist);
+	if (intern->fptr_count) {
+		zval *rv;
+		zend_call_method_with_0_params(&object, intern->std.ce, &intern->fptr_count, "count", &rv);
+		if (rv) {
+			zval_ptr_dtor(&intern->retval);
+			MAKE_STD_ZVAL(intern->retval);
+			ZVAL_ZVAL(intern->retval, rv, 1, 1);
+			convert_to_long(intern->retval);
+			*count = (long) Z_LVAL_P(intern->retval);
+			return SUCCESS;
+		}
+		*count = 0;
+		return FAILURE;
+	}
 
+	*count = spl_ptr_llist_count(intern->llist);
 	return SUCCESS;
 } 
 /* }}} */
@@ -657,12 +676,13 @@ SPL_METHOD(SplDoublyLinkedList, bottom)
 SPL_METHOD(SplDoublyLinkedList, count)
 {
 	long count;
+	spl_dllist_object *intern = (spl_dllist_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
 		return;
 	}
 
-	spl_dllist_object_count_elements(getThis(), &count TSRMLS_CC);
+	count = spl_ptr_llist_count(intern->llist);
 	RETURN_LONG(count);
 }
 /* }}} */
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index 52c7cf659a..2ca36b7957 100644
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -61,6 +61,7 @@ typedef struct _spl_fixedarray_object { /* {{{ */
 	zend_function         *fptr_it_current;
 	zend_function         *fptr_it_key;
 	zend_function         *fptr_it_valid;
+	zend_function         *fptr_count;
 	int                    current;
 	zend_class_entry      *ce_get_iterator;
 } spl_fixedarray_object;
@@ -292,6 +293,10 @@ static zend_object_value spl_fixedarray_object_new_ex(zend_class_entry *class_ty
 		if (intern->fptr_it_valid->common.scope == parent) {
 			intern->fptr_it_valid = NULL;
 		}
+		zend_hash_find(&class_type->function_table, "count",        sizeof("count"),        (void **) &intern->fptr_count);
+		if (intern->fptr_count->common.scope == parent) {
+			intern->fptr_count = NULL;
+		}
 	}
 
 	return retval;
@@ -512,12 +517,23 @@ static int spl_fixedarray_object_count_elements(zval *object, long *count TSRMLS
 	spl_fixedarray_object *intern;
 	
 	intern = (spl_fixedarray_object *)zend_object_store_get_object(object TSRMLS_CC);
-	if (intern->array) {
+	if (intern->fptr_count) {
+		zval *rv;
+		zend_call_method_with_0_params(&object, intern->std.ce, &intern->fptr_count, "count", &rv);
+		if (rv) {
+			zval_ptr_dtor(&intern->retval);
+			MAKE_STD_ZVAL(intern->retval);
+			ZVAL_ZVAL(intern->retval, rv, 1, 1);
+			convert_to_long(intern->retval);
+			*count = (long) Z_LVAL_P(intern->retval);
+			return SUCCESS;
+		}
+	} else if (intern->array) {
 		*count = intern->array->size;
-	} else {
-		*count = 0;
+		return SUCCESS;
 	}
 
+	*count = 0;
 	return SUCCESS;
 }
 /* }}} */
@@ -945,7 +961,6 @@ PHP_MINIT_FUNCTION(spl_fixedarray)
 	memcpy(&spl_handler_SplFixedArray, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
 	spl_handler_SplFixedArray.clone_obj       = spl_fixedarray_object_clone;
-	spl_handler_SplFixedArray.count_elements  = spl_fixedarray_object_count_elements;
 	spl_handler_SplFixedArray.read_dimension  = spl_fixedarray_object_read_dimension;
 	spl_handler_SplFixedArray.write_dimension = spl_fixedarray_object_write_dimension;
 	spl_handler_SplFixedArray.unset_dimension = spl_fixedarray_object_unset_dimension;
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
index c810b15411..3c94eac853 100644
--- a/ext/spl/spl_heap.c
+++ b/ext/spl/spl_heap.c
@@ -75,6 +75,7 @@ struct _spl_heap_object {
 	int                 flags;
 	zend_class_entry   *ce_get_iterator;
 	zend_function      *fptr_cmp;
+	zend_function      *fptr_count;
 };
 
 /* define an overloaded iterator structure */
@@ -441,10 +442,13 @@ static zend_object_value spl_heap_object_new_ex(zend_class_entry *class_type, sp
 
 	if (inherited) {
 		zend_hash_find(&class_type->function_table, "compare",    sizeof("compare"),    (void **) &intern->fptr_cmp);
-
 		if (intern->fptr_cmp->common.scope == parent) {
 			intern->fptr_cmp = NULL;
 		}
+		zend_hash_find(&class_type->function_table, "count",        sizeof("count"),        (void **) &intern->fptr_count);
+		if (intern->fptr_count->common.scope == parent) {
+			intern->fptr_count = NULL;
+		}
 	}
 
 	return retval;
@@ -480,6 +484,21 @@ static int spl_heap_object_count_elements(zval *object, long *count TSRMLS_DC) /
 {
 	spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(object TSRMLS_CC);
 
+	if (intern->fptr_count) {
+		zval *rv;
+		zend_call_method_with_0_params(&object, intern->std.ce, &intern->fptr_count, "count", &rv);
+		if (rv) {
+			zval_ptr_dtor(&intern->retval);
+			MAKE_STD_ZVAL(intern->retval);
+			ZVAL_ZVAL(intern->retval, rv, 1, 1);
+			convert_to_long(intern->retval);
+			*count = (long) Z_LVAL_P(intern->retval);
+			return SUCCESS;
+		}
+		*count = 0;
+		return FAILURE;
+	}
+	
 	*count = spl_ptr_heap_count(intern->heap);
 
 	return SUCCESS;
@@ -545,12 +564,13 @@ static HashTable* spl_pqueue_object_get_debug_info(zval *obj, int *is_temp TSRML
 SPL_METHOD(SplHeap, count)
 {
 	long count;
+	spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
 		return;
 	}
 
-	spl_heap_object_count_elements(getThis(), &count TSRMLS_CC);
+	count = spl_ptr_heap_count(intern->heap);
 	RETURN_LONG(count);
 }
 /* }}} */
@@ -559,14 +579,13 @@ SPL_METHOD(SplHeap, count)
  Return true if the heap is empty. */
 SPL_METHOD(SplHeap, isEmpty)
 {
-	long count;
+	spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
 		return;
 	}
 
-	spl_heap_object_count_elements(getThis(), &count TSRMLS_CC);
-	RETURN_BOOL(count==0);
+	RETURN_BOOL(spl_ptr_heap_count(intern->heap)==0);
 }
 /* }}} */
 
diff --git a/ext/spl/tests/array_024.phpt b/ext/spl/tests/array_024.phpt
new file mode 100644
index 0000000000..0c073bfe78
--- /dev/null
+++ b/ext/spl/tests/array_024.phpt
@@ -0,0 +1,17 @@
+--TEST--
+SPL: ArrayObject with overriden count()
+--FILE--
+<?php
+$obj = new ArrayObject(array(1,2));
+var_dump(count($obj));
+class ArrayObject2 extends ArrayObject {
+    public function count() {
+        return -parent::count();
+    }
+}
+$obj = new ArrayObject2(array(1,2));
+var_dump(count($obj));
+?>
+--EXPECT--
+int(2)
+int(-2)
diff --git a/ext/spl/tests/dllist_008.phpt b/ext/spl/tests/dllist_008.phpt
new file mode 100644
index 0000000000..ab37d83afa
--- /dev/null
+++ b/ext/spl/tests/dllist_008.phpt
@@ -0,0 +1,21 @@
+--TEST--
+SPL: SplDoublyLinkedList with overriden count()
+--FILE--
+<?php
+$obj = new SplDoublyLinkedList();
+$obj[] = 1;
+$obj[] = 2;
+var_dump(count($obj));
+class SplDoublyLinkedList2 extends SplDoublyLinkedList{
+    public function count() {
+        return -parent::count();
+    }
+}
+$obj = new SplDoublyLinkedList2();
+$obj[] = 1;
+$obj[] = 2;
+var_dump(count($obj));
+?>
+--EXPECT--
+int(2)
+int(-2)
diff --git a/ext/spl/tests/fixedarray_018.phpt b/ext/spl/tests/fixedarray_018.phpt
new file mode 100644
index 0000000000..4965bb5279
--- /dev/null
+++ b/ext/spl/tests/fixedarray_018.phpt
@@ -0,0 +1,17 @@
+--TEST--
+SPL: SplFixedArray with overriden count()
+--FILE--
+<?php
+$obj = new SplFixedArray(2);
+var_dump(count($obj));
+class SplFixedArray2 extends SplFixedArray {
+    public function count() {
+        return -parent::count();
+    }
+}
+$obj = new SplFixedArray2(2);
+var_dump(count($obj));
+?>
+--EXPECT--
+int(2)
+int(-2)
diff --git a/ext/spl/tests/heap_010.phpt b/ext/spl/tests/heap_010.phpt
new file mode 100644
index 0000000000..8c7d8d5c96
--- /dev/null
+++ b/ext/spl/tests/heap_010.phpt
@@ -0,0 +1,21 @@
+--TEST--
+SPL: SplHeap with overriden count()
+--FILE--
+<?php
+$obj = new SplMaxHeap();
+$obj->insert(1);
+$obj->insert(2);
+var_dump(count($obj));
+class SplMaxHeap2 extends SplMaxHeap{
+    public function count() {
+        return -parent::count();
+    }
+}
+$obj = new SplMaxHeap2();
+$obj->insert(1);
+$obj->insert(2);
+var_dump(count($obj));
+?>
+--EXPECT--
+int(2)
+int(-2)
diff --git a/ext/spl/tests/sxe_004.phpt b/ext/spl/tests/sxe_004.phpt
index db55757bee..20431de8be 100755
--- a/ext/spl/tests/sxe_004.phpt
+++ b/ext/spl/tests/sxe_004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: SimpleXMLIterator and getChildren()
+SPL: SimpleXMLIterator and overridden iterator methods()
 --SKIPIF--
 <?php 
 if (!extension_loaded('simplexml')) print 'skip';
diff --git a/ext/spl/tests/sxe_005.phpt b/ext/spl/tests/sxe_005.phpt
index c5508140fe..183d351166 100755
--- a/ext/spl/tests/sxe_005.phpt
+++ b/ext/spl/tests/sxe_005.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: SimpleXMLIterator and getChildren()
+SPL: SimpleXMLIterator and overriden count()
 --SKIPIF--
 <?php 
 if (!extension_loaded('simplexml')) print 'skip';