Skip to content

Commit bf05987

Browse files
committed
Small rollback due to rebase + interesting test ...
1 parent af975d3 commit bf05987

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
--TEST--
2+
Test INI mbstring.internal_encoding basic - invalid encoding specified in INI
3+
--SKIPIF--
4+
<?php
5+
extension_loaded('mbstring') or die('skip');
6+
function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
7+
?>
8+
--INI--
9+
mbstring.internal_encoding=BAD
10+
--FILE--
11+
<?php
12+
13+
echo "*** Testing INI mbstring.internal_encoding: invalid encoding specified in INI ***\n";
14+
15+
echo mb_internal_encoding()."\n";
16+
echo ini_get('mbstring.internal_encoding')."\n";
17+
mb_internal_encoding('UTF-8');
18+
echo mb_internal_encoding()."\n";
19+
echo ini_get('mbstring.internal_encoding')."\n";
20+
21+
?>
22+
--EXPECT--
23+
*** Testing INI mbstring.internal_encoding: invalid encoding specified in INI ***
24+
UTF-8
25+
BAD
26+
UTF-8
27+
BAD

ext/mbstring/tests/mb_str_unknown_encoding.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,11 @@ try {
141141
}
142142

143143
?>
144-
--EXPECT--
144+
--EXPECTF--
145145
mb_chr(): Argument #2 ($encoding) must be a valid encoding, "UTF-0" given
146146
mb_convert_case(): Argument #3 ($encoding) must be a valid encoding, "UTF-0" given
147-
mb_convert_encoding(): Argument #3 ($from) must provide at least one valid character encoding
147+
148+
Warning: mb_convert_encoding(): Unknown encoding "UTF-0" in %s on line %d
148149
mb_convert_kana(): Argument #3 ($encoding) must be a valid encoding, "UTF-0" given
149150
mb_decode_numericentity(): Argument #3 ($encoding) must be a valid encoding, "UTF-0" given
150151
mb_ord(): Argument #2 ($encoding) must be a valid encoding, "UTF-0" given

0 commit comments

Comments
 (0)