diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-13 19:37:06 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-13 19:37:06 +0200 |
| commit | 191d9fc22740ba99968a6275c8d5a96460a66dbf (patch) | |
| tree | 897d4c4fe7c93923faef1d7235513c3cf42a1c7d | |
| parent | eca0644e0acb391540e40a320e10782225654baf (diff) | |
| parent | f07e37c96dd395305fe81192f2edbc8860e41d5d (diff) | |
| download | php-git-191d9fc22740ba99968a6275c8d5a96460a66dbf.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug67064.phpt | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -8,6 +8,8 @@ PHP NEWS . Fixed bug #66182 (exit in stream filter produces segfault). (Mike) . Fixed bug #66736 (fpassthru broken). (Mike) . Fixed bug #67043 (substr_compare broke by previous change) (Tjerk) + . Fixed bug #67064 (Countable interface prevents using 2nd parameter + ($mode) of count() function). (Bob) - Embed: . Fixed bug #65715 (php5embed.lib isn't provided anymore). (Anatol). diff --git a/ext/standard/tests/array/bug67064.phpt b/ext/standard/tests/array/bug67064.phpt index e1996e36b6..2818516dac 100644 --- a/ext/standard/tests/array/bug67064.phpt +++ b/ext/standard/tests/array/bug67064.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #67064 () +Bug #67064 (Countable interface prevents using 2nd parameter ($mode) of count() function) --FILE-- <?php class Counter implements Countable { |