Skip to content

Commit d8abee6

Browse files
nikicnikic
committed
Some test updates
The ones where bless_tests.php worked right with little modification.
1 parent c612845 commit d8abee6

File tree

123 files changed

+1812
-2124
lines changed

Some content is hidden

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

123 files changed

+1812
-2124
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ array(6) {
4747
}
4848

4949
Warning: chr() expects parameter 1 to be int, string given in %s on line %d
50+
51+
Deprecated: Passing null to argument of type int is deprecated in %s on line %d
5052
array(8) {
5153
[0]=>
5254
int(0)

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,9 @@ For mode '-1.45' count is => int(3)
228228
For mode '2' count is => int(3)
229229
For mode '1' count is => int(9)
230230
For mode '' count is => int(3)
231-
For mode '' count is => int(3)
231+
For mode '' count is =>
232+
Deprecated: Passing null to argument of type int is deprecated in %s on line %d
233+
int(3)
232234

233235
-- Testing error conditions --
234236
Warning: count() expects at least 1 parameter, 0 given in %s on line %d
@@ -239,13 +241,13 @@ NULL
239241

240242
Warning: Use of undefined constant ABCD - assumed 'ABCD' (this will throw an Error in a future version of PHP) in %s on line %d
241243

242-
Warning: count() expects parameter 2 to be int, %s given in %s on line %d
244+
Warning: count() expects parameter 2 to be int, string given in %s on line %d
243245
NULL
244246

245-
Warning: count() expects parameter 2 to be int, %s given in %s on line %d
247+
Warning: count() expects parameter 2 to be int, string given in %s on line %d
246248
NULL
247249

248-
Warning: count() expects parameter 2 to be int, %s given in %s on line %d
250+
Warning: count() expects parameter 2 to be int, string given in %s on line %d
249251
NULL
250252

251253
Done

‎ext/standard/tests/file/005_variation2.phpt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ echo "Done";
7777
*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***
7878

7979
*** testing touch ***
80+
81+
Deprecated: Passing null to argument of type string is deprecated in %s on line %d
8082
bool(false)
8183
bool(false)
8284
bool(false)
@@ -86,8 +88,14 @@ bool(true)
8688
*** testing file info ***
8789
-- File '' --
8890
-- File access time is =>
91+
Deprecated: Passing null to argument of type string is deprecated in %s on line %d
92+
8993
-- File modification time is =>
94+
Deprecated: Passing null to argument of type string is deprecated in %s on line %d
95+
9096
-- inode change time is =>
97+
Deprecated: Passing null to argument of type string is deprecated in %s on line %d
98+
9199

92100
-- File '' --
93101
-- File access time is =>

‎ext/standard/tests/file/007_error.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ Warning: feof() expects parameter 1 to be resource, object given in %s on line %
165165
bool(false)
166166
-- Iteration 7 --
167167

168+
Deprecated: Passing null to argument of type string is deprecated in %s on line %d
169+
168170
Warning: fopen(): Filename cannot be empty in %s on line %d
169171
bool(false)
170172

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

504 Bytes
Binary file not shown.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ foreach ($file_paths as $file_path) {
6464
}
6565

6666
?>
67-
--EXPECT--
67+
--EXPECTF--
6868
string(3) "bar"
6969
string(3) "bar"
7070
string(3) "bar"
@@ -98,4 +98,6 @@ string(1) " "
9898
string(1) " "
9999
string(0) ""
100100
string(0) ""
101+
102+
Deprecated: Passing null to argument of type string is deprecated in %s on line %d
101103
string(0) ""

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includ
33
--FILE--
44
<?php
55

6-
$ini = parse_ini_string('ini="ini;raw"', null, INI_SCANNER_RAW);
6+
$ini = parse_ini_string('ini="ini;raw"', false, INI_SCANNER_RAW);
77
var_dump($ini['ini']);
8-
$ini = parse_ini_string('ini="ini;raw', null, INI_SCANNER_RAW);
8+
$ini = parse_ini_string('ini="ini;raw', false, INI_SCANNER_RAW);
99
var_dump($ini['ini']);
10-
$ini = parse_ini_string('ini=ini;raw', null, INI_SCANNER_RAW);
10+
$ini = parse_ini_string('ini=ini;raw', false, INI_SCANNER_RAW);
1111
var_dump($ini['ini']);
12-
$ini = parse_ini_string('ini=ini"raw', null, INI_SCANNER_RAW);
12+
$ini = parse_ini_string('ini=ini"raw', false, INI_SCANNER_RAW);
1313
var_dump($ini['ini']);
14-
$ini = parse_ini_string("ini=\r\niniraw", null, INI_SCANNER_RAW);
14+
$ini = parse_ini_string("ini=\r\niniraw", false, INI_SCANNER_RAW);
1515
var_dump($ini['ini']);
1616
--EXPECT--
1717
string(7) "ini;raw"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ var_dump(file_get_contents($tmp_empty_file, NULL, NULL, NULL, 10));
99
unlink($tmp_empty_file);
1010
?>
1111
==DONE==
12-
--EXPECT--
12+
--EXPECTF--
13+
Deprecated: Passing null to argument of type bool is deprecated in %s on line %d
14+
15+
Deprecated: Passing null to argument of type int is deprecated in %s on line %d
1316
string(0) ""
1417
==DONE==

0 commit comments

Comments
 (0)