Skip to content

Commit 840ec85

Browse files
GirgiasGirgias
committed
Fix tests by adding notices
1 parent 605c5c3 commit 840ec85

File tree

9 files changed

+210
-20
lines changed

9 files changed

+210
-20
lines changed

‎ext/mysqli/tests/bug31668.phpt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ Bug #31668 (multi_query works exactly every other time (multi_query was global,
55
require_once('skipif.inc');
66
require_once('skipifconnectfailure.inc');
77
?>
8-
--INI--
9-
error_reporting = E_ALL & ~E_STRICT
108
--FILE--
119
<?php
1210
require_once("connect.inc");
@@ -47,6 +45,8 @@ array(1) {
4745
[2]=>
4846
%s(1) "2"
4947
}
48+
49+
Notice: mysqli::next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %sbug31668.php on line %d
5050
%s(0) ""
5151
int(%d)
5252
array(1) {
@@ -59,3 +59,5 @@ array(1) {
5959
}
6060
%s(0) ""
6161
int(%d)
62+
63+
Notice: mysqli::next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %sbug31668.php on line %d

‎ext/mysqli/tests/mysqli_more_results.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ bool(false)
7474
1
7575
2
7676

77-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
77+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
7878
[010]
7979
1
8080
2
8181

82-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
82+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
8383

8484
Warning: mysqli_more_results(): Couldn't fetch mysqli in %s on line %d
8585
bool(false)

‎ext/mysqli/tests/mysqli_multi_query.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ require_once('skipifconnectfailure.inc');
120120
require_once("clean_table.inc");
121121
?>
122122
--EXPECTF--
123-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
123+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
124124
[006] 3
125125
[008] 0
126126
[009] [2014] Commands out of sync; you can't run this command now
127127

128-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
128+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
129129
[010] 7
130130

131131
Warning: mysqli_multi_query(): Couldn't fetch mysqli in %s on line %d

‎ext/mysqli/tests/mysqli_next_result.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ require_once('skipifconnectfailure.inc');
7373
require_once("clean_table.inc");
7474
?>
7575
--EXPECTF--
76-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
76+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
7777

78-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
78+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
7979

80-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
80+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
8181

82-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
82+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
8383

84-
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
84+
Notice: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
8585

8686
Warning: mysqli_next_result(): Couldn't fetch mysqli in %s on line %d
8787
bool(false)

‎ext/standard/tests/strings/htmlentities13.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ filter.default=unsafe_raw
1313
--EXPECTF--
1414
EUC-JP
1515

16-
Strict Standards: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
16+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
1717
string(6) "¡¢¡£¡¤"

‎ext/standard/tests/strings/htmlentities14.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ filter.default=unsafe_raw
1313
--EXPECTF--
1414
Shift_JIS
1515

16-
Strict Standards: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
16+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
1717
string(6) "ABC"

‎ext/standard/tests/strings/htmlentities21.phpt

Lines changed: 113 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ $tests = array(
2222
function test($flag, $charset) {
2323
global $tests;
2424
$i = -1;
25-
error_reporting(-1 & ~E_STRICT);
2625
foreach ($tests as $test) {
2726
$test = chr($test);
2827
$i++;
@@ -31,7 +30,6 @@ function test($flag, $charset) {
3130
if ($a == "" && $b == "") { echo sprintf("%05X", $tests[$i]), ": INVALID SEQUENCE\n"; continue; }
3231
echo sprintf("%05X", $tests[$i]), ": ", bin2hex($a), " ", bin2hex($b), "\n";
3332
}
34-
error_reporting(-1);
3533
}
3634

3735
echo "*** Testing HTML 4.01/Windows-1251 ***\n";
@@ -68,7 +66,7 @@ test(ENT_XML1, "SJIS");
6866

6967

7068
?>
71-
--EXPECT--
69+
--EXPECTF--
7270
*** Testing HTML 4.01/Windows-1251 ***
7371
00000: 262378464646443b 262378464646443b
7472
00001: 262378464646443b 262378464646443b
@@ -134,65 +132,177 @@ test(ENT_XML1, "SJIS");
134132
000A0: a0 a0
135133

136134
*** Testing HTML 4.01/SJIS ***
135+
136+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
137137
00000: 262378464646443b 262378464646443b
138+
139+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
138140
00001: 262378464646443b 262378464646443b
141+
142+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
139143
00009: 09 09
144+
145+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
140146
0000A: 0a 0a
147+
148+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
141149
0000B: 262378464646443b 262378464646443b
150+
151+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
142152
0000C: 262378464646443b 262378464646443b
153+
154+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
143155
0000D: 0d 0d
156+
157+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
144158
0000E: 262378464646443b 262378464646443b
159+
160+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
145161
0001F: 262378464646443b 262378464646443b
162+
163+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
146164
00020: 20 20
165+
166+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
147167
0007F: 7f 7f
168+
169+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
148170
00080: INVALID SEQUENCE
171+
172+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
149173
0009F: INVALID SEQUENCE
174+
175+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
150176
000A0: INVALID SEQUENCE
151177

152178
*** Testing XHTML 1.0/SJIS ***
179+
180+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
153181
00000: 262378464646443b 262378464646443b
182+
183+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
154184
00001: 262378464646443b 262378464646443b
185+
186+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
155187
00009: 09 09
188+
189+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
156190
0000A: 0a 0a
191+
192+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
157193
0000B: 262378464646443b 262378464646443b
194+
195+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
158196
0000C: 262378464646443b 262378464646443b
197+
198+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
159199
0000D: 0d 0d
200+
201+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
160202
0000E: 262378464646443b 262378464646443b
203+
204+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
161205
0001F: 262378464646443b 262378464646443b
206+
207+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
162208
00020: 20 20
209+
210+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
163211
0007F: 7f 7f
212+
213+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
164214
00080: INVALID SEQUENCE
215+
216+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
165217
0009F: INVALID SEQUENCE
218+
219+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
166220
000A0: INVALID SEQUENCE
167221

168222
*** Testing HTML 5/SJIS ***
223+
224+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
169225
00000: 262378464646443b 262378464646443b
226+
227+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
170228
00001: 262378464646443b 262378464646443b
229+
230+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
171231
00009: 09 09
232+
233+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
172234
0000A: 0a 0a
235+
236+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
173237
0000B: 262378464646443b 262378464646443b
238+
239+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
174240
0000C: 0c 0c
241+
242+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
175243
0000D: 0d 0d
244+
245+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
176246
0000E: 262378464646443b 262378464646443b
247+
248+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
177249
0001F: 262378464646443b 262378464646443b
250+
251+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
178252
00020: 20 20
253+
254+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
179255
0007F: 7f 7f
256+
257+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
180258
00080: INVALID SEQUENCE
259+
260+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
181261
0009F: INVALID SEQUENCE
262+
263+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
182264
000A0: INVALID SEQUENCE
183265

184266
*** Testing XML 1.0/SJIS ***
267+
268+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
185269
00000: 262378464646443b 262378464646443b
270+
271+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
186272
00001: 262378464646443b 262378464646443b
273+
274+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
187275
00009: 09 09
276+
277+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
188278
0000A: 0a 0a
279+
280+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
189281
0000B: 262378464646443b 262378464646443b
282+
283+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
190284
0000C: 262378464646443b 262378464646443b
285+
286+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
191287
0000D: 0d 0d
288+
289+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
192290
0000E: 262378464646443b 262378464646443b
291+
292+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
193293
0001F: 262378464646443b 262378464646443b
294+
295+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
194296
00020: 20 20
297+
298+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
195299
0007F: 7f 7f
300+
301+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
196302
00080: INVALID SEQUENCE
303+
304+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
197305
0009F: INVALID SEQUENCE
306+
307+
Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s on line %d
198308
000A0: INVALID SEQUENCE

0 commit comments

Comments
 (0)