Merge branch 'PHP-5.4' into PHP-5.5

12 years ago · 191d9fc227
2 changed files with 3 additions and 1 deletions
--- a/2
+++ b/2
@ -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).
--- 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 {