Adapt tests

Author: kocsismate

ext/dba/tests/dba013.phpt

@@ -24,7 +24,7 @@ require(__DIR__ .'/clean.inc');
 --EXPECTF--
 database handler: %s
 
-Fatal error: Uncaught Error: Key does not have exactly two elements: (key, name) in %sdba013.php:6
+Fatal error: Uncaught Error: dba_insert(): Argument #1 ($key) must have exactly two elements: 'key' and 'name' in %s.php:%d
 Stack trace:
 #0 %sdba013.php(6): dba_insert(Array, '%s', Resource id #%d)
 #1 {main}

ext/dba/tests/dba014.phpt

@@ -24,7 +24,7 @@ require(__DIR__ .'/clean.inc');
 --EXPECTF--
 database handler: %s
 
-Fatal error: Uncaught Error: Key does not have exactly two elements: (key, name) in %sdba014.php:6
+Fatal error: Uncaught Error: dba_insert(): Argument #1 ($key) must have exactly two elements: 'key' and 'name' in %s.php:%d
 Stack trace:
 #0 %sdba014.php(6): dba_insert(Array, '%s', Resource id #%d)
 #1 {main}

ext/hash/tests/reuse.phpt

@@ -13,4 +13,4 @@ catch (\Error $e) {
 }
 
 --EXPECT--
-hash_update(): supplied resource is not a valid Hash Context resource
+hash_update(): Argument #1 ($context) must be a valid Hash Context resource

ext/mbstring/tests/mb_decode_numericentity.phpt

@@ -42,4 +42,4 @@ aŒbœcŠdše€fg
 &#100000000000
 &#000000000000
 föo
-count($convmap) must be a multiple of 4
+mb_decode_numericentity(): Argument #2 ($convmap) must have a multiple of 4 elements

ext/mbstring/tests/mb_encode_numericentity.phpt

@@ -31,4 +31,4 @@ try {
 ƒΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψωϑϒϖ•…′″‾⁄℘ℑℜ™ℵ←↑→↓↔↵⇐⇑⇒⇓⇔∀∂∃∅∇∈∉∋∏∑−∗√∝∞∠∧∨∩∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌈⌉⌊⌋〈〉◊♠♣♥♦
 aŒbœcŠdše€fg
 föo
-count($convmap) must be a multiple of 4
+mb_encode_numericentity(): Argument #2 ($convmap) must have a multiple of 4 elements

ext/standard/tests/array/array_chunk2.phpt

@@ -24,8 +24,8 @@ var_dump(array_chunk($input_array, 10));
 var_dump(array_chunk($input_array, 10, true));
 ?>
 --EXPECT--
-Size parameter expected to be greater than 0
-Size parameter expected to be greater than 0
+array_chunk(): Argument #2 ($size) must be greater than 0
+array_chunk(): Argument #2 ($size) must be greater than 0
 array(5) {
   [0]=>
   array(1) {

ext/standard/tests/array/array_chunk_variation5.phpt

@@ -49,9 +49,9 @@ foreach ($sizes as $size){
 *** Testing array_chunk() : usage variations ***
 
 -- Testing array_chunk() when size = -1 --
-Size parameter expected to be greater than 0
-Size parameter expected to be greater than 0
-Size parameter expected to be greater than 0
+array_chunk(): Argument #2 ($size) must be greater than 0
+array_chunk(): Argument #2 ($size) must be greater than 0
+array_chunk(): Argument #2 ($size) must be greater than 0
 
 -- Testing array_chunk() when size = 4 --
 array(1) {
@@ -89,9 +89,9 @@ array(1) {
 }
 
 -- Testing array_chunk() when size = 0 --
-Size parameter expected to be greater than 0
-Size parameter expected to be greater than 0
-Size parameter expected to be greater than 0
+array_chunk(): Argument #2 ($size) must be greater than 0
+array_chunk(): Argument #2 ($size) must be greater than 0
+array_chunk(): Argument #2 ($size) must be greater than 0
 
 -- Testing array_chunk() when size = 1.5 --
 array(3) {

ext/standard/tests/array/array_combine_error2.phpt

@@ -47,8 +47,8 @@ array(0) {
 }
 
 -- Testing array_combine() function with empty array for $keys argument --
-Both parameters should have an equal number of elements
+array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
 -- Testing array_combine() function with empty array for $values argument --
-Both parameters should have an equal number of elements
+array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements
 -- Testing array_combine() function by passing array with unequal number of elements --
-Both parameters should have an equal number of elements
+array_combine(): Argument #1 ($keys) and argument #2 ($values) must have the same number of elements

ext/standard/tests/array/array_fill_error.phpt

@@ -24,4 +24,4 @@ try {
 ?>
 --EXPECT--
 *** Testing array_fill() : error conditions ***
-Number of elements can't be negative
+array_fill(): Argument #2 ($num) must be greater than or equal to 0

ext/standard/tests/array/array_pad.phpt

@@ -84,4 +84,4 @@ array(4) {
   [3]=>
   float(2)
 }
-You may only pad up to 1048576 elements at a time
+array_pad(): Argument #2 ($pad_size) must be less than 1048576

ext/standard/tests/array/array_rand.phpt

@@ -38,11 +38,11 @@ var_dump(array_rand(array(1,2,3), 2));
 
 ?>
 --EXPECTF--
-Array is empty
-Array is empty
-Second argument has to be between 1 and the number of elements in the array
-Second argument has to be between 1 and the number of elements in the array
-Second argument has to be between 1 and the number of elements in the array
+array_rand(): Argument #1 ($arg) cannot be empty
+array_rand(): Argument #1 ($arg) cannot be empty
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
 array(3) {
   [0]=>
   int(%d)

ext/standard/tests/array/array_rand_variation5.phpt

@@ -70,13 +70,13 @@ int(%d)
 int(%d)
 
 -- With num_req = 0 --
-Second argument has to be between 1 and the number of elements in the array
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
 
 -- With num_req = -1 --
-Second argument has to be between 1 and the number of elements in the array
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
 
 -- With num_req = -2 --
-Second argument has to be between 1 and the number of elements in the array
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)
 
 -- With num_req more than number of members in 'input' array --
-Second argument has to be between 1 and the number of elements in the array
+array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($arg)

ext/standard/tests/array/extract_error_variation1.phpt

@@ -11,4 +11,4 @@ try {
 }
 ?>
 --EXPECT--
-Prefix is not a valid identifier
+extract(): Argument #3 ($prefix) must be a valid identifier

ext/standard/tests/array/range_errors.phpt

@@ -87,33 +87,33 @@ foreach( $step_arr as $step ) {
 *** Testing error conditions ***
 
 -- Testing ( (low < high) && (step = 0) ) --
-Step exceeds the specified range
-Step exceeds the specified range
+range(): Argument #3 ($step) must not exceed the specified range
+range(): Argument #3 ($step) must not exceed the specified range
 
 
 -- Testing ( (low > high) && (step = 0) ) --
-Step exceeds the specified range
-Step exceeds the specified range
+range(): Argument #3 ($step) must not exceed the specified range
+range(): Argument #3 ($step) must not exceed the specified range
 
 
 -- Testing ( (low < high) && (high-low < step) ) --
-Step exceeds the specified range
+range(): Argument #3 ($step) must not exceed the specified range
 
 
 -- Testing ( (low > high) && (low-high < step) ) --
-Step exceeds the specified range
+range(): Argument #3 ($step) must not exceed the specified range
 
 -- Testing other conditions --
-Step exceeds the specified range
+range(): Argument #3 ($step) must not exceed the specified range
 range(): Argument #3 ($step) must be of type int|float, string given
-Step exceeds the specified range
+range(): Argument #3 ($step) must not exceed the specified range
 
 Notice: A non well formed numeric value encountered in %s on line %d
-Step exceeds the specified range
+range(): Argument #3 ($step) must not exceed the specified range
 
 -- Testing Invalid steps --
 range(): Argument #3 ($step) must be of type int|float, string given
-Step exceeds the specified range
-Step exceeds the specified range
+range(): Argument #3 ($step) must not exceed the specified range
+range(): Argument #3 ($step) must not exceed the specified range
 range(): Argument #3 ($step) must be of type int|float, string given
 range(): Argument #3 ($step) must be of type int|float, string given

ext/standard/tests/dir/readdir_variation7.phpt

@@ -25,4 +25,4 @@ try {
 --EXPECTF--
 *** Testing readdir() : usage variations ***
 resource(%d) of type (stream)
-%d is not a valid Directory resource
+readdir(): Argument #1 ($dir_handle) must be a valid Directory resource

ext/standard/tests/file/flock.phpt

@@ -60,4 +60,4 @@ int(0)
 bool(true)
 int(0)
 bool(true)
-Illegal operation argument
+flock(): Argument #2 ($operation) must be either LOCK_SH, LOCK_EX, or LOCK_UN

ext/standard/tests/file/flock_error.phpt

@@ -57,13 +57,13 @@ unlink($file);
 --EXPECT--
 *** Testing error conditions ***
 --- Iteration 0 ---
-Illegal operation argument
+flock(): Argument #2 ($operation) must be either LOCK_SH, LOCK_EX, or LOCK_UN
 --- Iteration 1 ---
-Illegal operation argument
+flock(): Argument #2 ($operation) must be either LOCK_SH, LOCK_EX, or LOCK_UN
 --- Iteration 2 ---
-Illegal operation argument
+flock(): Argument #2 ($operation) must be either LOCK_SH, LOCK_EX, or LOCK_UN
 --- Iteration 3 ---
-Illegal operation argument
+flock(): Argument #2 ($operation) must be either LOCK_SH, LOCK_EX, or LOCK_UN
 --- Iteration 4 ---
 flock(): Argument #2 ($operation) must be of type int, array given
 --- Iteration 5 ---

ext/standard/tests/general_functions/bug46587.phpt

@@ -14,5 +14,5 @@ echo "Done.\n";
 ?>
 --EXPECTF--
 int(%d)
-max (3) is smaller than min (8)
+mt_rand(): Argument #2 ($max) must be greater than or equal to argument #1 ($min)
 Done.

ext/standard/tests/general_functions/proc_open_array.phpt

@@ -68,7 +68,7 @@ proc_close($proc);
 ?>
 --EXPECT--
 Empty command array:
-Command array must have at least one element
+proc_open(): Argument #1 ($cmd) must have at least one element
 
 Nul byte in program name:
 Command array element 1 contains a null byte

ext/standard/tests/general_functions/proc_open_pipes3.phpt

@@ -32,7 +32,7 @@ echo "END\n";
 ?>
 --EXPECTF--
 Warning: proc_open(): pi is not a valid descriptor spec/mode in %s on line %d
-Descriptor item must be either an array or a File-Handle
+proc_open(): Argument #2 ($descriptorspec) must only contain arrays and File-Handles
 array(4) {
   [3]=>
   resource(%d) of type (Unknown)

ext/standard/tests/general_functions/register_tick_function_error.phpt

@@ -11,4 +11,4 @@ try {
 }
 ?>
 --EXPECT--
-Invalid tick callback 'a' passed
+register_tick_function(): Argument #1 ($function) must be a valid tick callback

ext/standard/tests/math/base_convert_error.phpt

@@ -34,6 +34,6 @@ try {
 ?>
 --EXPECT--
 *** Testing base_convert() : error conditions ***
-Invalid `from base' (1)
-Invalid `to base' (37)
+base_convert(): Argument #2 ($frombase) must be between 2 and 36 (inclusive)
+base_convert(): Argument #3 ($tobase) must be between 2 and 36 (inclusive)
 Object of class classA could not be converted to string

ext/standard/tests/strings/explode.phpt

@@ -60,9 +60,9 @@ array (
   4 => 'd',
 )
 d6bee42a771449205344c0938ad4f035
-Empty delimiter
-Empty delimiter
-Empty delimiter
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
 array(1) {
   [0]=>
   string(0) ""
@@ -77,7 +77,7 @@ array(1) {
   [0]=>
   string(0) ""
 }
-Empty delimiter
+explode(): Argument #1 ($separator) cannot be empty
 array(1) {
   [0]=>
   string(3) "acb"

ext/standard/tests/strings/explode1.phpt

@@ -98,15 +98,15 @@ var_dump( explode("b", $obj) );
 --EXPECT--
 *** Testing explode() for basic operations ***
 -- Iteration 1 --
-Empty delimiter
-Empty delimiter
-Empty delimiter
-Empty delimiter
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
 -- Iteration 2 --
-Empty delimiter
-Empty delimiter
-Empty delimiter
-Empty delimiter
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
 -- Iteration 3 --
 array(1) {
   [0]=>
@@ -208,10 +208,10 @@ array(2) {
   string(56) "234NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 7 --
-Empty delimiter
-Empty delimiter
-Empty delimiter
-Empty delimiter
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
+explode(): Argument #1 ($separator) cannot be empty
 -- Iteration 8 --
 array(2) {
   [0]=>

ext/standard/tests/strings/wordwrap.phpt

@@ -40,4 +40,4 @@ try {
 }
 --EXPECT--
 OK
-Break string cannot be empty
+wordwrap(): Argument #3 ($break) cannot be empty

ext/standard/tests/strings/wordwrap_error.phpt

@@ -52,7 +52,7 @@ var_dump( wordwrap($str, $width, $break, $cut) );
 -- width = 0 & cut = false --
 string(39) "testing<br />\nwordwrap<br />\nfunction"
 -- width = 0 & cut = true --
-Can't force cut when width is zero
+wordwrap(): Argument #4 ($cut) cannot be true when argument #2 ($width) is 0
 -- width = -10 & cut = false --
 string(39) "testing<br />\nwordwrap<br />\nfunction"
 -- width = -10 & cut = true --