From 65f72c346db6fa531093cbae67f2a84067f3c952 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Mon, 8 Sep 2025 22:03:15 +0200 Subject: [PATCH] mbstring: deprecated mb_internal_encoding() and mb_http_output() --- ext/mbstring/mbstring.c | 1 + ext/mbstring/mbstring.stub.php | 2 + ext/mbstring/mbstring_arginfo.h | 21 +- ext/mbstring/tests/bug45239.phpt | 3 +- ext/mbstring/tests/bug48697.phpt | 14 + ext/mbstring/tests/bug69079.phpt | 2 + ext/mbstring/tests/bug69086.phpt | 2 + ext/mbstring/tests/casefold.phpt | 3 +- ext/mbstring/tests/casemapping.phpt | 4 +- ext/mbstring/tests/gh13815.phpt | 4 +- ext/mbstring/tests/gh9535.phpt | 2 + ext/mbstring/tests/gh9535b.phpt | 2 + ext/mbstring/tests/ini_language.phpt | 4 +- ext/mbstring/tests/internal_encoding.phpt | 15 + ext/mbstring/tests/mb_chr.phpt | 4 +- .../mb_decode_mimeheader_variation4.phpt | 40 +-- .../tests/mb_encode_mimeheader_basic.phpt | 2 +- .../tests/mb_encode_mimeheader_basic2.phpt | 2 +- .../tests/mb_encode_mimeheader_basic3.phpt | 2 +- ext/mbstring/tests/mb_http_output.phpt | 26 +- ext/mbstring/tests/mb_internal_encoding.phpt | 18 +- .../tests/mb_internal_encoding_basic.phpt | 6 + .../tests/mb_internal_encoding_basic2.phpt | 8 +- .../tests/mb_internal_encoding_error2.phpt | 4 +- .../mb_internal_encoding_ini_basic2.phpt | 8 +- ...nternal_encoding_ini_invalid_encoding.phpt | 8 +- .../mb_internal_encoding_variation2.phpt | 312 ++++++++++++++++++ ext/mbstring/tests/mb_ord.phpt | 2 +- .../tests/mb_output_handler_euc_jp.phpt | 3 +- .../tests/mb_output_handler_pass.phpt | 8 +- ext/mbstring/tests/mb_send_mail01.phpt | 2 +- ext/mbstring/tests/mb_send_mail02.phpt | 2 +- ext/mbstring/tests/mb_send_mail03.phpt | 2 +- ext/mbstring/tests/mb_send_mail04.phpt | 2 +- ext/mbstring/tests/mb_send_mail05.phpt | 6 +- ext/mbstring/tests/mb_send_mail06.phpt | 8 +- ext/mbstring/tests/mb_send_mail07.phpt | 6 +- .../mb_strcut_missing_boundary_check.phpt | 14 +- ext/mbstring/tests/mb_stripos.phpt | 6 +- ext/mbstring/tests/mb_strlen.phpt | 12 +- ext/mbstring/tests/mb_strpos.phpt | 8 +- ext/mbstring/tests/mb_strstr.phpt | 2 +- ext/mbstring/tests/php_gr_jp_16242.phpt | 4 +- .../tests/strings/htmlentities05.phpt | 4 +- .../tests/strings/htmlentities06.phpt | 2 +- .../tests/strings/htmlentities07.phpt | 2 +- .../tests/strings/htmlentities08.phpt | 2 +- .../tests/strings/htmlentities09.phpt | 2 +- 48 files changed, 543 insertions(+), 75 deletions(-) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 4044f4de9ff57..c4450e0dca63d 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -24,6 +24,7 @@ #include "php.h" #include "php_ini.h" #include "php_variables.h" +#include "zend_attributes.h" #include "mbstring.h" #include "ext/standard/php_string.h" #include "ext/standard/php_mail.h" diff --git a/ext/mbstring/mbstring.stub.php b/ext/mbstring/mbstring.stub.php index af9c5cbb93ea2..d4d7e3161738f 100644 --- a/ext/mbstring/mbstring.stub.php +++ b/ext/mbstring/mbstring.stub.php @@ -55,6 +55,7 @@ function mb_language(?string $language = null): string|bool {} /** @refcount 1 */ + #[\Deprecated(since: '8.5', message: 'use internal_encoding INI settings instead')] function mb_internal_encoding(?string $encoding = null): string|bool {} /** @@ -64,6 +65,7 @@ function mb_internal_encoding(?string $encoding = null): string|bool {} function mb_http_input(?string $type = null): array|string|false {} /** @refcount 1 */ +#[\Deprecated(since: '8.5', message: 'use output_encoding INI settings instead')] function mb_http_output(?string $encoding = null): string|bool {} /** diff --git a/ext/mbstring/mbstring_arginfo.h b/ext/mbstring/mbstring_arginfo.h index 230dddf96941c..88683f81bd895 100644 --- a/ext/mbstring/mbstring_arginfo.h +++ b/ext/mbstring/mbstring_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 03c07f68bea7d7b96e6dc11f180f45663b859ed3 */ + * Stub hash: 65f39a3821d61adec378cf6ae28dfe8cd9e8ec2d */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_language, 0, 0, MAY_BE_STRING|MAY_BE_BOOL) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, language, IS_STRING, 1, "null") @@ -364,9 +364,9 @@ ZEND_FUNCTION(mb_regex_set_options); static const zend_function_entry ext_functions[] = { ZEND_FE(mb_language, arginfo_mb_language) - ZEND_FE(mb_internal_encoding, arginfo_mb_internal_encoding) + ZEND_RAW_FENTRY("mb_internal_encoding", zif_mb_internal_encoding, arginfo_mb_internal_encoding, ZEND_ACC_DEPRECATED, NULL, NULL) ZEND_FE(mb_http_input, arginfo_mb_http_input) - ZEND_FE(mb_http_output, arginfo_mb_http_output) + ZEND_RAW_FENTRY("mb_http_output", zif_mb_http_output, arginfo_mb_http_output, ZEND_ACC_DEPRECATED, NULL, NULL) ZEND_FE(mb_detect_order, arginfo_mb_detect_order) ZEND_FE(mb_substitute_character, arginfo_mb_substitute_character) ZEND_FE(mb_preferred_mime_name, arginfo_mb_preferred_mime_name) @@ -446,4 +446,19 @@ static void register_mbstring_symbols(int module_number) REGISTER_LONG_CONSTANT("MB_CASE_LOWER_SIMPLE", PHP_UNICODE_CASE_LOWER_SIMPLE, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MB_CASE_TITLE_SIMPLE", PHP_UNICODE_CASE_TITLE_SIMPLE, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MB_CASE_FOLD_SIMPLE", PHP_UNICODE_CASE_FOLD_SIMPLE, CONST_PERSISTENT); + + + zend_attribute *attribute_Deprecated_func_mb_internal_encoding_0 = zend_add_function_attribute(zend_hash_str_find_ptr(CG(function_table), "mb_internal_encoding", sizeof("mb_internal_encoding") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2); + ZVAL_STR(&attribute_Deprecated_func_mb_internal_encoding_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5)); + attribute_Deprecated_func_mb_internal_encoding_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE); + zend_string *attribute_Deprecated_func_mb_internal_encoding_0_arg1_str = zend_string_init("use internal_encoding INI settings instead", strlen("use internal_encoding INI settings instead"), 1); + ZVAL_STR(&attribute_Deprecated_func_mb_internal_encoding_0->args[1].value, attribute_Deprecated_func_mb_internal_encoding_0_arg1_str); + attribute_Deprecated_func_mb_internal_encoding_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE); + + zend_attribute *attribute_Deprecated_func_mb_http_output_0 = zend_add_function_attribute(zend_hash_str_find_ptr(CG(function_table), "mb_http_output", sizeof("mb_http_output") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2); + ZVAL_STR(&attribute_Deprecated_func_mb_http_output_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5)); + attribute_Deprecated_func_mb_http_output_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE); + zend_string *attribute_Deprecated_func_mb_http_output_0_arg1_str = zend_string_init("use output_encoding INI settings instead", strlen("use output_encoding INI settings instead"), 1); + ZVAL_STR(&attribute_Deprecated_func_mb_http_output_0->args[1].value, attribute_Deprecated_func_mb_http_output_0_arg1_str); + attribute_Deprecated_func_mb_http_output_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE); } diff --git a/ext/mbstring/tests/bug45239.phpt b/ext/mbstring/tests/bug45239.phpt index 1e57dce0b9e4f..981f455e0d1a9 100644 --- a/ext/mbstring/tests/bug45239.phpt +++ b/ext/mbstring/tests/bug45239.phpt @@ -12,5 +12,6 @@ mb_internal_encoding("utf-8"); mb_parse_str("a=%fc", $dummy); var_dump(mb_http_input()); ?> ---EXPECT-- +--EXPECTF-- +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" diff --git a/ext/mbstring/tests/bug48697.phpt b/ext/mbstring/tests/bug48697.phpt index 8218b95336fcb..3d7d0a2222232 100644 --- a/ext/mbstring/tests/bug48697.phpt +++ b/ext/mbstring/tests/bug48697.phpt @@ -18,8 +18,22 @@ var_dump(mb_internal_encoding()); ?> --EXPECTF-- Deprecated: ini_set(): Use of mbstring.internal_encoding is deprecated in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-15" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" diff --git a/ext/mbstring/tests/bug69079.phpt b/ext/mbstring/tests/bug69079.phpt index b16e82525ef10..9d6dd0aec1254 100644 --- a/ext/mbstring/tests/bug69079.phpt +++ b/ext/mbstring/tests/bug69079.phpt @@ -2,6 +2,8 @@ Bug #69079 (enhancement for mb_substitute_character) --EXTENSIONS-- mbstring +--INI-- +error_reporting=E_ALL & ~E_DEPRECATED --FILE-- ---EXPECT-- +--EXPECTF-- +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ diff --git a/ext/mbstring/tests/casemapping.phpt b/ext/mbstring/tests/casemapping.phpt index 050ebc94e25d1..31544fbcfb791 100644 --- a/ext/mbstring/tests/casemapping.phpt +++ b/ext/mbstring/tests/casemapping.phpt @@ -65,7 +65,7 @@ echo mb_convert_case("ΚΑΛΗΣΠΕΡΑ ΣΑΣ", MB_CASE_LOWER, "UTF-8"), "\n"; echo mb_convert_case("ΚΑΛΗΣΠΕΡΑ ΣΑΣ", MB_CASE_LOWER_SIMPLE, "UTF-8"), "\n"; ?> ---EXPECT-- +--EXPECTF-- String: ß Lower: ß Lower Simple: ß @@ -96,6 +96,8 @@ Title Simple: İ Fold: i̇ Fold Simple: İ + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d 69 69 69 diff --git a/ext/mbstring/tests/gh13815.phpt b/ext/mbstring/tests/gh13815.phpt index f5d49c0aa1d28..21bcd34398fd7 100644 --- a/ext/mbstring/tests/gh13815.phpt +++ b/ext/mbstring/tests/gh13815.phpt @@ -13,8 +13,10 @@ $strSjis = mb_convert_encoding($strUtf8, 'Shift_JIS', 'UTF-8'); var_dump(mb_strlen(mb_trim($strSjis))); var_dump(mb_strlen(mb_trim($strSjis, encoding: 'Shift_JIS'))); ?> ---EXPECT-- +--EXPECTF-- int(1) int(1) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d int(1) int(1) diff --git a/ext/mbstring/tests/gh9535.phpt b/ext/mbstring/tests/gh9535.phpt index 9b4916737313e..c41fe5440af9b 100644 --- a/ext/mbstring/tests/gh9535.phpt +++ b/ext/mbstring/tests/gh9535.phpt @@ -2,6 +2,8 @@ GH-9535 (mb_strcut(): The behavior of mb_strcut in mbstring has been changed in PHP8.1) --EXTENSIONS-- mbstring +--INI-- +error_reporting=E_ALL & ~E_DEPRECATED --FILE-- ---EXPECT-- +--EXPECTF-- string(9) "Shift_JIS" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(4) "SJIS" diff --git a/ext/mbstring/tests/internal_encoding.phpt b/ext/mbstring/tests/internal_encoding.phpt index 5ea7abab3a73c..f6df9b038002f 100644 --- a/ext/mbstring/tests/internal_encoding.phpt +++ b/ext/mbstring/tests/internal_encoding.phpt @@ -46,23 +46,38 @@ var_dump(mb_strlen("\xc3\xb6")); ?> --EXPECTF-- +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-1" int(2) Deprecated: ini_set(): Use of mbstring.internal_encoding is deprecated in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" int(1) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" int(1) Deprecated: ini_set(): Use of mbstring.internal_encoding is deprecated in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-2" int(2) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" int(1) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" int(1) Deprecated: ini_set(): Use of mbstring.internal_encoding is deprecated in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-3" int(2) diff --git a/ext/mbstring/tests/mb_chr.phpt b/ext/mbstring/tests/mb_chr.phpt index fd9a4eebbf62a..121ebc169e96c 100644 --- a/ext/mbstring/tests/mb_chr.phpt +++ b/ext/mbstring/tests/mb_chr.phpt @@ -46,7 +46,7 @@ try { } ?> ---EXPECT-- +--EXPECTF-- bool(true) bool(true) bool(true) @@ -56,4 +56,6 @@ mb_chr(): Argument #2 ($encoding) must be a valid encoding, "pass" given mb_chr() does not support the "JIS" encoding mb_chr() does not support the "CP50222" encoding mb_chr() does not support the "UTF-7" encoding + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d mb_chr() does not support the "UTF-7" encoding diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation4.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation4.phpt index 4579e6e834c83..530ddbbb81130 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation4.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation4.phpt @@ -8,89 +8,89 @@ mbstring // We convert runs of whitespace, including CR, LF, tab, and space, to a single space... // but ONLY when that run of whitespace does not occur right in the middle between two // valid MIME encoded words -mb_internal_encoding('UCS-2'); +ini_set('internal_encoding', 'UCS-2'); var_dump(bin2hex(mb_decode_mimeheader("2,\rGCG\xb3GS"))); // We DO convert a run of whitespace to a single space at the very beginning of the input string, // as long as it is followed by a non-whitespace character -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("\n8i"))); // But not if it is just a CR or LF at the end of the string -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("\r"))); // Not if it is a run of whitespace going right up to the end of the string -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("\n "))); // Handle = which doesn't initiate a valid encoded word -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader(",\x13@=,"))); // Encoded word which should not be accepted -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?I?B??="))); // Encoded word with invalid charset name, and input string ends with whitespace // The old implementation of mb_decode_mimeheader would get 'stuck' on the invalid encoding name // and could never get out of that state; it would not even try to interpret any other encoded words // up to the end of the input string -mb_internal_encoding('ISO-8859-7'); +ini_set('internal_encoding', 'ISO-8859-7'); var_dump(bin2hex(mb_decode_mimeheader("=?=\x20?=?R\xb7=?=\x20?\x8b\x00====?===??=\xc5UC-R\xb7=?=\x20?=?=====?=\x20?======?======?=\x20?======?===??=\xc5UC-KR\xb7=?=\x20?=?===?==?\x0a"))); // While the old implementation would generally trim off whitespace at the end of the input string, // but there was a bug whereby it would not do this when the whitespace character was the 100th // byte of an invalid charset name -mb_internal_encoding('UCS-2'); +ini_set('internal_encoding', 'UCS-2'); var_dump(bin2hex(mb_decode_mimeheader("=?\xc2\x86tf7,U\x01\x00`@\x00\x04|\xf1D\x18\x00\x00\x00v\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xff\x13f7,U&\x00S\x01\x00\x17,D\xcb\xcb\xcb\xcb\xcb\xcb\xcb\x01\x00\x00\x14\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\x00\x11\x00\x00\x00\x00\x00\x00\x0a"))); // Empty encoded word -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?us?B?"))); // Encoded word with just one invalid Base64 byte -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?us?B?-"))); // Encoded word with an invalid Base64 byte followed by a valid Base64 byte -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?us?B?-s"))); // Empty encoded word with a ? which looks like it should be terminator, but = is missing -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?us?B??"))); // Encoded word with just one invalid Base64 byte, but this time properly terminated -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?us?B?\x00?="))); // Invalid encoded word, followed immediately by valid encoded word -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?=?hz?b?"))); // Another example of invalid encoded word followed immediately by valid encoded word -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?==?hz?b?"))); // Yet another example -mb_internal_encoding('ASCII'); +ini_set('internal_encoding', 'ASCII'); var_dump(bin2hex(mb_decode_mimeheader("=?,=?hz?b?"))); // In PHP 8.0-8.1 this would cause a crash -mb_internal_encoding('UUENCODE'); +ini_set('internal_encoding', 'UUENCODE'); var_dump(bin2hex(mb_decode_mimeheader(""))); // The conversion filter for SJIS-Mobile#SOFTBANK did not work correctly when it was // passed the last buffer of wchars without passing 'end' flag, then called one more // time with an empty buffer and 'end' flag to finish up -mb_internal_encoding('SJIS-Mobile#SOFTBANK'); +ini_set('internal_encoding', 'SJIS-Mobile#SOFTBANK'); var_dump(bin2hex(mb_decode_mimeheader("6"))); // Same for SJIS-Mobile#KDDI and SJIS-Mobile#DOCOMO -mb_internal_encoding('SJIS-Mobile#KDDI'); +ini_set('internal_encoding', 'SJIS-Mobile#SOFTBANK'); var_dump(bin2hex(mb_decode_mimeheader("6"))); -mb_internal_encoding('SJIS-Mobile#DOCOMO'); +ini_set('internal_encoding', 'SJIS-Mobile#SOFTBANK'); var_dump(bin2hex(mb_decode_mimeheader("6"))); ?> diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt index fcc18b710747f..094c421077834 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt @@ -24,7 +24,7 @@ foreach ($english as $lang => $input) { var_dump(mb_encode_mimeheader($input, 'UTF-8', 'Q')); } -mb_internal_encoding('utf-8'); +ini_set('internal_encoding', 'utf-8'); foreach ($nonEnglish as $lang => $input) { echo "\nLanguage: $lang\n"; diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt index 695dd07b3efa3..f424812e7b757 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt @@ -22,7 +22,7 @@ $inputs = array('SJIS' => $sjis_string, foreach ($inputs as $lang => $input) { echo "\nLanguage: $lang\n"; echo "-- Base 64: --\n"; - mb_internal_encoding($lang); + ini_set('internal_encoding', $lang); $outEncoding = "UTF-8"; var_dump(mb_encode_mimeheader($input, $outEncoding, 'B')); echo "-- Quoted-Printable --\n"; diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt index 6817d25dc5c9f..6be41ca98750c 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt @@ -22,7 +22,7 @@ $inputs = array('SJIS' => $sjis_string, foreach ($inputs as $lang => $input) { echo "\nLanguage: $lang\n"; echo "-- Base 64: --\n"; - mb_internal_encoding($lang); + ini_set('internal_encoding', $lang); $outEncoding = $lang; var_dump(mb_encode_mimeheader($input, $outEncoding, 'B')); echo "-- Quoted-Printable --\n"; diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt index 9857e37e0a8bb..353de33ae7ccd 100644 --- a/ext/mbstring/tests/mb_http_output.phpt +++ b/ext/mbstring/tests/mb_http_output.phpt @@ -52,17 +52,41 @@ $enc = mb_http_output(); print "$enc\n"; ?> ---EXPECT-- +--EXPECTF-- + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d OK_ASCII_SET + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d ASCII + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d OK_SJIS_SET + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d SJIS + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d OK_JIS_SET + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d JIS + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d OK_UTF-8_SET + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d UTF-8 + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d OK_EUC-JP_SET + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d EUC-JP == INVALID PARAMETER == + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d mb_http_output(): Argument #1 ($encoding) must be a valid encoding, "BAD_NAME" given + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d EUC-JP diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt index 8e5356e2ada8e..05c7642b5c5e5 100644 --- a/ext/mbstring/tests/mb_internal_encoding.phpt +++ b/ext/mbstring/tests/mb_internal_encoding.phpt @@ -41,13 +41,29 @@ $enc = mb_internal_encoding(); print "$enc\n"; ?> ---EXPECT-- +--EXPECTF-- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d OK_EUC-JP_SET + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d EUC-JP + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d OK_UTF-8_SET + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d UTF-8 + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d OK_ASCII_SET + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d ASCII == INVALID PARAMETER == + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d mb_internal_encoding(): Argument #1 ($encoding) must be a valid encoding, "BAD_NAME" given + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d ASCII diff --git a/ext/mbstring/tests/mb_internal_encoding_basic.phpt b/ext/mbstring/tests/mb_internal_encoding_basic.phpt index 86a6e7cb7453e..7d9d64184890a 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic.phpt @@ -21,7 +21,13 @@ echo "Done"; ?> --EXPECTF-- *** Testing mb_internal_encoding() : basic functionality *** + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(%d) "%s" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" Done diff --git a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt index 52342622a6e44..92fd9873470b4 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt @@ -29,7 +29,7 @@ var_dump(mb_internal_encoding()); //check internal encoding is now set to UTF echo "Done"; ?> ---EXPECT-- +--EXPECTF-- *** Testing mb_internal_encoding() : basic functionality *** string(0) "" string(10) "ISO-8859-1" @@ -38,7 +38,13 @@ string(10) "ISO-8859-1" string(0) "" string(0) "" string(0) "" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-1" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" Done diff --git a/ext/mbstring/tests/mb_internal_encoding_error2.phpt b/ext/mbstring/tests/mb_internal_encoding_error2.phpt index 300525a1c2a4f..dbea6f60a7fab 100644 --- a/ext/mbstring/tests/mb_internal_encoding_error2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_error2.phpt @@ -17,6 +17,8 @@ try { } ?> ---EXPECT-- +--EXPECTF-- *** Testing mb_internal_encoding() : error conditions *** + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d mb_internal_encoding(): Argument #1 ($encoding) must be a valid encoding, "unknown-encoding" given diff --git a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt index aecee5e91c9fd..c444285c36c28 100644 --- a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt @@ -16,10 +16,16 @@ echo mb_internal_encoding()."\n"; echo ini_get('mbstring.internal_encoding')."\n"; ?> ---EXPECT-- +--EXPECTF-- Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0 *** Testing INI mbstring.internal_encoding : basic functionality *** + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d ISO-8859-7 ISO-8859-7 + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d UTF-8 ISO-8859-7 diff --git a/ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt index 7670ffc6b9de4..ff54872d28400 100644 --- a/ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt @@ -16,12 +16,18 @@ echo mb_internal_encoding()."\n"; echo ini_get('mbstring.internal_encoding')."\n"; ?> ---EXPECT-- +--EXPECTF-- Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0 Warning: PHP Startup: Unknown encoding "BAD" in ini setting in Unknown on line 0 *** Testing INI mbstring.internal_encoding: invalid encoding specified in INI *** + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d UTF-8 BAD + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d UTF-8 BAD diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt index dab306b12a2b8..91cbea28a019e 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt @@ -79,262 +79,574 @@ echo "Done"; *** Testing mb_internal_encoding() : usage variations *** -- Iteration 1 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(%d) "%s" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UCS-4" -- Iteration 2 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UCS-4" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(7) "UCS-4BE" -- Iteration 3 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(7) "UCS-4BE" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(7) "UCS-4LE" -- Iteration 4 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(7) "UCS-4LE" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UCS-2" -- Iteration 5 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UCS-2" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(7) "UCS-2BE" -- Iteration 6 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(7) "UCS-2BE" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(7) "UCS-2LE" -- Iteration 7 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(7) "UCS-2LE" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "UTF-32" -- Iteration 8 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "UTF-32" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "UTF-32BE" -- Iteration 9 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "UTF-32BE" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "UTF-32LE" -- Iteration 10 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "UTF-32LE" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "UTF-16" -- Iteration 11 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "UTF-16" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "UTF-16BE" -- Iteration 12 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "UTF-16BE" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "UTF-16LE" -- Iteration 13 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "UTF-16LE" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-7" -- Iteration 14 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-7" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(9) "UTF7-IMAP" -- Iteration 15 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(9) "UTF7-IMAP" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" -- Iteration 16 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "ASCII" -- Iteration 17 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "ASCII" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "EUC-JP" -- Iteration 18 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "EUC-JP" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(4) "SJIS" -- Iteration 19 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(4) "SJIS" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(9) "eucJP-win" -- Iteration 20 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(9) "eucJP-win" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "SJIS-win" -- Iteration 21 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(8) "SJIS-win" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-2022-JP" -- Iteration 22 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-2022-JP" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(3) "JIS" -- Iteration 23 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(3) "JIS" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-1" -- Iteration 24 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-1" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-2" -- Iteration 25 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-2" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-3" -- Iteration 26 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-3" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-4" -- Iteration 27 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-4" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-5" -- Iteration 28 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-5" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-6" -- Iteration 29 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-6" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-7" -- Iteration 30 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-7" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-8" -- Iteration 31 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-8" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-9" -- Iteration 32 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(10) "ISO-8859-9" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-10" -- Iteration 33 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-10" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-13" -- Iteration 34 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-13" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-14" -- Iteration 35 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-14" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-15" -- Iteration 36 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-8859-15" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "BASE64" -- Iteration 37 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "BASE64" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(13) "HTML-ENTITIES" -- Iteration 38 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(13) "HTML-ENTITIES" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(4) "7bit" -- Iteration 39 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(4) "7bit" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(4) "8bit" -- Iteration 40 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(4) "8bit" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "EUC-CN" -- Iteration 41 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "EUC-CN" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "CP936" -- Iteration 42 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "CP936" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(2) "HZ" -- Iteration 43 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(2) "HZ" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "EUC-TW" -- Iteration 44 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "EUC-TW" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "CP950" -- Iteration 45 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "CP950" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "BIG-5" -- Iteration 46 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "BIG-5" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "EUC-KR" -- Iteration 47 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "EUC-KR" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(3) "UHC" -- Iteration 48 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(3) "UHC" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-2022-KR" -- Iteration 49 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(11) "ISO-2022-KR" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(12) "Windows-1251" -- Iteration 50 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(12) "Windows-1251" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(12) "Windows-1252" -- Iteration 51 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(12) "Windows-1252" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "CP866" -- Iteration 52 -- + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "CP866" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d bool(true) + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(6) "KOI8-R" Done diff --git a/ext/mbstring/tests/mb_ord.phpt b/ext/mbstring/tests/mb_ord.phpt index a42cb9497fabd..a53628b287bd6 100644 --- a/ext/mbstring/tests/mb_ord.phpt +++ b/ext/mbstring/tests/mb_ord.phpt @@ -44,7 +44,7 @@ try { echo $e->getMessage() . \PHP_EOL; } -mb_internal_encoding("utf-7"); +ini_set("internal_encoding", "utf-7"); try { var_dump( mb_ord("\u{d800}") ); } catch (\ValueError $e) { diff --git a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt index c4d5b083a5d9f..911d1d03c4064 100644 --- a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt +++ b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt @@ -16,5 +16,6 @@ $output = ob_get_clean(); var_dump( $output ); ?> ---EXPECT-- +--EXPECTF-- +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d string(73) "ƥܸʸ󡣤Υ⥸塼PHP˥ޥХȴؿ󶡤ޤ" diff --git a/ext/mbstring/tests/mb_output_handler_pass.phpt b/ext/mbstring/tests/mb_output_handler_pass.phpt index e7f7d0cd1e643..6cd3c9cd21482 100644 --- a/ext/mbstring/tests/mb_output_handler_pass.phpt +++ b/ext/mbstring/tests/mb_output_handler_pass.phpt @@ -20,8 +20,14 @@ ob_start('mb_output_handler'); mb_http_output("pass"); var_dump("\xff"); ?> ---EXPECT-- +--EXPECTF-- + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d string(4) "pass" string(1) "" + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d string(1) "?" + +Deprecated: Function mb_http_output() is deprecated since 8.5, use output_encoding INI settings instead in %s on line %d string(1) "" diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt index 4387d9f817433..6da2532a1fc69 100644 --- a/ext/mbstring/tests/mb_send_mail01.phpt +++ b/ext/mbstring/tests/mb_send_mail01.phpt @@ -21,7 +21,7 @@ readfile(__DIR__ . "/mb_send_mail01.eml"); /* neutral (UTF-8) */ if (mb_language("neutral")) { - mb_internal_encoding("UTF-8"); + ini_set('internal_encoding', 'UTF-8'); mb_send_mail($to, "test ".mb_language(), "test"); readfile(__DIR__ . "/mb_send_mail01.eml"); } diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt index edc4093825af6..f64563d506441 100644 --- a/ext/mbstring/tests/mb_send_mail02.phpt +++ b/ext/mbstring/tests/mb_send_mail02.phpt @@ -21,7 +21,7 @@ readfile(__DIR__ . "/mb_send_mail02.eml"); /* Japanese (EUC-JP) */ if (mb_language("japanese")) { - mb_internal_encoding('EUC-JP'); + ini_set('internal_encoding', 'EUC-JP'); mb_send_mail($to, "ƥ ".mb_language(), "ƥ"); readfile(__DIR__ . "/mb_send_mail02.eml"); } diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt index 53cbf00a60f19..87745759d2fc6 100644 --- a/ext/mbstring/tests/mb_send_mail03.phpt +++ b/ext/mbstring/tests/mb_send_mail03.phpt @@ -21,7 +21,7 @@ readfile(__DIR__ . "/mb_send_mail03.eml"); /* English (iso-8859-1) */ if (mb_language("english")) { - mb_internal_encoding("ISO-8859-1"); + ini_set('internal_encoding', 'ISO-8859-1'); mb_send_mail($to, "test ".mb_language(), "test"); readfile(__DIR__ . "/mb_send_mail03.eml"); } diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt index 2251771469e16..202d8d5158f64 100644 --- a/ext/mbstring/tests/mb_send_mail04.phpt +++ b/ext/mbstring/tests/mb_send_mail04.phpt @@ -21,7 +21,7 @@ readfile(__DIR__ . "/mb_send_mail04.eml"); /* German (iso-8859-15) */ if (mb_language("german")) { - mb_internal_encoding("ISO-8859-15"); + ini_set('internal_encoding', 'ISO-8859-15'); mb_send_mail($to, "Pr"."\xfc"."fung ".mb_language(), "Pr"."\xfc"."fung"); readfile(__DIR__ . "/mb_send_mail04.eml"); } diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt index 251b918bdb85b..019a958adc755 100644 --- a/ext/mbstring/tests/mb_send_mail05.phpt +++ b/ext/mbstring/tests/mb_send_mail05.phpt @@ -7,7 +7,7 @@ mbstring if (!function_exists("mb_send_mail") || !mb_language("Simplified Chinese")) { die("skip mb_send_mail() not available"); } -if (!@mb_internal_encoding('GB2312')) { +if (!@ini_set('internal_encoding','GB2312')) { die("skip GB2312 encoding is not available on this platform"); } ?> @@ -24,8 +24,8 @@ readfile(__DIR__ . "/mb_send_mail05.eml"); /* Simplified Chinese (HK-GB-2312) */ if (mb_language("simplified chinese")) { - mb_internal_encoding('GB2312'); - mb_send_mail($to, " ".mb_language(), ""); + ini_set('internal_encoding','GB2312'); + mb_send_mail($to, "���� ".mb_language(), "����"); readfile(__DIR__ . "/mb_send_mail05.eml"); } ?> diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt index d2fd7a9bbf3ab..0984c50a70e15 100644 --- a/ext/mbstring/tests/mb_send_mail06.phpt +++ b/ext/mbstring/tests/mb_send_mail06.phpt @@ -7,7 +7,7 @@ mbstring if (!function_exists("mb_send_mail") || !mb_language("Traditional Chinese")) { die("skip mb_send_mail() not available"); } -if (!@mb_internal_encoding('BIG5')) { +if (!@ini_set('internal_encoding','BIG5')) { die("skip BIG5 encoding is not available on this platform"); } ?> @@ -24,8 +24,8 @@ readfile(__DIR__ . "/mb_send_mail06.eml"); /* Traditional Chinese () */ if (mb_language("traditional chinese")) { - mb_internal_encoding('BIG5'); - mb_send_mail($to, " ".mb_language(), ""); + ini_set('internal_encoding','BIG5'); + mb_send_mail($to, "���� ".mb_language(), "����"); readfile(__DIR__ . "/mb_send_mail06.eml"); } ?> @@ -47,4 +47,4 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=BIG5 Content-Transfer-Encoding: 8bit - +���� diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt index 7ef5ff0377fdf..e9ad10b12238d 100644 --- a/ext/mbstring/tests/mb_send_mail07.phpt +++ b/ext/mbstring/tests/mb_send_mail07.phpt @@ -7,7 +7,7 @@ mbstring if (!function_exists("mb_send_mail") || !mb_language("Korean")) { die("skip mb_send_mail() not available"); } -if (!@mb_internal_encoding('ISO-2022-KR')) { +if (!@ini_set('internal_encoding','ISO-2022-KR')) { die("skip ISO-2022-KR encoding is not available on this platform"); } ?> @@ -24,8 +24,8 @@ readfile(__DIR__ . "/mb_send_mail07.eml"); /* Korean */ if (mb_language("korean")) { - mb_internal_encoding('EUC-KR'); - mb_send_mail($to, "׽Ʈ ".mb_language(), "׽Ʈ"); + ini_set('internal_encoding','EUC-KR'); + mb_send_mail($to, "�׽�Ʈ ".mb_language(), "�׽�Ʈ"); readfile(__DIR__ . "/mb_send_mail07.eml"); } diff --git a/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt b/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt index 7806ac057aab0..d6ee8d589e644 100644 --- a/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt +++ b/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt @@ -4,19 +4,19 @@ mb_strcut() missing boundary check. mbstring --FILE-- --EXPECT-- diff --git a/ext/mbstring/tests/mb_stripos.phpt b/ext/mbstring/tests/mb_stripos.phpt index 9e7e33dadd954..47d139b54f2c1 100644 --- a/ext/mbstring/tests/mb_stripos.phpt +++ b/ext/mbstring/tests/mb_stripos.phpt @@ -16,7 +16,7 @@ $slen = mb_strlen($euc_jp, 'EUC-JP'); echo "String len: $slen\n"; // EUC-JP - With encoding parameter -mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n"); +ini_set('internal_encoding', 'UTF-8'); echo "== POSITIVE OFFSET ==\n"; @@ -73,7 +73,7 @@ $r = mb_stripos($euc_jp, "\n", 0, 'EUC-JP'); // EUC-JP - No encoding parameter echo "== NO ENCODING PARAMETER ==\n"; -mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n"); +ini_set('internal_encoding', 'EUC-JP'); print mb_stripos($euc_jp, "\xC6\xFC\xCB\xDC\xB8\xEC", 0) . "\n"; print mb_stripos($euc_jp, '0', 0) . "\n"; @@ -88,7 +88,7 @@ $r = mb_stripos($euc_jp, "\n", 0); // EUC-JP - No offset and encoding parameter echo "== NO OFFSET AND ENCODING PARAMETER ==\n"; -mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n"); +ini_set('internal_encoding', 'EUC-JP'); print mb_stripos($euc_jp, "\xC6\xFC\xCB\xDC\xB8\xEC") . "\n"; print mb_stripos($euc_jp, '0') . "\n"; diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt index c8279a3c8bfd5..e0ebc88fc8312 100644 --- a/ext/mbstring/tests/mb_strlen.phpt +++ b/ext/mbstring/tests/mb_strlen.phpt @@ -101,15 +101,19 @@ try { } ?> ---EXPECT-- +--EXPECTF-- == ASCII == 40 40 == EUC-JP == 43 + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d 72 == SJIS == 43 + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d 72 -- Testing illegal bytes 0x80,0xFD-FF -- 2 @@ -136,9 +140,13 @@ try { 6 == JIS == 43 + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d 90 == UTF-8 == 43 codepoints + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d 101 bytes 23 2300 @@ -147,4 +155,6 @@ try { 2300 2048 == WRONG PARAMETERS == + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d mb_strlen(): Argument #2 ($encoding) must be a valid encoding, "BAD_NAME" given diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt index f0f16a806e7b3..47c398789bba1 100644 --- a/ext/mbstring/tests/mb_strpos.phpt +++ b/ext/mbstring/tests/mb_strpos.phpt @@ -104,8 +104,10 @@ var_dump(mb_strpos("abc\x80\x80", "\x80", 0, "UTF-8")); var_dump(mb_strpos("abc\xFF", "c\xFF", 0, "UTF-8")); ?> ---EXPECT-- +--EXPECTF-- String len: 43 + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d == POSITIVE OFFSET == 10 0 @@ -125,6 +127,8 @@ String len: 43 OK_STR OK_NEWLINE == NO ENCODING PARAMETER == + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d 10 0 3 @@ -132,6 +136,8 @@ OK_NEWLINE OK_STR OK_NEWLINE == NO OFFSET AND ENCODING PARAMETER == + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d 10 0 3 diff --git a/ext/mbstring/tests/mb_strstr.phpt b/ext/mbstring/tests/mb_strstr.phpt index 85b0eeb19f404..e36253c4c9b74 100644 --- a/ext/mbstring/tests/mb_strstr.phpt +++ b/ext/mbstring/tests/mb_strstr.phpt @@ -17,7 +17,7 @@ var_dump(mb_strstr("あいうえおかきくけこ", "おかき", false)); var_dump(mb_strstr("あいうえおかきくけこ", "おかき", true)); var_dump(FROM_EUC_JP(mb_strstr(EUC_JP("あいうえおかきくけこ"), EUC_JP("おかき"), false, "EUC-JP"))); var_dump(FROM_EUC_JP(mb_strstr(EUC_JP("あいうえおかきくけこ"), EUC_JP("おかき"), true, "EUC-JP"))); -mb_internal_encoding("EUC-JP"); +ini_set("internal_encoding", "EUC-JP"); var_dump(FROM_EUC_JP(mb_strstr(EUC_JP("あいうえおかきくけこ"), EUC_JP("おかき")))); var_dump(FROM_EUC_JP(mb_strstr(EUC_JP("あいうえおかきくけこ"), EUC_JP("おかき"), false))); var_dump(FROM_EUC_JP(mb_strstr(EUC_JP("あいうえおかきくけこ"), EUC_JP("おかき"), true))); diff --git a/ext/mbstring/tests/php_gr_jp_16242.phpt b/ext/mbstring/tests/php_gr_jp_16242.phpt index 67082d285eae2..ecbbd8a7c7d18 100644 --- a/ext/mbstring/tests/php_gr_jp_16242.phpt +++ b/ext/mbstring/tests/php_gr_jp_16242.phpt @@ -13,7 +13,9 @@ var_dump(ini_get('internal_encoding')); var_dump(mb_internal_encoding()); ?> ---EXPECT-- +--EXPECTF-- string(8) "Japanese" string(5) "UTF-8" + +Deprecated: Function mb_internal_encoding() is deprecated since 8.5, use internal_encoding INI settings instead in %s on line %d string(5) "UTF-8" diff --git a/ext/standard/tests/strings/htmlentities05.phpt b/ext/standard/tests/strings/htmlentities05.phpt index 2df9a2cebee2b..117b3a9c1c0f8 100644 --- a/ext/standard/tests/strings/htmlentities05.phpt +++ b/ext/standard/tests/strings/htmlentities05.phpt @@ -7,11 +7,11 @@ internal_encoding=cp1252 mbstring --FILE-- --EXPECT-- -Windows-1252 +cp1252 string(28) "‚†™Ÿ" string(32) "€¢£¤¥" diff --git a/ext/standard/tests/strings/htmlentities06.phpt b/ext/standard/tests/strings/htmlentities06.phpt index 4066b6c2e6804..1ba4bf11c1da8 100644 --- a/ext/standard/tests/strings/htmlentities06.phpt +++ b/ext/standard/tests/strings/htmlentities06.phpt @@ -7,7 +7,7 @@ internal_encoding=ISO-8859-15 mbstring --FILE-- --EXPECT-- diff --git a/ext/standard/tests/strings/htmlentities07.phpt b/ext/standard/tests/strings/htmlentities07.phpt index 7e735a434ab80..53d937829253d 100644 --- a/ext/standard/tests/strings/htmlentities07.phpt +++ b/ext/standard/tests/strings/htmlentities07.phpt @@ -7,7 +7,7 @@ internal_encoding=ISO-8859-1 mbstring --FILE-- --EXPECT-- diff --git a/ext/standard/tests/strings/htmlentities08.phpt b/ext/standard/tests/strings/htmlentities08.phpt index 3b177a4b99452..c764e55340d83 100644 --- a/ext/standard/tests/strings/htmlentities08.phpt +++ b/ext/standard/tests/strings/htmlentities08.phpt @@ -7,7 +7,7 @@ internal_encoding=EUC-JP mbstring --FILE-- --EXPECTF-- diff --git a/ext/standard/tests/strings/htmlentities09.phpt b/ext/standard/tests/strings/htmlentities09.phpt index 891cababb55a5..4e160accf1a52 100644 --- a/ext/standard/tests/strings/htmlentities09.phpt +++ b/ext/standard/tests/strings/htmlentities09.phpt @@ -7,7 +7,7 @@ internal_encoding=Shift_JIS mbstring --FILE-- --EXPECTF--