Skip to content

Commit 8579efd

Browse files
nikicnikic
committed
Start on test updates
1 parent b68f820 commit 8579efd

File tree

84 files changed

+5347
-5351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+5347
-5351
lines changed

‎Zend/tests/bug75290.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var_dump(function ($someThing) {});
1212
object(Closure)#2 (1) {
1313
["parameter"]=>
1414
array(1) {
15-
["$number"]=>
15+
["$num"]=>
1616
string(10) "<required>"
1717
}
1818
}

‎Zend/tests/bug79783.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bug #79783: Segfault in php_str_replace_common
55
str_replace("a", "b", "c", strlen("d"));
66
?>
77
--EXPECTF--
8-
Fatal error: Uncaught Error: str_replace(): Argument #4 ($replace_count) cannot be passed by reference in %s:%d
8+
Fatal error: Uncaught Error: str_replace(): Argument #4 ($count) cannot be passed by reference in %s:%d
99
Stack trace:
1010
#0 {main}
1111
thrown in %s on line %d

‎Zend/tests/bug79979.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ Bug #79979 (passing value to by-ref param via CUF(A) crashes)
66
namespace Foo;
77

88
call_user_func_array("str_replace", ["a", "b", "c", new \stdClass]);
9-
call_user_func_array("str_replace", ["a", "b", "c", "replace_count" => new \stdClass]);
9+
call_user_func_array("str_replace", ["a", "b", "c", "count" => new \stdClass]);
1010

1111
\call_user_func_array("str_replace", ["a", "b", "c", new \stdClass]);
12-
\call_user_func_array("str_replace", ["a", "b", "c", "replace_count" => new \stdClass]);
12+
\call_user_func_array("str_replace", ["a", "b", "c", "count" => new \stdClass]);
1313

1414
?>
1515
--EXPECTF--
16-
Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
16+
Warning: str_replace(): Argument #4 ($count) must be passed by reference, value given in %s on line %d
1717

18-
Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
18+
Warning: str_replace(): Argument #4 ($count) must be passed by reference, value given in %s on line %d
1919

20-
Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
20+
Warning: str_replace(): Argument #4 ($count) must be passed by reference, value given in %s on line %d
2121

22-
Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
22+
Warning: str_replace(): Argument #4 ($count) must be passed by reference, value given in %s on line %d

‎Zend/tests/call_user_func_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ namespace testing {
3737
?>
3838
--EXPECT--
3939
string(6) "foobar"
40-
call_user_func(): Argument #1 ($function) must be a valid callback, cannot access private method testing\foo::priv()
41-
call_user_func(): Argument #1 ($function) must be a valid callback, cannot access protected method testing\foo::prot()
40+
call_user_func(): Argument #1 ($callback) must be a valid callback, cannot access private method testing\foo::priv()
41+
call_user_func(): Argument #1 ($callback) must be a valid callback, cannot access protected method testing\foo::prot()

‎ext/standard/basic_functions_arginfo.h

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 6a0d8ead5c3b4a9ced8731089e48c623c0b653a3 */
2+
* Stub hash: 66d077cacb14825267889aa41369bd09416b5e41 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
55
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -170,7 +170,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_compact, 0, 1, IS_ARRAY, 0)
170170
ZEND_END_ARG_INFO()
171171

172172
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_fill, 0, 3, IS_ARRAY, 0)
173-
ZEND_ARG_TYPE_INFO(0, start, IS_LONG, 0)
173+
ZEND_ARG_TYPE_INFO(0, start_index, IS_LONG, 0)
174174
ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
175175
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
176176
ZEND_END_ARG_INFO()
@@ -555,8 +555,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_is_uploaded_file, 0, 1, _IS_BOOL
555555
ZEND_END_ARG_INFO()
556556

557557
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_move_uploaded_file, 0, 2, _IS_BOOL, 0)
558-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
559-
ZEND_ARG_TYPE_INFO(0, new_filename, IS_STRING, 0)
558+
ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0)
559+
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
560560
ZEND_END_ARG_INFO()
561561

562562
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_parse_ini_file, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
@@ -1281,16 +1281,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mkdir, 0, 1, _IS_BOOL, 0)
12811281
ZEND_END_ARG_INFO()
12821282

12831283
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rename, 0, 2, _IS_BOOL, 0)
1284-
ZEND_ARG_TYPE_INFO(0, old_name, IS_STRING, 0)
1285-
ZEND_ARG_TYPE_INFO(0, new_name, IS_STRING, 0)
1284+
ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0)
1285+
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
12861286
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, context, "null")
12871287
ZEND_END_ARG_INFO()
12881288

1289-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_copy, 0, 2, _IS_BOOL, 0)
1290-
ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
1291-
ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0)
1292-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, context, "null")
1293-
ZEND_END_ARG_INFO()
1289+
#define arginfo_copy arginfo_rename
12941290

12951291
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_tempnam, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
12961292
ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
@@ -1955,8 +1951,8 @@ ZEND_END_ARG_INFO()
19551951
#endif
19561952

19571953
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_stream_copy_to_stream, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
1958-
ZEND_ARG_INFO(0, source)
1959-
ZEND_ARG_INFO(0, dest)
1954+
ZEND_ARG_INFO(0, from)
1955+
ZEND_ARG_INFO(0, to)
19601956
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 1, "null")
19611957
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
19621958
ZEND_END_ARG_INFO()

‎ext/standard/tests/array/array_chunk2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ var_dump(array_chunk($input_array, 10));
2424
var_dump(array_chunk($input_array, 10, true));
2525
?>
2626
--EXPECT--
27-
array_chunk(): Argument #2 ($size) must be greater than 0
28-
array_chunk(): Argument #2 ($size) must be greater than 0
27+
array_chunk(): Argument #2 ($length) must be greater than 0
28+
array_chunk(): Argument #2 ($length) must be greater than 0
2929
array(5) {
3030
[0]=>
3131
array(1) {

‎ext/standard/tests/array/array_chunk_variation5.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ foreach ($sizes as $size){
4242
*** Testing array_chunk() : usage variations ***
4343

4444
-- Testing array_chunk() when size = -1 --
45-
array_chunk(): Argument #2 ($size) must be greater than 0
46-
array_chunk(): Argument #2 ($size) must be greater than 0
47-
array_chunk(): Argument #2 ($size) must be greater than 0
45+
array_chunk(): Argument #2 ($length) must be greater than 0
46+
array_chunk(): Argument #2 ($length) must be greater than 0
47+
array_chunk(): Argument #2 ($length) must be greater than 0
4848

4949
-- Testing array_chunk() when size = 4 --
5050
array(1) {
@@ -82,9 +82,9 @@ array(1) {
8282
}
8383

8484
-- Testing array_chunk() when size = 0 --
85-
array_chunk(): Argument #2 ($size) must be greater than 0
86-
array_chunk(): Argument #2 ($size) must be greater than 0
87-
array_chunk(): Argument #2 ($size) must be greater than 0
85+
array_chunk(): Argument #2 ($length) must be greater than 0
86+
array_chunk(): Argument #2 ($length) must be greater than 0
87+
array_chunk(): Argument #2 ($length) must be greater than 0
8888

8989
-- Testing array_chunk() when size = 1.5 --
9090
array(3) {

‎ext/standard/tests/array/array_multisort_variation1.phpt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -103,76 +103,76 @@ foreach($inputs as $key =>$value) {
103103
*** Testing array_multisort() : usage variation ***
104104

105105
--int 0--
106-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag that has not already been specified
106+
array_multisort(): Argument #1 ($array) must be an array or a sort flag that has not already been specified
107107

108108
--int 1--
109-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag that has not already been specified
109+
array_multisort(): Argument #1 ($array) must be an array or a sort flag that has not already been specified
110110

111111
--int 12345--
112-
array_multisort(): Argument #1 ($array1) must be a valid sort flag
112+
array_multisort(): Argument #1 ($array) must be a valid sort flag
113113

114114
--int -12345--
115-
array_multisort(): Argument #1 ($array1) must be a valid sort flag
115+
array_multisort(): Argument #1 ($array) must be a valid sort flag
116116

117117
--float 10.5--
118-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
118+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
119119

120120
--float -10.5--
121-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
121+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
122122

123123
--float 12.3456789000e10--
124-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
124+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
125125

126126
--float -12.3456789000e10--
127-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
127+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
128128

129129
--float .5--
130-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
130+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
131131

132132
--uppercase NULL--
133-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
133+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
134134

135135
--lowercase null--
136-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
136+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
137137

138138
--lowercase true--
139-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
139+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
140140

141141
--lowercase false--
142-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
142+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
143143

144144
--uppercase TRUE--
145-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
145+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
146146

147147
--uppercase FALSE--
148-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
148+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
149149

150150
--empty string DQ--
151-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
151+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
152152

153153
--empty string SQ--
154-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
154+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
155155

156156
--string DQ--
157-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
157+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
158158

159159
--string SQ--
160-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
160+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
161161

162162
--mixed case string--
163-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
163+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
164164

165165
--heredoc--
166-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
166+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
167167

168168
--instance of classWithToString--
169-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
169+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
170170

171171
--instance of classWithoutToString--
172-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
172+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
173173

174174
--undefined var--
175-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
175+
array_multisort(): Argument #1 ($array) must be an array or a sort flag
176176

177177
--unset var--
178-
array_multisort(): Argument #1 ($array1) must be an array or a sort flag
178+
array_multisort(): Argument #1 ($array) must be an array or a sort flag

‎ext/standard/tests/array/array_next_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function f() {
88
var_dump(next(array(1, 2)));
99
?>
1010
--EXPECTF--
11-
Fatal error: Uncaught Error: next(): Argument #1 ($arg) cannot be passed by reference in %s:%d
11+
Fatal error: Uncaught Error: next(): Argument #1 ($array) cannot be passed by reference in %s:%d
1212
Stack trace:
1313
#0 {main}
1414
thrown in %s on line %d

‎ext/standard/tests/array/array_pad.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ array(4) {
8484
[3]=>
8585
float(2)
8686
}
87-
array_pad(): Argument #2 ($pad_size) must be less than or equal to 1048576
87+
array_pad(): Argument #2 ($length) must be less than or equal to 1048576

‎ext/standard/tests/array/array_rand.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ var_dump(array_rand(array(1,2,3), 2));
4040
--EXPECTF--
4141
array_rand(): Argument #1 ($array) cannot be empty
4242
array_rand(): Argument #1 ($array) cannot be empty
43-
array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
44-
array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
45-
array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
43+
array_rand(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)
44+
array_rand(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)
45+
array_rand(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)
4646
array(3) {
4747
[0]=>
4848
int(%d)

‎ext/standard/tests/array/array_rand_variation5.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ int(%d)
6565
int(%d)
6666

6767
-- With num_req = 0 --
68-
array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
68+
array_rand(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)
6969

7070
-- With num_req = -1 --
71-
array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
71+
array_rand(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)
7272

7373
-- With num_req = -2 --
74-
array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
74+
array_rand(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)
7575

7676
-- With num_req more than number of members in 'input' array --
77-
array_rand(): Argument #2 ($num_req) must be between 1 and the number of elements in argument #1 ($array)
77+
array_rand(): Argument #2 ($num) must be between 1 and the number of elements in argument #1 ($array)

‎ext/standard/tests/array/array_walk_objects.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ string(10) "%r\0%r*%r\0%rvar_pro"
4343
string(14) "test_protected"
4444
string(7) "var_pub"
4545
string(11) "test_public"
46-
array_walk(): Argument #1 ($input) must be of type array, string given
46+
array_walk(): Argument #1 ($array) must be of type array, string given
4747
Done

‎ext/standard/tests/array/array_walk_rec_objects.phpt

0 Bytes
Binary file not shown.

‎ext/standard/tests/array/extract_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ try {
3131
?>
3232
--EXPECT--
3333
*** Testing Error Conditions ***
34-
extract(): Argument #2 ($extract_type) must be a valid extract type
35-
extract(): Argument #2 ($extract_type) must be a valid extract type
34+
extract(): Argument #2 ($flags) must be a valid extract type
35+
extract(): Argument #2 ($flags) must be a valid extract type
3636
extract(): Argument #3 ($prefix) is required when using this extract type

‎ext/standard/tests/array/max.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ var_dump(max(0, true, false, true));
3333

3434
?>
3535
--EXPECT--
36-
max(): Argument #1 ($arg) must be of type array, int given
37-
max(): Argument #1 ($arg) must contain at least one element
38-
max(): Argument #1 ($arg) must be of type array, stdClass given
36+
max(): Argument #1 ($value) must be of type array, int given
37+
max(): Argument #1 ($value) must contain at least one element
38+
max(): Argument #1 ($value) must be of type array, stdClass given
3939
int(2)
4040
float(2.11)
4141
string(1) "t"

‎ext/standard/tests/array/min.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ var_dump(min(0, true, false, true));
3333

3434
?>
3535
--EXPECT--
36-
min(): Argument #1 ($arg) must be of type array, int given
37-
min(): Argument #1 ($arg) must contain at least one element
38-
min(): Argument #1 ($arg) must be of type array, stdClass given
36+
min(): Argument #1 ($value) must be of type array, int given
37+
min(): Argument #1 ($value) must contain at least one element
38+
min(): Argument #1 ($value) must be of type array, stdClass given
3939
int(1)
4040
float(2.09)
4141
string(0) ""

‎ext/standard/tests/array/prev_error3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ prev - ensure we cannot pass a temporary
1010
var_dump(prev(array(1, 2)));
1111
?>
1212
--EXPECTF--
13-
Fatal error: Uncaught Error: prev(): Argument #1 ($arg) cannot be passed by reference in %s:%d
13+
Fatal error: Uncaught Error: prev(): Argument #1 ($array) cannot be passed by reference in %s:%d
1414
Stack trace:
1515
#0 {main}
1616
thrown in %s on line %d

‎ext/standard/tests/array/sizeof_object2.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,22 +104,22 @@ echo "Done";
104104
--- Testing sizeof() with objects which doesn't implement Countable interface ---
105105
-- Iteration 1 --
106106
Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test given
107-
COUNT_NORMAL Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test given
108-
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test given
107+
COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test given
108+
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test given
109109
-- Iteration 2 --
110110
Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test1 given
111-
COUNT_NORMAL Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test1 given
112-
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test1 given
111+
COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test1 given
112+
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test1 given
113113
-- Iteration 3 --
114114
Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test2 given
115-
COUNT_NORMAL Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test2 given
116-
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test2 given
115+
COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test2 given
116+
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test2 given
117117
-- Iteration 4 --
118118
Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, child_test2 given
119-
COUNT_NORMAL Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, child_test2 given
120-
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, child_test2 given
119+
COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, child_test2 given
120+
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, child_test2 given
121121
-- Iteration 5 --
122122
Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, concrete_class given
123-
COUNT_NORMAL Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, concrete_class given
124-
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, concrete_class given
123+
COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, concrete_class given
124+
COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, concrete_class given
125125
Done

‎ext/standard/tests/assert/assert_options_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ try {
1010
}
1111
?>
1212
--EXPECT--
13-
assert_options(): Argument #1 ($what) must be an ASSERT_* constant
13+
assert_options(): Argument #1 ($option) must be an ASSERT_* constant

‎ext/standard/tests/file/fgetcsv_error_conditions.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
5454
fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
5555
fgetcsv(): Argument #2 ($length) must be a greater than or equal to 0
5656
fgetcsv() with delimiter as NULL
57-
fgetcsv(): Argument #3 ($delimiter) must be a single character
57+
fgetcsv(): Argument #3 ($separator) must be a single character
5858
fgetcsv() with enclosure as NULL
5959
fgetcsv(): Argument #4 ($enclosure) must be a single character
6060
fgetcsv() with delimiter & enclosure as NULL
61-
fgetcsv(): Argument #3 ($delimiter) must be a single character
61+
fgetcsv(): Argument #3 ($separator) must be a single character

0 commit comments

Comments
 (0)