Skip to content

Commit af975d3

Browse files
committed
Better error message
1 parent 479dcec commit af975d3

23 files changed

+77
-78
lines changed

ext/mbstring/mbstring.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,7 @@ static const mbfl_encoding *php_mb_get_encoding(zend_string *encoding_name, cons
334334

335335
encoding = mbfl_name2encoding(ZSTR_VAL(encoding_name));
336336
if (!encoding) {
337-
zend_argument_value_error(arg_num, "must be a valid encoding, encoding \"%s\" is unknown",
338-
ZSTR_VAL(encoding_name));
337+
zend_argument_value_error(arg_num, "must be a valid encoding, \"%s\" given", ZSTR_VAL(encoding_name));
339338
return NULL;
340339
}
341340

@@ -3526,7 +3525,7 @@ php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
35263525
if (encoding && encoding_len > 0) {
35273526
string.encoding = mbfl_name2encoding(encoding);
35283527
if (!string.encoding) {
3529-
zend_argument_value_error(3, "must be a valid encoding, encoding \"%s\" is unknown", encoding);
3528+
zend_argument_value_error(3, "must be a valid encoding, \"%s\" given", encoding);
35303529
RETURN_THROWS();
35313530
}
35323531
}

ext/mbstring/php_mbregex.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ PHP_FUNCTION(mb_regex_encoding)
855855
mbctype = _php_mb_regex_name2mbctype(encoding);
856856

857857
if (mbctype == ONIG_ENCODING_UNDEF) {
858-
zend_argument_value_error(1, "must be a valid encoding, encoding \"%s\" is unknown", encoding);
858+
zend_argument_value_error(1, "must be a valid encoding, \"%s\" given", encoding);
859859
RETURN_THROWS();
860860
}
861861

ext/mbstring/tests/bug43998.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ foreach($inputs as $input) {
3939
?>
4040
--EXPECT--
4141
-- Iteration 1 --
42-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, encoding "12345" is unknown
43-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, encoding "12345" is unknown
42+
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "12345" given
43+
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "12345" given
4444

4545
-- Iteration 2 --
46-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, encoding "1.23456789E-9" is unknown
47-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, encoding "1.23456789E-9" is unknown
46+
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "1.23456789E-9" given
47+
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "1.23456789E-9" given
4848

4949
-- Iteration 3 --
50-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, encoding "1" is unknown
51-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, encoding "1" is unknown
50+
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "1" given
51+
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "1" given
5252

5353
-- Iteration 4 --
54-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, encoding "" is unknown
55-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, encoding "" is unknown
54+
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "" given
55+
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "" given
5656

5757
-- Iteration 5 --
58-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, encoding "" is unknown
59-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, encoding "" is unknown
58+
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "" given
59+
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "" given

ext/mbstring/tests/mb_chr.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ bool(true)
4444
bool(true)
4545
bool(true)
4646
bool(true)
47-
mb_chr(): Argument #2 ($encoding) must be a valid encoding, encoding "typo" is unknown
47+
mb_chr(): Argument #2 ($encoding) must be a valid encoding, "typo" given
4848

4949
Warning: mb_chr(): Unsupported encoding "pass" in %s on line %d
5050
bool(false)

ext/mbstring/tests/mb_convert_encoding.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,4 @@ JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
124124
== INVALID PARAMETER ==
125125
INT: 1234
126126
EUC-JP:
127-
mb_convert_encoding(): Argument #2 ($to) must be a valid encoding, encoding "BAD" is unknown
127+
mb_convert_encoding(): Argument #2 ($to) must be a valid encoding, "BAD" given

ext/mbstring/tests/mb_ord.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ mb_ord("");
4949
bool(true)
5050
bool(true)
5151
bool(true)
52-
mb_ord(): Argument #2 ($encoding) must be a valid encoding, encoding "typo" is unknown
52+
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "typo" given
5353

5454
Warning: mb_ord(): Unsupported encoding "pass" in %s on line %d
5555
bool(false)

ext/mbstring/tests/mb_regex_encoding_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ try {
2727
?>
2828
--EXPECT--
2929
*** Testing mb_regex_encoding() : error conditions ***
30-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "unknown" is unknown
30+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "unknown" given

ext/mbstring/tests/mb_regex_encoding_variation2.phpt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ string(5) "UCS-4"
101101

102102
-- Iteration 2 --
103103
string(5) "UCS-4"
104-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "UCS-4BE" is unknown
104+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "UCS-4BE" given
105105
string(5) "UCS-4"
106106

107107
-- Iteration 3 --
@@ -111,17 +111,17 @@ string(7) "UCS-4LE"
111111

112112
-- Iteration 4 --
113113
string(7) "UCS-4LE"
114-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "UCS-2" is unknown
114+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "UCS-2" given
115115
string(7) "UCS-4LE"
116116

117117
-- Iteration 5 --
118118
string(7) "UCS-4LE"
119-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "UCS-2BE" is unknown
119+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "UCS-2BE" given
120120
string(7) "UCS-4LE"
121121

122122
-- Iteration 6 --
123123
string(7) "UCS-4LE"
124-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "UCS-2LE" is unknown
124+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "UCS-2LE" given
125125
string(7) "UCS-4LE"
126126

127127
-- Iteration 7 --
@@ -156,12 +156,12 @@ string(8) "UTF-16LE"
156156

157157
-- Iteration 13 --
158158
string(8) "UTF-16LE"
159-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "UTF-7" is unknown
159+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "UTF-7" given
160160
string(8) "UTF-16LE"
161161

162162
-- Iteration 14 --
163163
string(8) "UTF-16LE"
164-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "UTF7-IMAP" is unknown
164+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "UTF7-IMAP" given
165165
string(8) "UTF-16LE"
166166

167167
-- Iteration 15 --
@@ -196,12 +196,12 @@ string(4) "SJIS"
196196

197197
-- Iteration 21 --
198198
string(4) "SJIS"
199-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "ISO-2022-JP" is unknown
199+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "ISO-2022-JP" given
200200
string(4) "SJIS"
201201

202202
-- Iteration 22 --
203203
string(4) "SJIS"
204-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "JIS" is unknown
204+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "JIS" given
205205
string(4) "SJIS"
206206

207207
-- Iteration 23 --
@@ -271,42 +271,42 @@ string(11) "ISO-8859-15"
271271

272272
-- Iteration 36 --
273273
string(11) "ISO-8859-15"
274-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "byte2be" is unknown
274+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "byte2be" given
275275
string(11) "ISO-8859-15"
276276

277277
-- Iteration 37 --
278278
string(11) "ISO-8859-15"
279-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "byte2le" is unknown
279+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "byte2le" given
280280
string(11) "ISO-8859-15"
281281

282282
-- Iteration 38 --
283283
string(11) "ISO-8859-15"
284-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "byte4be" is unknown
284+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "byte4be" given
285285
string(11) "ISO-8859-15"
286286

287287
-- Iteration 39 --
288288
string(11) "ISO-8859-15"
289-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "byte4le" is unknown
289+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "byte4le" given
290290
string(11) "ISO-8859-15"
291291

292292
-- Iteration 40 --
293293
string(11) "ISO-8859-15"
294-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "BASE64" is unknown
294+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "BASE64" given
295295
string(11) "ISO-8859-15"
296296

297297
-- Iteration 41 --
298298
string(11) "ISO-8859-15"
299-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "HTML-ENTITIES" is unknown
299+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "HTML-ENTITIES" given
300300
string(11) "ISO-8859-15"
301301

302302
-- Iteration 42 --
303303
string(11) "ISO-8859-15"
304-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "7bit" is unknown
304+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "7bit" given
305305
string(11) "ISO-8859-15"
306306

307307
-- Iteration 43 --
308308
string(11) "ISO-8859-15"
309-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "8bit" is unknown
309+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "8bit" given
310310
string(11) "ISO-8859-15"
311311

312312
-- Iteration 44 --
@@ -316,12 +316,12 @@ string(6) "EUC-CN"
316316

317317
-- Iteration 45 --
318318
string(6) "EUC-CN"
319-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "CP936" is unknown
319+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "CP936" given
320320
string(6) "EUC-CN"
321321

322322
-- Iteration 46 --
323323
string(6) "EUC-CN"
324-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "HZ" is unknown
324+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "HZ" given
325325
string(6) "EUC-CN"
326326

327327
-- Iteration 47 --
@@ -331,7 +331,7 @@ string(6) "EUC-TW"
331331

332332
-- Iteration 48 --
333333
string(6) "EUC-TW"
334-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "CP950" is unknown
334+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "CP950" given
335335
string(6) "EUC-TW"
336336

337337
-- Iteration 49 --
@@ -346,27 +346,27 @@ string(6) "EUC-KR"
346346

347347
-- Iteration 51 --
348348
string(6) "EUC-KR"
349-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "UHC" is unknown
349+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "UHC" given
350350
string(6) "EUC-KR"
351351

352352
-- Iteration 52 --
353353
string(6) "EUC-KR"
354-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "ISO-2022-KR" is unknown
354+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "ISO-2022-KR" given
355355
string(6) "EUC-KR"
356356

357357
-- Iteration 53 --
358358
string(6) "EUC-KR"
359-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "Windows-1251" is unknown
359+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "Windows-1251" given
360360
string(6) "EUC-KR"
361361

362362
-- Iteration 54 --
363363
string(6) "EUC-KR"
364-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "Windows-1252" is unknown
364+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "Windows-1252" given
365365
string(6) "EUC-KR"
366366

367367
-- Iteration 55 --
368368
string(6) "EUC-KR"
369-
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, encoding "CP866" is unknown
369+
mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "CP866" given
370370
string(6) "EUC-KR"
371371

372372
-- Iteration 56 --

ext/mbstring/tests/mb_str_unknown_encoding.phpt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -142,25 +142,25 @@ try {
142142

143143
?>
144144
--EXPECT--
145-
mb_chr(): Argument #2 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
146-
mb_convert_case(): Argument #3 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
145+
mb_chr(): Argument #2 ($encoding) must be a valid encoding, "UTF-0" given
146+
mb_convert_case(): Argument #3 ($encoding) must be a valid encoding, "UTF-0" given
147147
mb_convert_encoding(): Argument #3 ($from) must provide at least one valid character encoding
148-
mb_convert_kana(): Argument #3 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
149-
mb_decode_numericentity(): Argument #3 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
150-
mb_ord(): Argument #2 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
151-
mb_strcut(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
152-
mb_strimwidth(): Argument #5 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
153-
mb_stripos(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
154-
mb_stristr(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
155-
mb_strlen(): Argument #2 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
156-
mb_strpos(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
157-
mb_strrchr(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
158-
mb_strrichr(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
159-
mb_strripos(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
160-
mb_strrpos(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
161-
mb_strstr(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
162-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
163-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
164-
mb_strwidth(): Argument #2 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
165-
mb_substr(): Argument #4 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
166-
mb_substr_count(): Argument #3 ($encoding) must be a valid encoding, encoding "UTF-0" is unknown
148+
mb_convert_kana(): Argument #3 ($encoding) must be a valid encoding, "UTF-0" given
149+
mb_decode_numericentity(): Argument #3 ($encoding) must be a valid encoding, "UTF-0" given
150+
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "UTF-0" given
151+
mb_strcut(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
152+
mb_strimwidth(): Argument #5 ($encoding) must be a valid encoding, "UTF-0" given
153+
mb_stripos(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
154+
mb_stristr(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
155+
mb_strlen(): Argument #2 ($encoding) must be a valid encoding, "UTF-0" given
156+
mb_strpos(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
157+
mb_strrchr(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
158+
mb_strrichr(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
159+
mb_strripos(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
160+
mb_strrpos(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
161+
mb_strstr(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
162+
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "UTF-0" given
163+
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "UTF-0" given
164+
mb_strwidth(): Argument #2 ($encoding) must be a valid encoding, "UTF-0" given
165+
mb_substr(): Argument #4 ($encoding) must be a valid encoding, "UTF-0" given
166+
mb_substr_count(): Argument #3 ($encoding) must be a valid encoding, "UTF-0" given

ext/mbstring/tests/mb_stripos_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ try {
3232
?>
3333
--EXPECT--
3434
*** Testing mb_stripos() : error conditions ***
35-
mb_stripos(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
35+
mb_stripos(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_stristr_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ try {
3333
*** Testing mb_stristr() : error conditions ***
3434

3535
-- Testing mb_stristr() with unknown encoding --
36-
mb_stristr(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
36+
mb_stristr(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strlen.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ try {
7979
43
8080
101
8181
== WRONG PARAMETERS ==
82-
mb_strlen(): Argument #2 ($encoding) must be a valid encoding, encoding "BAD_NAME" is unknown
82+
mb_strlen(): Argument #2 ($encoding) must be a valid encoding, "BAD_NAME" given

ext/mbstring/tests/mb_strlen_error2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ try {
2929
}
3030

3131
?>
32-
--EXPECTF--
32+
--EXPECT--
3333
*** Testing mb_strlen() : error ***
34-
mb_strlen(): Argument #2 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
34+
mb_strlen(): Argument #2 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strpos_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ try {
3131
?>
3232
--EXPECT--
3333
*** Testing mb_strpos() : error conditions ***
34-
mb_strpos(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
34+
mb_strpos(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strrchr_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ try {
3333
*** Testing mb_strrchr() : error conditions ***
3434

3535
-- Testing mb_strrchr() with unknown encoding --
36-
mb_strrchr(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
36+
mb_strrchr(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strrichr_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ try {
3333
*** Testing mb_strrichr() : error conditions ***
3434

3535
-- Testing mb_strrichr() with unknown encoding --
36-
mb_strrichr(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
36+
mb_strrichr(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strripos_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ try {
3232
?>
3333
--EXPECT--
3434
*** Testing mb_strripos() : error conditions ***
35-
mb_strripos(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
35+
mb_strripos(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strrpos_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ try {
3232
?>
3333
--EXPECT--
3434
*** Testing mb_strrpos() : error conditions ***
35-
mb_strrpos(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
35+
mb_strrpos(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strstr_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ try {
3333
*** Testing mb_strstr() : error conditions ***
3434

3535
-- Testing mb_strstr() with unknown encoding --
36-
mb_strstr(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
36+
mb_strstr(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strtolower_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ try {
3030
?>
3131
--EXPECT--
3232
*** Testing mb_strtolower() : error conditions***
33-
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
33+
mb_strtolower(): Argument #2 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_strtoupper_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ try {
3030
?>
3131
--EXPECT--
3232
*** Testing mb_strtoupper() : error conditions ***
33-
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
33+
mb_strtoupper(): Argument #2 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_substr_count_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ try {
3535
*** Testing mb_substr_count() : error conditions ***
3636

3737
-- Testing mb_substr_count() function with an unknown encoding --
38-
mb_substr_count(): Argument #3 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
38+
mb_substr_count(): Argument #3 ($encoding) must be a valid encoding, "unknown-encoding" given

ext/mbstring/tests/mb_substr_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ try {
3232
?>
3333
--EXPECT--
3434
*** Testing mb_substr() : error conditions ***
35-
mb_substr(): Argument #4 ($encoding) must be a valid encoding, encoding "unknown-encoding" is unknown
35+
mb_substr(): Argument #4 ($encoding) must be a valid encoding, "unknown-encoding" given

0 commit comments

Comments
 (0)