Standard array test updates

Author: nikic

ext/standard/tests/array/005.phpt

@@ -33,18 +33,6 @@ $mixed_array = array(
 /* Testing Error Conditions */
 echo "\n*** Testing Error Conditions ***\n";
 
-/* Zero argument  */
-var_dump( array_shift() );
-
-/* Scalar argument */
-var_dump( array_shift($number) );
-
-/* String argument */
-var_dump( array_shift($str) );
-
-/* Invalid Number of arguments */
-var_dump( array_shift($mixed_array[1],$mixed_array[2]) );
-
 /* Empty Array as argument */
 var_dump( array_shift($empty_array) );
 
@@ -84,17 +72,6 @@ echo"Done";
 --EXPECTF--
 *** Testing Error Conditions ***
 
-Warning: array_shift() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
-NULL
-
-Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_shift() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
 NULL
 
 *** Testing with various array inputs ***

ext/standard/tests/array/009.phpt

@@ -69,51 +69,6 @@ foreach ($varient_arrays as $sub_array )  {
   echo "\n";
 }
 
-/*test these functions on array which is already unset */
-echo "\n-- Testing variation: when array is unset --\n";
-$unset_array = array (1);
-unset($unset_array);
-
-var_dump( current($unset_array) );
-var_dump( key($unset_array) );
-var_dump( next($unset_array) );
-var_dump( reset($unset_array) );
-
-
-echo "\n*** Testing error conditions ***\n";
-//Zero argument, expected 1 argument
-var_dump( key() );
-var_dump( current() );
-var_dump( reset() );
-var_dump( next() );
-
-// args more than expected, expected 1 argument
-$temp_array = array(1);
-var_dump( key($temp_array, $temp_array) );
-var_dump( current($temp_array, $temp_array) );
-var_dump( reset($temp_array, $temp_array) );
-var_dump( next($temp_array, $temp_array) );
-
-// invalid args type, valid argument: array
-$int_var = 1;
-$float_var = 1.5;
-$string = "string";
-var_dump( key($int_var) );
-var_dump( key($float_var) );
-var_dump( key($string) );
-
-var_dump( current($int_var) );
-var_dump( current($float_var) );
-var_dump( current($string) );
-
-var_dump( next($int_var) );
-var_dump( next($float_var) );
-var_dump( next($string) );
-
-var_dump( reset($int_var) );
-var_dump( reset($float_var) );
-var_dump( reset($string) );
-
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -455,85 +410,3 @@ array(5) {
   [0]=>
   string(4) "zero"
 }
-
-
--- Testing variation: when array is unset --
-
-Notice: Undefined variable: unset_array in %s on line %d
-
-Warning: current() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Notice: Undefined variable: unset_array in %s on line %d
-
-Warning: key() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: next() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: reset() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-*** Testing error conditions ***
-
-Warning: key() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: current() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: reset() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: next() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: key() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: current() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: reset() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: next() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: key() expects parameter 1 to be array, int given in %s on line %d
-NULL
-
-Warning: key() expects parameter 1 to be array, float given in %s on line %d
-NULL
-
-Warning: key() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: current() expects parameter 1 to be array, int given in %s on line %d
-NULL
-
-Warning: current() expects parameter 1 to be array, float given in %s on line %d
-NULL
-
-Warning: current() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: next() expects parameter 1 to be array, int given in %s on line %d
-NULL
-
-Warning: next() expects parameter 1 to be array, float given in %s on line %d
-NULL
-
-Warning: next() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: reset() expects parameter 1 to be array, int given in %s on line %d
-NULL
-
-Warning: reset() expects parameter 1 to be array, float given in %s on line %d
-NULL
-
-Warning: reset() expects parameter 1 to be array, string given in %s on line %d
-NULL
-Done

ext/standard/tests/array/array_change_key_case_variation.phpt

@@ -6,13 +6,16 @@ Test array_change_key_case() function - 2
 $item = array ("one" => 1, "two" => 2, "THREE" => 3, "FOUR" => "four");
 
 /* use 'case' argument other than CASE_LOWER & CASE_UPPER */
-var_dump(array_change_key_case($item, "CASE_UPPER"));
+try {
+    var_dump(array_change_key_case($item, "CASE_UPPER"));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump(array_change_key_case($item, 5));
 
 /* when keys are different in terms of only case */
 /* should return one value key pair with key being in lowercase */
 var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) );
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) );
 
 /* should return one value key pair with key being in uppercase */
 var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) );
@@ -21,8 +24,7 @@ var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 )
 echo "end\n";
 ?>
 --EXPECTF--
-Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
-NULL
+array_change_key_case() expects parameter 2 to be int, string given
 array(4) {
   ["ONE"]=>
   int(1)
@@ -37,9 +39,6 @@ array(1) {
   ["one"]=>
   int(4)
 }
-
-Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
-NULL
 array(1) {
   ["ONE"]=>
   int(3)

ext/standard/tests/array/array_column_error.phpt

@@ -11,18 +11,6 @@ Test array_column() function: error conditions
 
 echo "*** Testing array_column() : error conditions ***\n";
 
-echo "\n-- Testing array_column() function with Zero arguments --\n";
-var_dump(array_column());
-
-echo "\n-- Testing array_column() function with One argument --\n";
-var_dump(array_column(array()));
-
-echo "\n-- Testing array_column() function with string as first parameter --\n";
-var_dump(array_column('foo', 0));
-
-echo "\n-- Testing array_column() function with int as first parameter --\n";
-var_dump(array_column(1, 'foo'));
-
 echo "\n-- Testing array_column() column key parameter should be a string or an integer (testing bool) --\n";
 var_dump(array_column(array(), true));
 
@@ -40,26 +28,6 @@ echo "Done\n";
 --EXPECTF--
 *** Testing array_column() : error conditions ***
 
--- Testing array_column() function with Zero arguments --
-
-Warning: array_column() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
--- Testing array_column() function with One argument --
-
-Warning: array_column() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-
--- Testing array_column() function with string as first parameter --
-
-Warning: array_column() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Testing array_column() function with int as first parameter --
-
-Warning: array_column() expects parameter 1 to be array, int given in %s on line %d
-NULL
-
 -- Testing array_column() column key parameter should be a string or an integer (testing bool) --
 
 Warning: array_column(): The column key should be either a string or an integer in %s on line %d

ext/standard/tests/array/array_diff_uassoc_error.phpt

@@ -27,36 +27,38 @@ function key_compare_func($a, $b)
 
 //Test array_diff_uassoc with one more than the expected number of arguments
 echo "\n-- Testing array_diff_uassoc() function with more than expected no. of arguments --\n";
-var_dump( array_diff_uassoc($array1, $array2, "key_compare_func", $extra_arg) );
-var_dump( array_diff_uassoc($array1, $array2, $array3, $array4, "key_compare_func", $extra_arg) );
+try {
+    var_dump( array_diff_uassoc($array1, $array2, "key_compare_func", $extra_arg) );
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump( array_diff_uassoc($array1, $array2, $array3, $array4, "key_compare_func", $extra_arg) );
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 // Testing array_diff_uassoc with one less than the expected number of arguments
 echo "\n-- Testing array_diff_uassoc() function with less than expected no. of arguments --\n";
-var_dump( array_diff_uassoc($array1, $array2) );
+try {
+    var_dump( array_diff_uassoc($array1, $array2) );
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
-// Testing array_diff_uassoc with no arguments
-echo "\n-- Testing array_diff_uassoc() function with no arguments --\n";
-var_dump( array_diff_uassoc() );
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing array_diff_uassoc() : error conditions ***
 
 -- Testing array_diff_uassoc() function with more than expected no. of arguments --
 
-Warning: array_diff_uassoc() expects parameter 4 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
+array_diff_uassoc() expects parameter 4 to be a valid callback, array must have exactly two members
 
-Warning: array_diff_uassoc() expects parameter 6 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
+array_diff_uassoc() expects parameter 6 to be a valid callback, array must have exactly two members
 
 -- Testing array_diff_uassoc() function with less than expected no. of arguments --
 
-Warning: array_diff_uassoc(): at least 3 parameters are required, 2 given in %s on line %d
-NULL
-
--- Testing array_diff_uassoc() function with no arguments --
+array_diff_uassoc(): at least 3 parameters are required, 2 given
 
-Warning: array_diff_uassoc(): at least 3 parameters are required, 0 given in %s on line %d
-NULL
 ===DONE===

ext/standard/tests/array/array_diff_ukey_variation10.phpt

@@ -14,19 +14,25 @@ $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red");
 $array2 = array("a" => "green", "yellow", "red");
 
 //function name within double quotes
-var_dump( array_diff_ukey($array1, $array1, "unknown_function") );
+try {
+    var_dump( array_diff_ukey($array1, $array1, "unknown_function") );
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 //function name within single quotes
-var_dump( array_diff_ukey($array1, $array1, 'unknown_function') );
+try {
+    var_dump( array_diff_ukey($array1, $array1, 'unknown_function') );
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing array_diff_ukey() : usage variation ***
 
-Warning: array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
-NULL
+array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name
 
-Warning: array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
-NULL
+array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name
 ===DONE===

ext/standard/tests/array/array_fill_error.phpt

@@ -10,44 +10,16 @@ Test array_fill() function : error conditions
 
 echo "*** Testing array_fill() : error conditions ***\n";
 
-// Zero arguments
-echo "-- Testing array_fill() function with Zero arguments --\n";
-var_dump( array_fill() );
-
-// More than  expected number of arguments
-echo "-- Testing array_fill() function with more than expected no. of arguments --\n";
+// calling array_fill with negative values for 'num' parameter
 $start_key = 0;
-$num = 2;
-$val = 1;
-$extra_arg = 10;
-var_dump( array_fill($start_key,$num,$val, $extra_arg) );
-
-// Less than the expected number of arguments
-echo "-- Testing array_fill() function with less than expected no. of arguments --\n";
-$start_key = 0;
-$num = 2;
-var_dump( array_fill($start_key,$num) );
-
-//calling array_fill with negative values for 'num' parameter
 $num = -1;
+$val = 1;
 var_dump( array_fill($start_key,$num,$val) );
 
 echo "Done";
 ?>
 --EXPECTF--
 *** Testing array_fill() : error conditions ***
--- Testing array_fill() function with Zero arguments --
-
-Warning: array_fill() expects exactly 3 parameters, 0 given in %s on line %d
-NULL
--- Testing array_fill() function with more than expected no. of arguments --
-
-Warning: array_fill() expects exactly 3 parameters, 4 given in %s on line %d
-NULL
--- Testing array_fill() function with less than expected no. of arguments --
-
-Warning: array_fill() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
 
 Warning: array_fill(): Number of elements can't be negative in %s on line %d
 bool(false)