diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-07-30 17:18:05 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-07-30 17:18:05 +0200 |
| commit | 354ee12b73dbe20d0c4fa7883eb34714f89109df (patch) | |
| tree | 9d392e4ed5daa05a5a56228ff170a05447c3c01e | |
| parent | f9258929201616750d418c629f7afdcfdab7dada (diff) | |
| download | php-git-354ee12b73dbe20d0c4fa7883eb34714f89109df.tar.gz | |
Revert "Fix bug #67064 in a BC safe way"
This reverts commit 1a4a9eede59b853f11e8e8b965e5f715f53da8f7.
Conflicts:
ext/standard/array.c
ext/standard/tests/array/bug67064.phpt
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | ext/standard/array.c | 5 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug67064.phpt | 17 |
3 files changed, 5 insertions, 22 deletions
@@ -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) |