array test fixes

nikic · nikic · commit b9c56905f011 · 2019-03-07T15:56:00.000+01:00
diff --git a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt
@@ -30,7 +30,7 @@ $testClassInstance->prop = "Hello";
 echo "invoke() on a non-object:\n";
 try {
     var_dump($foo->invoke(true));
-} catch (ReflectionException $e) {
+} catch (TypeError $e) {
     var_dump($e->getMessage());
 }
 
@@ -59,9 +59,7 @@ try {
 ?>
 --EXPECTF--
 invoke() on a non-object:
-
-Warning: ReflectionMethod::invoke() expects parameter 1 to be object, bool given in %s%eReflectionMethod_invoke_error1.php on line %d
-NULL
+string(71) "ReflectionMethod::invoke() expects parameter 1 to be object, bool given"
 
 invoke() on a non-instance:
 string(72) "Given object is not an instance of the class this method was declared in"
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
@@ -43,6 +43,7 @@ if (!extension_loaded('sockets')) {
 
     socket_close($socket);
 --EXPECT--
+bool(false)
 Received Ping! from remote address 127.0.0.1 and remote port 1223
 --CREDITS--
 Falko Menge <mail at falko-menge dot de>
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
@@ -45,6 +45,7 @@ require 'ipv6_skipif.inc';
 
     socket_close($socket);
 --EXPECT--
+bool(false)
 Received Ping! from remote address ::1 and remote port 1223
 --CREDITS--
 Falko Menge <mail at falko-menge dot de>
diff --git a/ext/standard/tests/array/array_diff_uassoc_error.phpt b/ext/standard/tests/array/array_diff_uassoc_error.phpt
@@ -40,11 +40,7 @@ try {
 
 // 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";
-try {
-    var_dump( array_diff_uassoc($array1, $array2) );
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
-}
+var_dump( array_diff_uassoc($array1, $array2) );
 
 ?>
 ===DONE===
@@ -57,6 +53,6 @@ array_diff_uassoc() expects parameter 6 to be a valid callback, array must have
 
 -- Testing array_diff_uassoc() function with less than expected no. of arguments --
 
-array_diff_uassoc(): at least 3 parameters are required, 2 given
-
+Warning: array_diff_uassoc(): at least 3 parameters are required, 2 given in %s on line %d
+NULL
 ===DONE===
diff --git a/ext/standard/tests/array/array_fill_keys.phpt b/ext/standard/tests/array/array_fill_keys.phpt
@@ -4,15 +4,12 @@ basic array_fill_keys test
 precision=14
 --FILE--
 <?php
-	var_dump(array_fill_keys('test', 1));
 	var_dump(array_fill_keys(array(), 1));
 	var_dump(array_fill_keys(array('foo', 'bar'), NULL));
 	var_dump(array_fill_keys(array('5', 'foo', 10, 1.23), 123));
 	var_dump(array_fill_keys(array('test', TRUE, 10, 100), ''));
 ?>
---EXPECTF--
-Warning: array_fill_keys() expects parameter 1 to be array, string given in %s on line %d
-NULL
+--EXPECT--
 array(0) {
 }
 array(2) {
diff --git a/ext/standard/tests/array/array_fill_keys_variation3.phpt b/ext/standard/tests/array/array_fill_keys_variation3.phpt
@@ -31,5 +31,4 @@ array(2) {
   ["two"]=>
   resource(%d) of type (stream)
 }
-
 Done
diff --git a/ext/standard/tests/array/array_filter_variation10.phpt b/ext/standard/tests/array/array_filter_variation10.phpt
@@ -92,14 +92,5 @@ array(2) {
   ["b"]=>
   int(2)
 }
-
-Warning: is_numeric() expects exactly 1 parameter, 2 given in %s on line 48
-
-Warning: is_numeric() expects exactly 1 parameter, 2 given in %s on line 48
-
-Warning: is_numeric() expects exactly 1 parameter, 2 given in %s on line 48
-
-Warning: is_numeric() expects exactly 1 parameter, 2 given in %s on line 48
-array(0) {
-}
+is_numeric() expects exactly 1 parameter, 2 given
 Done
diff --git a/ext/standard/tests/array/array_keys_error.phpt b/ext/standard/tests/array/array_keys_error.phpt
@@ -3,7 +3,7 @@ Test array_keys() function (error conditions)
 --FILE--
 <?php
 
-echo "\n*** Testing error conditions ***";
+echo "\n*** Testing error conditions ***\n";
 try {
     var_dump(array_keys(new stdclass));  // object
 } catch (TypeError $e) {
diff --git a/ext/standard/tests/array/array_map_object1.phpt b/ext/standard/tests/array/array_map_object1.phpt
@@ -28,7 +28,11 @@ class SimpleClass
 }
 function test($cb, $args) {
   echo join('::', $cb) . "\n";
-  var_dump(array_map($cb, $args));
+  try {
+    var_dump(array_map($cb, $args));
+  } catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+  }
 }
 test(array('SimpleClass', 'square'), array(1, 2));
 
@@ -135,21 +139,15 @@ array(2) {
 
 -- simple class with private variable and method --
 SimpleClassPri::add
-
-Warning: array_map() expects parameter 1 to be a valid callback, cannot access private method SimpleClassPri::add() in %sarray_map_object1.php on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, cannot access private method SimpleClassPri::add()
 
 -- simple class with protected variable and method --
 SimpleClassPro::mul
-
-Warning: array_map() expects parameter 1 to be a valid callback, cannot access protected method SimpleClassPro::mul() in %sarray_map_object1.php on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, cannot access protected method SimpleClassPro::mul()
 
 -- class without members --
 EmptyClass
-
-Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in %sarray_map_object1.php on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, array must have exactly two members
 
 -- abstract class --
 ChildClass::emptyFunction
@@ -182,13 +180,9 @@ array(2) {
   int(4)
 }
 StaticClass::cube
-
-Warning: array_map() expects parameter 1 to be a valid callback, cannot access private method StaticClass::cube() in %sarray_map_object1.php on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, cannot access private method StaticClass::cube()
 StaticClass::retVal
-
-Warning: array_map() expects parameter 1 to be a valid callback, cannot access protected method StaticClass::retVal() in %sarray_map_object1.php on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, cannot access protected method StaticClass::retVal()
 -- class implementing an interface --
 InterClass::square
 array(2) {
diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt
@@ -62,7 +62,5 @@ array(3) {
   NULL
 }
 -- with language construct --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name
 Done
diff --git a/ext/standard/tests/array/array_map_variation16.phpt b/ext/standard/tests/array/array_map_variation16.phpt
@@ -43,35 +43,19 @@ echo "Done";
 --EXPECTF--
 *** Testing array_map() : non-permmited built-in functions ***
 -- Iteration 1 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name
 -- Iteration 2 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'array' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'array' not found or invalid function name
 -- Iteration 3 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'empty' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'empty' not found or invalid function name
 -- Iteration 4 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'eval' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'eval' not found or invalid function name
 -- Iteration 5 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'exit' not found or invalid function name
 -- Iteration 6 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'isset' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'isset' not found or invalid function name
 -- Iteration 7 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'list' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'list' not found or invalid function name
 -- Iteration 8 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'print' not found or invalid function name in %s on line %d
-NULL
+array_map() expects parameter 1 to be a valid callback, function 'print' not found or invalid function name
 Done
diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt
@@ -66,7 +66,7 @@ $unexpected_callbacks = array(
 
 // loop through each element of $inputs to check the behavior of array_map
 for($count = 0; $count < count($unexpected_callbacks); $count++) {
-    echo "\n-- Iteration ".($count + 1)." --";
+    echo "\n-- Iteration ".($count + 1)." --\n";
     try {
         var_dump( array_map($unexpected_callbacks[$count], $arr1));
     } catch (TypeError $e) {
diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
@@ -78,9 +78,13 @@ 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 ***";
+echo "\n*** Testing error conditions ***\n";
 /* Invalid arguments */
-var_dump(array_merge());
+try {
+    var_dump(array_merge());
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt
@@ -62,7 +62,6 @@ echo"\nDone";
 ?>
 --EXPECTF--
 *** Testing Edge Conditions ***
-
 int(11)
 int(1)
 
diff --git a/ext/standard/tests/array/array_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt
@@ -18,10 +18,6 @@ array(1) {
   [0]=>
   string(0) ""
 }
-array(1) {
-  [0]=>
-  string(0) ""
-}
 int(2)
 array(2) {
   [0]=>
diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt
@@ -61,5 +61,5 @@ Exception: Too few arguments to function callback2(), 3 passed and exactly 4 exp
 Exception: Too few arguments to function callback1(), 2 passed and exactly 3 expected
 Exception: Too few arguments to function callback2(), 3 passed and exactly 4 expected
 -- Testing array_walk() function with too many callback parameters --
-array_walk() expects at most 3 parameters, 4 given
+Exception: array_walk() expects at most 3 parameters, 4 given
 Done
diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt
@@ -61,5 +61,5 @@ Exception: Too few arguments to function callback2(), 3 passed and exactly 4 exp
 Exception: Too few arguments to function callback1(), 2 passed and exactly 3 expected
 Exception: Too few arguments to function callback2(), 3 passed and exactly 4 expected
 -- Testing array_walk_recursive() function with too many callback parameters --
-array_walk_recursive() expects at most 3 parameters, 4 given
+Exception: array_walk_recursive() expects at most 3 parameters, 4 given
 Done
diff --git a/ext/standard/tests/array/bug35014_64bit.phpt b/ext/standard/tests/array/bug35014_64bit.phpt
@@ -22,7 +22,6 @@ foreach ($tests as $v) {
 }
 ?>
 --EXPECT--
-NULL
 int(1)
 int(0)
 int(3)
diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt
@@ -19,13 +19,13 @@ var_dump(max(0, true, false, true));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: max(): When only one parameter is given, it must be an array in %s on line 4
+Warning: max(): When only one parameter is given, it must be an array in %s on line %d
 NULL
 
-Warning: max(): Array must contain at least one element in %s on line 5
+Warning: max(): Array must contain at least one element in %s on line %d
 bool(false)
 
-Warning: max(): When only one parameter is given, it must be an array in %s on line 6
+Warning: max(): When only one parameter is given, it must be an array in %s on line %d
 NULL
 int(2)
 float(2.11)
diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt
@@ -19,13 +19,13 @@ var_dump(min(0, true, false, true));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: min(): When only one parameter is given, it must be an array in %s on line 4
+Warning: min(): When only one parameter is given, it must be an array in %s on line %d
 NULL
 
-Warning: min(): Array must contain at least one element in %s on line 5
+Warning: min(): Array must contain at least one element in %s on line %d
 bool(false)
 
-Warning: min(): When only one parameter is given, it must be an array in %s on line 6
+Warning: min(): When only one parameter is given, it must be an array in %s on line %d
 NULL
 int(1)
 float(2.09)
diff --git a/ext/standard/tests/array/range_errors.phpt b/ext/standard/tests/array/range_errors.phpt
@@ -65,7 +65,6 @@ Warning: range(): step exceeds the specified range in %s on line %d
 bool(false)
 
 -- Testing other conditions --
-
 Warning: range(): step exceeds the specified range in %s on line %d
 bool(false)
 

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,4 @@ array(2) {`
`31`	`31`	`["two"]=>`
`32`	`32`	`resource(%d) of type (stream)`
`33`	`33`	`}`
`34`		`-`
`35`	`34`	`Done`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,5 @@ array(3) {`
`62`	`62`	`NULL`
`63`	`63`	`}`
`64`	`64`	`-- with language construct --`
`65`		`-`
`66`		`-Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d`
`67`		`-NULL`
	`65`	`+array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name`
`68`	`66`	`Done`