From 904042bb83162c7a8fc3760a51ccf2c1780d2ef7 Mon Sep 17 00:00:00 2001
From: Zoe Slattery <zoe@php.net>
Date: Wed, 11 Apr 2007 11:44:37 +0000
Subject: [PATCH] new tests: array_merge, array_push, fprintf. modified tests:
 count_recursive, md5.

---
 ext/standard/tests/array/array_merge.phpt     | 762 ++++++++++++++++++
 ext/standard/tests/array/array_push.phpt      | 282 +++++++
 ext/standard/tests/array/count_recursive.phpt | 210 ++++-
 ext/standard/tests/strings/fprintf.phpt       | Bin 0 -> 5884 bytes
 ext/standard/tests/strings/md5.phpt           | Bin 612 -> 5821 bytes
 5 files changed, 1240 insertions(+), 14 deletions(-)
 create mode 100644 ext/standard/tests/array/array_merge.phpt
 create mode 100644 ext/standard/tests/array/array_push.phpt
 create mode 100644 ext/standard/tests/strings/fprintf.phpt

diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
new file mode 100644
index 0000000000..85eeca8ab1
--- /dev/null
+++ b/ext/standard/tests/array/array_merge.phpt
@@ -0,0 +1,762 @@
+--TEST--
+Test array_merge() function
+--FILE--
+<?php
+/* Prototype: array array_merge(array $array1 [, array $array2 [, array $...]]);
+   Description: Merge one or more arrays
+*/
+
+echo "\n*** Testing array_merge() basic functionality ***";
+$begin_array = array(
+  array(),
+  array( 1 => "string"),
+  array( "" => "string"),
+  array( -2.44444 => 12),
+  array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL,	"d" => -2.344),
+  array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,1 => -2.344),
+  array( NULL, 1.23 => "Hi", "string" => "hello", 
+  array("" => "World", "-2.34" => "a", "0" => "b"))
+);
+
+$end_array   = array(
+  array(),
+  array( 1 => "string"),
+  array( "" => "string"),
+  array( -2.44444 => 12),
+  array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344),
+  array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344), 
+  array( NULL, 1.23 => "Hi", "string" => "hello", 
+         array("" => "World", "-2.34" => "a", "0" => "b"))
+);
+
+/* loop through to merge two arrays */
+$count_outer = 0;
+foreach($begin_array as $first) {
+  echo "\n\n--- Iteration $count_outer ---";
+  $count_inner = 0;
+  foreach($end_array as $second) {
+    echo "\n-- Inner iteration $count_inner of Iteration $count_outer --\n";
+    $result = array_merge($first, $second);
+    print_r($result);
+    $count_inner++;
+  }			
+  $count_outer++;
+}
+
+
+echo "\n*** Testing array_merge() with three or more arrays ***\n";
+var_dump( array_merge( $end_array[0], 
+                       $end_array[5], 
+                       $end_array[4],
+                       $end_array[6]
+                     )
+        );
+
+var_dump( array_merge( $end_array[0], 
+                       $end_array[5], 
+                       array("array on fly"), 
+                       array("nullarray" => array())
+                     )
+        );
+
+
+echo "\n*** Testing single array argument ***\n";
+/* Empty array */
+var_dump(array_merge(array())); 
+
+/* associative array with string keys, which will not be re-indexed */
+var_dump(array_merge($begin_array[4]));
+
+/* associative array with numeric keys, which will be re-indexed */
+var_dump(array_merge($begin_array[5]));
+
+/* associative array with mixed keys and sub-array as element */
+var_dump(array_merge($begin_array[6]));
+
+echo "\n*** Testing array_merge() with typecasting non-array to array ***\n";
+var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34));
+
+echo "\n*** Testing error conditions ***";
+/* Invalid argumens */
+var_dump(array_merge());
+var_dump(array_merge(100, 200));
+var_dump(array_merge($begin_array[0], $begin_array[1], 100));
+var_dump(array_merge($begin_array[0], $begin_array[1], $arr4));
+
+echo "Done\n";
+?> 
+--EXPECTF--
+*** Testing array_merge() basic functionality ***
+
+--- Iteration 0 ---
+-- Inner iteration 0 of Iteration 0 --
+Array
+(
+)
+
+-- Inner iteration 1 of Iteration 0 --
+Array
+(
+    [0] => string
+)
+
+-- Inner iteration 2 of Iteration 0 --
+Array
+(
+    [] => string
+)
+
+-- Inner iteration 3 of Iteration 0 --
+Array
+(
+    [0] => 12
+)
+
+-- Inner iteration 4 of Iteration 0 --
+Array
+(
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 0 --
+Array
+(
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 0 --
+Array
+(
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+)
+
+
+--- Iteration 1 ---
+-- Inner iteration 0 of Iteration 1 --
+Array
+(
+    [0] => string
+)
+
+-- Inner iteration 1 of Iteration 1 --
+Array
+(
+    [0] => string
+    [1] => string
+)
+
+-- Inner iteration 2 of Iteration 1 --
+Array
+(
+    [0] => string
+    [] => string
+)
+
+-- Inner iteration 3 of Iteration 1 --
+Array
+(
+    [0] => string
+    [1] => 12
+)
+
+-- Inner iteration 4 of Iteration 1 --
+Array
+(
+    [0] => string
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 1 --
+Array
+(
+    [0] => string
+    [1] => 1
+    [2] => string
+    [3] => 
+    [4] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 1 --
+Array
+(
+    [0] => string
+    [1] => 
+    [2] => Hi
+    [string] => hello
+    [3] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+)
+
+
+--- Iteration 2 ---
+-- Inner iteration 0 of Iteration 2 --
+Array
+(
+    [] => string
+)
+
+-- Inner iteration 1 of Iteration 2 --
+Array
+(
+    [] => string
+    [0] => string
+)
+
+-- Inner iteration 2 of Iteration 2 --
+Array
+(
+    [] => string
+)
+
+-- Inner iteration 3 of Iteration 2 --
+Array
+(
+    [] => string
+    [0] => 12
+)
+
+-- Inner iteration 4 of Iteration 2 --
+Array
+(
+    [] => string
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 2 --
+Array
+(
+    [] => string
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 2 --
+Array
+(
+    [] => string
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+)
+
+
+--- Iteration 3 ---
+-- Inner iteration 0 of Iteration 3 --
+Array
+(
+    [0] => 12
+)
+
+-- Inner iteration 1 of Iteration 3 --
+Array
+(
+    [0] => 12
+    [1] => string
+)
+
+-- Inner iteration 2 of Iteration 3 --
+Array
+(
+    [0] => 12
+    [] => string
+)
+
+-- Inner iteration 3 of Iteration 3 --
+Array
+(
+    [0] => 12
+    [1] => 12
+)
+
+-- Inner iteration 4 of Iteration 3 --
+Array
+(
+    [0] => 12
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 3 --
+Array
+(
+    [0] => 12
+    [1] => 1
+    [2] => string
+    [3] => 
+    [4] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 3 --
+Array
+(
+    [0] => 12
+    [1] => 
+    [2] => Hi
+    [string] => hello
+    [3] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+)
+
+
+--- Iteration 4 ---
+-- Inner iteration 0 of Iteration 4 --
+Array
+(
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+)
+
+-- Inner iteration 1 of Iteration 4 --
+Array
+(
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+    [0] => string
+)
+
+-- Inner iteration 2 of Iteration 4 --
+Array
+(
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+    [] => string
+)
+
+-- Inner iteration 3 of Iteration 4 --
+Array
+(
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+    [0] => 12
+)
+
+-- Inner iteration 4 of Iteration 4 --
+Array
+(
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 4 --
+Array
+(
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 4 --
+Array
+(
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+)
+
+
+--- Iteration 5 ---
+-- Inner iteration 0 of Iteration 5 --
+Array
+(
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+)
+
+-- Inner iteration 1 of Iteration 5 --
+Array
+(
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+    [4] => string
+)
+
+-- Inner iteration 2 of Iteration 5 --
+Array
+(
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+    [] => string
+)
+
+-- Inner iteration 3 of Iteration 5 --
+Array
+(
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+    [4] => 12
+)
+
+-- Inner iteration 4 of Iteration 5 --
+Array
+(
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 5 --
+Array
+(
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+    [4] => 1
+    [5] => string
+    [6] => 
+    [7] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 5 --
+Array
+(
+    [0] => 1
+    [1] => string
+    [2] => 
+    [3] => -2.344
+    [4] => 
+    [5] => Hi
+    [string] => hello
+    [6] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+)
+
+
+--- Iteration 6 ---
+-- Inner iteration 0 of Iteration 6 --
+Array
+(
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+)
+
+-- Inner iteration 1 of Iteration 6 --
+Array
+(
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+    [3] => string
+)
+
+-- Inner iteration 2 of Iteration 6 --
+Array
+(
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+    [] => string
+)
+
+-- Inner iteration 3 of Iteration 6 --
+Array
+(
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+    [3] => 12
+)
+
+-- Inner iteration 4 of Iteration 6 --
+Array
+(
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+    [a] => 1
+    [b] => string
+    [c] => 
+    [d] => -2.344
+)
+
+-- Inner iteration 5 of Iteration 6 --
+Array
+(
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+    [3] => 1
+    [4] => string
+    [5] => 
+    [6] => -2.344
+)
+
+-- Inner iteration 6 of Iteration 6 --
+Array
+(
+    [0] => 
+    [1] => Hi
+    [string] => hello
+    [2] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+    [3] => 
+    [4] => Hi
+    [5] => Array
+        (
+            [] => World
+            [-2.34] => a
+            [0] => b
+        )
+
+)
+
+*** Testing array_merge() with three or more arrays ***
+array(12) {
+  [0]=>
+  int(1)
+  [1]=>
+  string(6) "string"
+  [2]=>
+  NULL
+  [3]=>
+  float(-2.344)
+  ["a"]=>
+  int(1)
+  ["b"]=>
+  string(6) "string"
+  ["c"]=>
+  NULL
+  ["d"]=>
+  float(-2.344)
+  [4]=>
+  NULL
+  [5]=>
+  string(2) "Hi"
+  ["string"]=>
+  string(5) "hello"
+  [6]=>
+  array(3) {
+    [""]=>
+    string(5) "World"
+    ["-2.34"]=>
+    string(1) "a"
+    [0]=>
+    string(1) "b"
+  }
+}
+array(6) {
+  [0]=>
+  int(1)
+  [1]=>
+  string(6) "string"
+  [2]=>
+  NULL
+  [3]=>
+  float(-2.344)
+  [4]=>
+  string(12) "array on fly"
+  ["nullarray"]=>
+  array(0) {
+  }
+}
+
+*** Testing single array argument ***
+array(0) {
+}
+array(4) {
+  ["a"]=>
+  int(1)
+  ["b"]=>
+  string(6) "string"
+  ["c"]=>
+  NULL
+  ["d"]=>
+  float(-2.344)
+}
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  string(6) "string"
+  [2]=>
+  NULL
+  [3]=>
+  float(-2.344)
+}
+array(4) {
+  [0]=>
+  NULL
+  [1]=>
+  string(2) "Hi"
+  ["string"]=>
+  string(5) "hello"
+  [2]=>
+  array(3) {
+    [""]=>
+    string(5) "World"
+    ["-2.34"]=>
+    string(1) "a"
+    [0]=>
+    string(1) "b"
+  }
+}
+
+*** Testing array_merge() with typecasting non-array to array ***
+array(7) {
+  ["a"]=>
+  int(1)
+  ["b"]=>
+  string(6) "string"
+  ["c"]=>
+  NULL
+  ["d"]=>
+  float(-2.344)
+  [0]=>
+  string(5) "type1"
+  [1]=>
+  int(10)
+  [2]=>
+  float(12.34)
+}
+
+*** Testing error conditions ***
+Warning: Wrong parameter count for array_merge() in %s on line %d
+NULL
+
+Warning: array_merge(): Argument #1 is not an array in %s on line %d
+
+Warning: array_merge(): Argument #2 is not an array in %s on line %d
+NULL
+
+Warning: array_merge(): Argument #3 is not an array in %s on line %d
+NULL
+
+Notice: Undefined variable: arr4 in %s on line %d
+
+Warning: array_merge(): Argument #3 is not an array in %s on line %d
+NULL
+Done
diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt
new file mode 100644
index 0000000000..b06ee6d3d3
--- /dev/null
+++ b/ext/standard/tests/array/array_push.phpt
@@ -0,0 +1,282 @@
+--TEST--
+Test array_push() function
+--FILE--
+<?php
+
+/* Prototype: int array_push( array &array );
+ * Description: Push one or more elements onto the end of array
+ and returns the new number of elements in the array.
+ */
+
+$empty_array = array();
+$number = 5;
+$str = "abc";
+
+
+/* Various combinations of arrays to be used for the test */
+$mixed_array = array(
+  array(),
+  array( 1,2,3,4,5,6,7,8,9 ),
+  array( "One", "_Two", "Three", "Four", "Five" ),
+  array( 6, "six", 7, "seven", 8, "eight", 9, "nine" ),
+  array( "a" => "aaa", "A" => "AAA", "c" => "ccc", "d" => "ddd", "e" => "eee" ),
+  array( "1" => "one", "2" => "two", "3" => "three", "4" => "four", "5" => "five" ),
+  array( 1 => "one", 2 => "two", 3 => 7, 4 => "four", 5 => "five" ),
+  array( "f" => "fff", "1" => "one", 4 => 6, "" => "blank", 2.4 => "float", "F" => "FFF",
+         "blank" => "", 3.7 => 3.7, 5.4 => 7, 6 => 8.6, '5' => "Five", "4name" => "jonny", "a" => NULL, NULL => 3 ),
+  array( 12, "name", 'age', '45' ),
+  array( array("oNe", "tWo", 4), array(10, 20, 30, 40, 50), array() ),
+  array( "one" => 1, "one" => 2, "three" => 3, 3, 4, 3 => 33, 4 => 44, 5, 6,
+          5.4 => 54, 5.7 => 57, "5.4" => 554, "5.7" => 557 )
+);
+
+/* Error Conditions */
+echo "\n*** Testing Error Conditions ***\n";
+
+/* Zero argument  */
+var_dump( array_push() );
+
+/* Scalar argument */
+var_dump( array_push($number, 22) );
+
+/* String argument */
+var_dump( array_push($str, 22) );
+
+/* Invalid Number of arguments */
+var_dump( array_push($mixed_array[1],1,2) );
+
+/* Empty Array as argument */
+var_dump( array_push($empty_array, 2) );
+
+
+/* Loop to test normal functionality with different arrays inputs */
+echo "\n*** Testing with various array inputs ***\n";
+
+$counter = 1;
+foreach( $mixed_array as $sub_array )
+{ 
+ echo "\n-- Input Array for Iteration $counter is --\n";
+ print_r( $sub_array );
+ echo "\nOutput after push is :\n";
+ var_dump( array_push($sub_array, 22, "abc") );
+ $counter++;
+} 
+
+/* Checking for return value and the new array formed from push operation */
+echo "\n*** Checking for return value and the new array formed from push operation ***\n";
+var_dump( array_push($mixed_array[2], 22, 33, "44") );
+var_dump( $mixed_array[2] );
+
+echo"\nDone";
+?>
+--EXPECTF--
+*** Testing Error Conditions ***
+
+Warning: Wrong parameter count for array_push() in %s on line %d
+NULL
+
+Warning: array_push(): First argument should be an array in %s on line %d
+bool(false)
+
+Warning: array_push(): First argument should be an array in %s on line %d
+bool(false)
+int(11)
+int(1)
+
+*** Testing with various array inputs ***
+
+-- Input Array for Iteration 1 is --
+Array
+(
+)
+
+Output after push is :
+int(2)
+
+-- Input Array for Iteration 2 is --
+Array
+(
+    [0] => 1
+    [1] => 2
+    [2] => 3
+    [3] => 4
+    [4] => 5
+    [5] => 6
+    [6] => 7
+    [7] => 8
+    [8] => 9
+    [9] => 1
+    [10] => 2
+)
+
+Output after push is :
+int(13)
+
+-- Input Array for Iteration 3 is --
+Array
+(
+    [0] => One
+    [1] => _Two
+    [2] => Three
+    [3] => Four
+    [4] => Five
+)
+
+Output after push is :
+int(7)
+
+-- Input Array for Iteration 4 is --
+Array
+(
+    [0] => 6
+    [1] => six
+    [2] => 7
+    [3] => seven
+    [4] => 8
+    [5] => eight
+    [6] => 9
+    [7] => nine
+)
+
+Output after push is :
+int(10)
+
+-- Input Array for Iteration 5 is --
+Array
+(
+    [a] => aaa
+    [A] => AAA
+    [c] => ccc
+    [d] => ddd
+    [e] => eee
+)
+
+Output after push is :
+int(7)
+
+-- Input Array for Iteration 6 is --
+Array
+(
+    [1] => one
+    [2] => two
+    [3] => three
+    [4] => four
+    [5] => five
+)
+
+Output after push is :
+int(7)
+
+-- Input Array for Iteration 7 is --
+Array
+(
+    [1] => one
+    [2] => two
+    [3] => 7
+    [4] => four
+    [5] => five
+)
+
+Output after push is :
+int(7)
+
+-- Input Array for Iteration 8 is --
+Array
+(
+    [f] => fff
+    [1] => one
+    [4] => 6
+    [] => 3
+    [2] => float
+    [F] => FFF
+    [blank] => 
+    [3] => 3.7
+    [5] => Five
+    [6] => 8.6
+    [4name] => jonny
+    [a] => 
+)
+
+Output after push is :
+int(14)
+
+-- Input Array for Iteration 9 is --
+Array
+(
+    [0] => 12
+    [1] => name
+    [2] => age
+    [3] => 45
+)
+
+Output after push is :
+int(6)
+
+-- Input Array for Iteration 10 is --
+Array
+(
+    [0] => Array
+        (
+            [0] => oNe
+            [1] => tWo
+            [2] => 4
+        )
+
+    [1] => Array
+        (
+            [0] => 10
+            [1] => 20
+            [2] => 30
+            [3] => 40
+            [4] => 50
+        )
+
+    [2] => Array
+        (
+        )
+
+)
+
+Output after push is :
+int(5)
+
+-- Input Array for Iteration 11 is --
+Array
+(
+    [one] => 2
+    [three] => 3
+    [0] => 3
+    [1] => 4
+    [3] => 33
+    [4] => 44
+    [5] => 57
+    [6] => 6
+    [5.4] => 554
+    [5.7] => 557
+)
+
+Output after push is :
+int(12)
+
+*** Checking for return value and the new array formed from push operation ***
+int(8)
+array(8) {
+  [0]=>
+  string(3) "One"
+  [1]=>
+  string(4) "_Two"
+  [2]=>
+  string(5) "Three"
+  [3]=>
+  string(4) "Four"
+  [4]=>
+  string(4) "Five"
+  [5]=>
+  int(22)
+  [6]=>
+  int(33)
+  [7]=>
+  string(2) "44"
+}
+
+Done
diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index e6824ab0e5..71f620afbd 100644
--- a/ext/standard/tests/array/count_recursive.phpt
+++ b/ext/standard/tests/array/count_recursive.phpt
@@ -1,52 +1,234 @@
 --TEST--
-count
+Test count() function 
 --FILE--
 <?php
-print "Testing NULL...\n";
+/* Prototype: int count ( mixed $var [, int $mode] );
+   Discription: Count elements in an array, or properties in an object
+*/
+
+echo "*** Testing basic functionality of count() function ***\n";
+print "-- Testing NULL --\n";
 $arr = NULL;
 print "COUNT_NORMAL: should be 0, is ".count($arr, COUNT_NORMAL)."\n";
 print "COUNT_RECURSIVE: should be 0, is ".count($arr, COUNT_RECURSIVE)."\n";
 
-print "Testing arrays...\n";
+print "-- Testing arrays --\n";
 $arr = array(1, array(3, 4, array(6, array(8))));
 print "COUNT_NORMAL: should be 2, is ".count($arr, COUNT_NORMAL)."\n";
 print "COUNT_RECURSIVE: should be 8, is ".count($arr, COUNT_RECURSIVE)."\n";
 
-print "Testing hashes...\n";
+print "-- Testing hashes --\n";
 $arr = array("a" => 1, "b" => 2, array("c" => 3, array("d" => 5)));
 print "COUNT_NORMAL: should be 3, is ".count($arr, COUNT_NORMAL)."\n";
 print "COUNT_RECURSIVE: should be 6, is ".count($arr, COUNT_RECURSIVE)."\n";
 
-print "Testing strings...\n";
+print "-- Testing strings --\n";
 print "COUNT_NORMAL: should be 1, is ".count("string", COUNT_NORMAL)."\n";
 print "COUNT_RECURSIVE: should be 1, is ".count("string", COUNT_RECURSIVE)."\n";
 
-print "Testing various types with no second argument.\n";
+print "-- Testing various types with no second argument --\n";
 print "COUNT_NORMAL: should be 1, is ".count("string")."\n";
 print "COUNT_NORMAL: should be 2, is ".count(array("a", array("b")))."\n";
 
 $arr = array('a'=>array(NULL, NULL, NULL), 1=>array(NULL=>1, 1=>NULL),
 	array(array(array(array(array(NULL))))));
-print "Testing really cool arrays ;)\n";
+print "-- Testing really cool arrays --\n";
 print "COUNT_NORMAL: should be 3, is ".count($arr, COUNT_NORMAL)."\n";
 print "COUNT_RECURSIVE: should be 13, is ".count($arr, COUNT_RECURSIVE)."\n";
+
+echo "\n*** Testing possible variations of count() function on arrays ***";
+$count_array = array(
+  array(),
+  array( 1 => "string"),
+  array( "" => "string", 0 => "a", NULL => "b", -1.00 => "c",
+         array(array(array(NULL)))),
+  array( -2.44444 => 12, array(array(1, 2, array(array("0"))))),
+  array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344),
+  array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,
+         1 => -2.344, array()),
+  array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ", 
+	 NULL => NULL, "\x000" => "\x000", "\000" => "\000"),
+  array( NULL, 1.23 => "Hi", "string" => "hello", 
+         array("" => "World", "-2.34" => "a", "0" => "b"))
+);
+
+$i = 0;
+foreach ($count_array as $count_value) {
+  echo "\n-- Iteration $i --\n";
+  print "COUNT_NORMAL is ".count($count_value, COUNT_NORMAL)."\n";
+  print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n";  
+  $i++;
+}
+
+
+/* Testing count() by passing constant with no second argument */
+print "\n-- Testing count() on constants with no second argument --\n";
+print "COUNT_NORMAL: should be 1, is ".count(100)."\n"; 
+print "COUNT_NORMAL: should be 1, is ".count(-23.45)."\n";
+
+print "\n-- Testing count() on NULL and Unset variables --\n";
+print "COUNT_NORMAL: should be 0, is ".count(NULL)."\n";
+print "COUNT_NORMAL: should be 1, is ".count("")."\n";
+print "COUNT_NORMAL: should be 0, is ".@count($a)."\n";
+
+
+print "\n-- Testing count() on an empty sub-array --\n";
+$arr = array(1, array(3, 4, array()));
+print "COUNT_NORMAL: should be 2, is ".count($arr, COUNT_NORMAL)."\n";
+print "COUNT_RECURSIVE: should be 5, is ".count($arr, COUNT_RECURSIVE)."\n";
+
+echo "\n-- Testing count() on objects with Countable interface --\n";
+class count_class implements Countable {
+  private $var_private;
+  public $var_public;
+  protected $var_protected;
+
+  public function count() {
+    return 3;
+  }
+}
+
+$obj = new count_class();
+print "COUNT_NORMAL: should be 3, is ".count($obj)."\n";
+
+
+echo "\n-- Testing count() on resource type --\n";
+$resource1 = fopen( __FILE__, "r" );  // Creating file(stream type) resource
+$resource2 = opendir( "." );  // Creating dir resource
+
+/* creating an array with resources as elements */
+$arr_resource = array("a" => $resource1, "b" => $resource2);
+var_dump(count($arr_resource));
+
+echo "\n-- Testing count() on arrays containing references --\n";
+$arr = array(1, array("a", "b", "c"));
+$arr[2] = &$arr[1];
+
+$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE, 
+                   FALSE, NULL);
+for( $i =0; $i < count( $mode_arr ); $i++) {
+  echo "For mode '$mode_arr[$i]' count is => ";
+  var_dump(count($arr, $mode_arr[$i]));
+}
+  
+
+echo "\n-- Testing error conditions --";
+var_dump( count() );  // No. of args = 0
+var_dump( count(array(), COUNT_NORMAL, 100) );  // No. of args > expected
+
+/* Testing Invalid type arguments */
+var_dump( count("string", ABCD) );
+var_dump( count(100, "string") );
+var_dump( count(array(), "") );
+
+echo "\nDone";
+
+--CLEAN--
+/* closing the resource handles */
+fclose( $resource1 );
+closedir( $resource2 );
 ?>
---EXPECT--
-Testing NULL...
+--EXPECTF--
+*** Testing basic functionality of count() function ***
+-- Testing NULL --
 COUNT_NORMAL: should be 0, is 0
 COUNT_RECURSIVE: should be 0, is 0
-Testing arrays...
+-- Testing arrays --
 COUNT_NORMAL: should be 2, is 2
 COUNT_RECURSIVE: should be 8, is 8
-Testing hashes...
+-- Testing hashes --
 COUNT_NORMAL: should be 3, is 3
 COUNT_RECURSIVE: should be 6, is 6
-Testing strings...
+-- Testing strings --
 COUNT_NORMAL: should be 1, is 1
 COUNT_RECURSIVE: should be 1, is 1
-Testing various types with no second argument.
+-- Testing various types with no second argument --
 COUNT_NORMAL: should be 1, is 1
 COUNT_NORMAL: should be 2, is 2
-Testing really cool arrays ;)
+-- Testing really cool arrays --
 COUNT_NORMAL: should be 3, is 3
 COUNT_RECURSIVE: should be 13, is 13
+
+*** Testing possible variations of count() function on arrays ***
+-- Iteration 0 --
+COUNT_NORMAL is 0
+COUNT_RECURSIVE is 0
+
+-- Iteration 1 --
+COUNT_NORMAL is 1
+COUNT_RECURSIVE is 1
+
+-- Iteration 2 --
+COUNT_NORMAL is 4
+COUNT_RECURSIVE is 7
+
+-- Iteration 3 --
+COUNT_NORMAL is 2
+COUNT_RECURSIVE is 8
+
+-- Iteration 4 --
+COUNT_NORMAL is 4
+COUNT_RECURSIVE is 4
+
+-- Iteration 5 --
+COUNT_NORMAL is 5
+COUNT_RECURSIVE is 5
+
+-- Iteration 6 --
+COUNT_NORMAL is 6
+COUNT_RECURSIVE is 6
+
+-- Iteration 7 --
+COUNT_NORMAL is 4
+COUNT_RECURSIVE is 7
+
+-- Testing count() on constants with no second argument --
+COUNT_NORMAL: should be 1, is 1
+COUNT_NORMAL: should be 1, is 1
+
+-- Testing count() on NULL and Unset variables --
+COUNT_NORMAL: should be 0, is 0
+COUNT_NORMAL: should be 1, is 1
+COUNT_NORMAL: should be 0, is 0
+
+-- Testing count() on an empty sub-array --
+COUNT_NORMAL: should be 2, is 2
+COUNT_RECURSIVE: should be 5, is 5
+
+-- Testing count() on objects with Countable interface --
+COUNT_NORMAL: should be 3, is 3
+
+-- Testing count() on resource type --
+int(2)
+
+-- Testing count() on arrays containing references --
+For mode '0' count is => int(3)
+For mode '1' count is => int(9)
+For mode '0' count is => int(3)
+For mode '1' count is => int(9)
+For mode '-1' count is => int(3)
+For mode '-1.45' count is => int(3)
+For mode '2' count is => int(3)
+For mode '1' count is => int(9)
+For mode '' count is => int(3)
+For mode '' count is => int(3)
+
+-- Testing error conditions --
+Warning: count() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: count() expects at most 2 parameters, 3 given in %s on line %d
+NULL
+
+Notice: Use of undefined constant ABCD - assumed 'ABCD' in %s on line %d
+
+Warning: count() expects parameter 2 to be long, string given in %s on line %d
+NULL
+
+Warning: count() expects parameter 2 to be long, string given in %s on line %d
+NULL
+
+Warning: count() expects parameter 2 to be long, string given in %s on line %d
+NULL
+
+Done
diff --git a/ext/standard/tests/strings/fprintf.phpt b/ext/standard/tests/strings/fprintf.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..6ffa62a233600e1aa934fb19df18e9d72a7c5373
GIT binary patch
literal 5884
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

literal 0
HcmV?d00001

diff --git a/ext/standard/tests/strings/md5.phpt b/ext/standard/tests/strings/md5.phpt
index 32dba03609acc1033e96bf8bf4280c9087899893..0b4ba8273cb18f5eac0aec7c08fca6bc6c7968cb 100644
GIT binary patch
literal 5821
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
V+}Na(E}~L!N>l=33F=#8@Lxu$_}u^i

delta 60
zcmdn1`-DYOS2x5pI7C;MD>ubdLsOwVvm`^oG1%GDbE2*I#y9qieD-!+y1K3r0j|y<
ORg>ko6(;ZGI1T_6{}Fot

-- 
2.50.1