From: Bob Weinand <bobwei9@hotmail.com>
Date: Wed, 30 Jul 2014 15:18:05 +0000 (+0200)
Subject: Revert "Fix bug #67064 in a BC safe way"
X-Git-Tag: php-5.6.0RC4~1^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=354ee12b73dbe20d0c4fa7883eb34714f89109df;p=php

Revert "Fix bug #67064 in a BC safe way"

This reverts commit 1a4a9eede59b853f11e8e8b965e5f715f53da8f7.

Conflicts:
	ext/standard/array.c
	ext/standard/tests/array/bug67064.phpt
---

diff --git a/NEWS b/NEWS
index 70338ee750..ba5882767b 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,10 @@ PHP                                                                        NEWS
 ?? ??? 2014, PHP 5.6.0 Release Candidate 4
 
 - Core:
-  . Fixed bug #67693 (incorrect push to the empty array) (Tjerk)
+  . Fixed bug #67693 (incorrect push to the empty array). (Tjerk)
+
+ - SPL:
+  . Revert fix for bug #67064 (BC issues). (Bob)
 
 31 Jul 2014, PHP 5.6.0 Release Candidate 3
 
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 2792b86f02..cca2f2583c 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -333,10 +333,7 @@ PHP_FUNCTION(count)
 #ifdef HAVE_SPL
 			/* if not and the object implements Countable we call its count() method */
 			if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
-				zval *mode_zv;
-				MAKE_STD_ZVAL(mode_zv);
-				ZVAL_LONG(mode_zv, mode);
-				zend_call_method_with_1_params(&array, NULL, NULL, "count", &retval, mode_zv);
+				zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);
 				if (retval) {
 					convert_to_long_ex(&retval);
 					RETVAL_LONG(Z_LVAL_P(retval));
diff --git a/ext/standard/tests/array/bug67064.phpt b/ext/standard/tests/array/bug67064.phpt
deleted file mode 100644
index 2818516dac..0000000000
--- a/ext/standard/tests/array/bug67064.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Bug #67064 (Countable interface prevents using 2nd parameter ($mode) of count() function)
---FILE--
-<?php
-class Counter implements Countable {
-	public function count($mode = COUNT_NORMAL) {
-		var_dump($mode == COUNT_RECURSIVE);
-		return 1;
-	}
-}
-
-$counter = new Counter;
-var_dump(count($counter, COUNT_RECURSIVE));
-?>
---EXPECTF--
-bool(true)
-int(1)