From 1a4a9eede59b853f11e8e8b965e5f715f53da8f7 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sun, 13 Apr 2014 19:19:24 +0200 Subject: Fix bug #67064 in a BC safe way You can use an optional parameter now when implementing the Countable interface to get the $mode passed to count(). --- ext/standard/array.c | 5 ++++- ext/standard/tests/array/bug67064.phpt | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ext/standard/tests/array/bug67064.phpt diff --git a/ext/standard/array.c b/ext/standard/array.c index c2efca58fc..f807bb5ad1 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -333,7 +333,10 @@ 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)) { - zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval); + zval *mode_zv; + MAKE_STD_ZVAL(mode_zv); + Z_LVAL_P(mode_zv) = mode; + zend_call_method_with_1_params(&array, NULL, NULL, "count", &retval, mode_zv); 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 new file mode 100644 index 0000000000..e1996e36b6 --- /dev/null +++ b/ext/standard/tests/array/bug67064.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #67064 () +--FILE-- + +--EXPECTF-- +bool(true) +int(1) -- cgit v1.2.1