From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 17 Apr 2019 12:24:11 +0000 (+0200)
Subject: Remove some uses of deprecated internal_encoding settings in tests
X-Git-Tag: php-7.4.0alpha1~477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=487d4d07b452245392369dd4d08554ee71e95a29;p=php

Remove some uses of deprecated internal_encoding settings in tests
---

diff --git a/ext/iconv/tests/iconv004.phpt b/ext/iconv/tests/iconv004.phpt
index 6c8606536d..cf8c65bd3a 100644
--- a/ext/iconv/tests/iconv004.phpt
+++ b/ext/iconv/tests/iconv004.phpt
@@ -3,9 +3,9 @@ iconv_mime_encode() sanity cheeck.
 --SKIPIF--
 <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
 --INI--
-iconv.input_encoding = ISO-8859-1
-iconv.internal_encoding = ISO-8859-1
-iconv.output_encoding = ISO-8859-1
+input_encoding = ISO-8859-1
+internal_encoding = ISO-8859-1
+output_encoding = ISO-8859-1
 --FILE--
 <?php
 var_dump(iconv_mime_encode('', ''));
diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt
index e69e4175a8..d547310381 100644
--- a/ext/iconv/tests/iconv_encoding_basic.phpt
+++ b/ext/iconv/tests/iconv_encoding_basic.phpt
@@ -7,7 +7,7 @@ function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not a
 ?>
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
-iconv.input_encoding=ISO-8859-1
+input_encoding=ISO-8859-1
 iconv.internal_encoding=ISO-8859-1
 iconv.output_encoding=ISO-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt
index 582529d54d..58b98407e6 100644
--- a/ext/iconv/tests/iconv_substr_basic.phpt
+++ b/ext/iconv/tests/iconv_substr_basic.phpt
@@ -6,9 +6,9 @@ extension_loaded('iconv') or die('skip');
 function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build");
 ?>
 --INI--
-iconv.input_encoding=ISO-8859-1
-iconv.internal_encoding=ISO-8859-1
-iconv.output_encoding=ISO-8859-1
+input_encoding=ISO-8859-1
+internal_encoding=ISO-8859-1
+output_encoding=ISO-8859-1
 --FILE--
 <?php
 /* Prototype  : string iconv_substr(string str, int offset, [int length, string charset])
diff --git a/ext/mbstring/tests/bug45239.phpt b/ext/mbstring/tests/bug45239.phpt
index 8d8ef4831e..d67aedc413 100644
--- a/ext/mbstring/tests/bug45239.phpt
+++ b/ext/mbstring/tests/bug45239.phpt
@@ -2,8 +2,8 @@
 Bug #45239 (encoding detector hangs with mbstring.strict_detection enabled)
 --INI--
 mbstring.strict_detection=1
-mbstring.http_input=UTF-8
-mbstring.internal_encoding=UTF-8
+input_encoding=UTF-8
+internal_encoding=UTF-8
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
diff --git a/ext/mbstring/tests/bug45923.phpt b/ext/mbstring/tests/bug45923.phpt
index aad4b0de4f..eace49678c 100644
--- a/ext/mbstring/tests/bug45923.phpt
+++ b/ext/mbstring/tests/bug45923.phpt
@@ -2,8 +2,6 @@
 Bug #45923 (mb_st[r]ripos() offset not handled correctly)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/bug52931.phpt b/ext/mbstring/tests/bug52931.phpt
index ab8c8df723..e7d7b6dda4 100644
--- a/ext/mbstring/tests/bug52931.phpt
+++ b/ext/mbstring/tests/bug52931.phpt
@@ -4,7 +4,6 @@ Bug #52931 (strripos not overloaded with function overloading enabled)
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 mbstring.func_overload = 7
-mbstring.internal_encoding = utf-8
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt
index 91ab5bd507..50235b2fed 100644
--- a/ext/mbstring/tests/htmlent.phpt
+++ b/ext/mbstring/tests/htmlent.phpt
@@ -11,9 +11,8 @@ output_handler=mb_output_handler
 zlib.output_compression=
 arg_separator.input=x
 error_reporting=0
-mbstring.http_input=HTML-ENTITIES
-mbstring.internal_encoding=UTF-8
-mbstring.http_output=HTML-ENTITIES
+input_encoding=HTML-ENTITIES
+output_encoding=HTML-ENTITIES
 mbstring.encoding_translation=1
 filter.default=unsafe_raw
 --FILE--
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-01.phpt b/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
index 62825b6efb..d80b6daf5e 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
@@ -2,8 +2,6 @@
 mb_output_handler() and mbstring.http_output_conv_mimetypes (1)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 mb_http_output("EUC-JP");
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-02.phpt b/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
index e20b115038..756610cdf3 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
@@ -2,8 +2,6 @@
 mb_output_handler() and mbstring.http_output_conv_mimetypes (2)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 mb_http_output("EUC-JP");
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-03.phpt b/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
index c4e9886bac..f634decb4b 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
@@ -2,8 +2,6 @@
 mb_output_handler() and mbstring.http_output_conv_mimetypes (3)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 mb_http_output("EUC-JP");
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-04.phpt b/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
index bf8bd768a9..f0ab94da3a 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
@@ -2,8 +2,6 @@
 mb_output_handler() and mbstring.http_output_conv_mimetypes (4)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 mb_http_output("EUC-JP");
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-05.phpt b/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
index c63724eb32..b211a30c6d 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
@@ -2,8 +2,6 @@
 mb_output_handler() and mbstring.http_output_conv_mimetypes (5)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 mb_http_output("EUC-JP");
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-06.phpt b/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
index 00cf4af7d8..efbbfa659f 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
@@ -2,8 +2,6 @@
 mb_output_handler() and mbstring.http_output_conv_mimetypes (6)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 mb_http_output("EUC-JP");
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-07.phpt b/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
index 3cc9305a92..60f03f91c5 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
@@ -3,7 +3,6 @@ mb_output_handler() and mbstring.http_output_conv_mimetypes (7)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-mbstring.internal_encoding=UTF-8
 mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-08.phpt b/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
index 5117decdc8..5168be8ae6 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
@@ -3,7 +3,6 @@ mb_output_handler() and mbstring.http_output_conv_mimetypes (8)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-mbstring.internal_encoding=UTF-8
 mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-09.phpt b/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
index e119da0d4a..4caa8ea840 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
@@ -3,7 +3,6 @@ mb_output_handler() and mbstring.http_output_conv_mimetypes (9)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-mbstring.internal_encoding=UTF-8
 mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-10.phpt b/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
index 7aec886b75..732e68fa59 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
@@ -3,7 +3,6 @@ mb_output_handler() and mbstring.http_output_conv_mimetypes (10)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-mbstring.internal_encoding=UTF-8
 mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-11.phpt b/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
index 2b16479994..b8856184eb 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
@@ -2,8 +2,6 @@
 mb_output_handler() and mbstring.http_output_conv_mimetypes (11)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 mb_http_output("EUC-JP");
diff --git a/ext/mbstring/tests/mb_output_handler_pattern-12.phpt b/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
index d27510b57e..0b41989429 100644
--- a/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
@@ -2,8 +2,6 @@
 mb_output_handler() and mbstring.http_output_conv_mimetypes (12)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 mb_http_output("EUC-JP");
diff --git a/ext/mbstring/tests/mb_output_handler_shift_jis.phpt b/ext/mbstring/tests/mb_output_handler_shift_jis.phpt
index 01742d101e..adf61f4959 100644
--- a/ext/mbstring/tests/mb_output_handler_shift_jis.phpt
+++ b/ext/mbstring/tests/mb_output_handler_shift_jis.phpt
@@ -4,8 +4,8 @@ mb_output_handler() (Shift_JIS)
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 output_handler=mb_output_handler
-mbstring.internal_encoding=Shift_JIS
-mbstring.http_output=EUC-JP
+internal_encoding=Shift_JIS
+output_encoding=EUC-JP
 --FILE--
 <?php
 // Shift_JIS
diff --git a/ext/mbstring/tests/mb_strstr.phpt b/ext/mbstring/tests/mb_strstr.phpt
index d224475370..61b2fcb1c3 100644
--- a/ext/mbstring/tests/mb_strstr.phpt
+++ b/ext/mbstring/tests/mb_strstr.phpt
@@ -2,8 +2,6 @@
 mb_strstr()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=UTF-8
 --FILE--
 <?php
 function EUC_JP($utf8str) {
diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt
index 2edb91291f..ecc04af973 100644
--- a/ext/mbstring/tests/mb_substr_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_basic.phpt
@@ -6,7 +6,7 @@ extension_loaded('mbstring') or die('skip');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --INI--
-mbstring.internal_encoding=ISO-8859-1
+internal_encoding=ISO-8859-1
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
diff --git a/ext/mbstring/tests/overload01.phpt b/ext/mbstring/tests/overload01.phpt
index 4e6802b930..436608a89c 100644
--- a/ext/mbstring/tests/overload01.phpt
+++ b/ext/mbstring/tests/overload01.phpt
@@ -7,7 +7,7 @@ Function overloading test 1
 --INI--
 output_handler=
 mbstring.func_overload=7
-mbstring.internal_encoding=EUC-JP
+internal_encoding=EUC-JP
 --FILE--
 <?php
 echo mb_internal_encoding()."\n";
diff --git a/ext/mbstring/tests/overload02.phpt b/ext/mbstring/tests/overload02.phpt
index 2aa30ad025..2e4bbe856a 100644
--- a/ext/mbstring/tests/overload02.phpt
+++ b/ext/mbstring/tests/overload02.phpt
@@ -10,7 +10,7 @@ Function overloading test 2
 --INI--
 output_handler=
 mbstring.func_overload=7
-mbstring.internal_encoding=EUC-JP
+internal_encoding=EUC-JP
 --FILE--
 <?php
 echo mb_internal_encoding()."\n";
diff --git a/ext/mbstring/tests/zend_multibyte-01.phpt b/ext/mbstring/tests/zend_multibyte-01.phpt
index 5802cf2f21..aae944de35 100644
--- a/ext/mbstring/tests/zend_multibyte-01.phpt
+++ b/ext/mbstring/tests/zend_multibyte-01.phpt
@@ -5,7 +5,7 @@ zend multibyte (1)
 --INI--
 zend.multibyte=On
 zend.script_encoding=Shift_JIS
-mbstring.internal_encoding=Shift_JIS
+internal_encoding=Shift_JIS
 --FILE--
 <?php
 	function —\Ž\”\($ˆø”)
diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt
index 6008be5a11..a284aca41b 100644
--- a/ext/mbstring/tests/zend_multibyte-02.phpt
+++ b/ext/mbstring/tests/zend_multibyte-02.phpt
@@ -6,7 +6,7 @@ zend multibyte (2)
 error_reporting=E_ALL & ~E_DEPRECATED
 zend.multibyte=On
 zend.script_encoding=UTF-8
-mbstring.internal_encoding=CP932
+internal_encoding=CP932
 --FILE--
 <?php
 var_dump(bin2hex("テスト"));
diff --git a/ext/mbstring/tests/zend_multibyte-03.phpt b/ext/mbstring/tests/zend_multibyte-03.phpt
index b7e13d46ed..86b187b9c0 100644
--- a/ext/mbstring/tests/zend_multibyte-03.phpt
+++ b/ext/mbstring/tests/zend_multibyte-03.phpt
@@ -5,7 +5,7 @@ zend multibyte (3)
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
-mbstring.internal_encoding=EUC-JP
+internal_encoding=EUC-JP
 --FILE--
 <?php
 var_dump(bin2hex("テスト"));
diff --git a/ext/mbstring/tests/zend_multibyte-04.phpt b/ext/mbstring/tests/zend_multibyte-04.phpt
index 5cb3af3472..fd114fda82 100644
--- a/ext/mbstring/tests/zend_multibyte-04.phpt
+++ b/ext/mbstring/tests/zend_multibyte-04.phpt
@@ -5,7 +5,7 @@ zend multibyte (4)
 --INI--
 zend.multibyte=On
 zend.script_encoding=CP932
-mbstring.internal_encoding=UTF-8
+internal_encoding=UTF-8
 --FILE--
 <?php
 var_dump(bin2hex("ƒeƒXƒg"));
diff --git a/ext/mbstring/tests/zend_multibyte-05.phpt b/ext/mbstring/tests/zend_multibyte-05.phpt
index 4d0c236b7a..c678123f8a 100644
--- a/ext/mbstring/tests/zend_multibyte-05.phpt
+++ b/ext/mbstring/tests/zend_multibyte-05.phpt
@@ -5,7 +5,7 @@ zend multibyte (5)
 --INI--
 zend.multibyte=On
 zend.script_encoding=EUC-JP
-mbstring.internal_encoding=UTF-8
+internal_encoding=UTF-8
 --FILE--
 <?php
 // forcefully interpret an UTF-8 encoded string as EUC-JP and then convert it
diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt
index c75c0b8cb2..8f8ac6c3b7 100644
--- a/ext/mbstring/tests/zend_multibyte-06.phpt
+++ b/ext/mbstring/tests/zend_multibyte-06.phpt
@@ -5,7 +5,7 @@ zend multibyte (6)
 --INI--
 zend.multibyte=On
 zend.script_encoding=EUC-JP
-mbstring.internal_encoding=CP932
+internal_encoding=CP932
 --FILE--
 <?php
 declare(encoding="UTF-8");
diff --git a/ext/mbstring/tests/zend_multibyte-07.phpt b/ext/mbstring/tests/zend_multibyte-07.phpt
index b81104ca3e..14fffd1328 100644
--- a/ext/mbstring/tests/zend_multibyte-07.phpt
+++ b/ext/mbstring/tests/zend_multibyte-07.phpt
@@ -3,10 +3,9 @@ zend multibyte (7)
 --SKIPIF--
 <?php require 'skipif.inc'; ?>
 --INI--
-error_reporting=E_ALL & ~E_DEPRECATED
 zend.multibyte=On
 zend.script_encoding=ISO-8859-1
-mbstring.internal_encoding=EUC-JP
+internal_encoding=EUC-JP
 --FILE--
 <?php
 declare(encoding="UTF-8");
diff --git a/ext/mbstring/tests/zend_multibyte-08.phpt b/ext/mbstring/tests/zend_multibyte-08.phpt
index 1030dfdc91..d04d99ed83 100644
--- a/ext/mbstring/tests/zend_multibyte-08.phpt
+++ b/ext/mbstring/tests/zend_multibyte-08.phpt
@@ -5,7 +5,7 @@ zend multibyte (8)
 --INI--
 zend.multibyte=On
 zend.script_encoding=ISO-8859-1
-mbstring.internal_encoding=UTF-8
+internal_encoding=UTF-8
 --FILE--
 <?php
 declare(encoding="CP932");
diff --git a/ext/mbstring/tests/zend_multibyte-09.phpt b/ext/mbstring/tests/zend_multibyte-09.phpt
index 17d5840e47..4feb5926a8 100644
--- a/ext/mbstring/tests/zend_multibyte-09.phpt
+++ b/ext/mbstring/tests/zend_multibyte-09.phpt
@@ -3,10 +3,9 @@ zend multibyte (9)
 --SKIPIF--
 <?php require 'skipif.inc'; ?>
 --INI--
-error_reporting=E_ALL & ~E_DEPRECATED
 zend.multibyte=On
 zend.script_encoding=cp1251
-mbstring.internal_encoding=UTF-8
+internal_encoding=UTF-8
 --FILE--
 <?php
 declare(encoding="EUC-JP");
diff --git a/ext/mbstring/tests/zend_multibyte-13.phpt b/ext/mbstring/tests/zend_multibyte-13.phpt
index f3a18fe481..5075c5e55e 100644
--- a/ext/mbstring/tests/zend_multibyte-13.phpt
+++ b/ext/mbstring/tests/zend_multibyte-13.phpt
@@ -5,7 +5,7 @@ zend multibyte (13)
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
-mbstring.internal_encoding=ISO-8859-1
+internal_encoding=ISO-8859-1
 --FILE--
 <?php
 var_dump(substr(file_get_contents(__FILE__), __COMPILER_HALT_OFFSET__));
diff --git a/ext/mbstring/tests/zend_multibyte-14.phpt b/ext/mbstring/tests/zend_multibyte-14.phpt
index 36c7c5355c..df7d03a653 100644
--- a/ext/mbstring/tests/zend_multibyte-14.phpt
+++ b/ext/mbstring/tests/zend_multibyte-14.phpt
@@ -5,7 +5,7 @@ zend multibyte (14)
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
-mbstring.internal_encoding=UTF-8
+internal_encoding=UTF-8
 --FILE--
 <?php
 var_dump(substr(file_get_contents(__FILE__), __COMPILER_HALT_OFFSET__));
diff --git a/ext/opcache/tests/bug68644.phpt b/ext/opcache/tests/bug68644.phpt
index b82615ac4a..1a967facaf 100644
--- a/ext/opcache/tests/bug68644.phpt
+++ b/ext/opcache/tests/bug68644.phpt
@@ -4,7 +4,6 @@ Bug #68644 strlen incorrect : mbstring + func_overload=2 + UTF-8 + Opcache
 opcache.enable=1
 opcache.enable_cli=1
 mbstring.func_overload=2
-mbstring.internal_encoding=UTF-8
 --SKIPIF--
 <?php if (!extension_loaded('Zend OPcache') || !extension_loaded("mbstring")) die("skip"); ?>
 --FILE--
diff --git a/ext/standard/tests/strings/htmlentities01.phpt b/ext/standard/tests/strings/htmlentities01.phpt
index 4ab49472d1..092027a7a4 100644
--- a/ext/standard/tests/strings/htmlentities01.phpt
+++ b/ext/standard/tests/strings/htmlentities01.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 1 (cp1252)
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 --FILE--
 <?php
 	var_dump(htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, 'cp1252'));
diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index 161f02e24a..ad75766ee6 100644
--- a/ext/standard/tests/strings/htmlentities02.phpt
+++ b/ext/standard/tests/strings/htmlentities02.phpt
@@ -10,7 +10,7 @@ if (!$result) {
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 --FILE--
 <?php
 	setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 'fr_FR@euro');
diff --git a/ext/standard/tests/strings/htmlentities03.phpt b/ext/standard/tests/strings/htmlentities03.phpt
index 9f40ff3bc6..6b00e8b48c 100644
--- a/ext/standard/tests/strings/htmlentities03.phpt
+++ b/ext/standard/tests/strings/htmlentities03.phpt
@@ -10,7 +10,7 @@ if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 --FILE--
 <?php
 	setlocale( LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1");
diff --git a/ext/standard/tests/strings/htmlentities04.phpt b/ext/standard/tests/strings/htmlentities04.phpt
index 2501ff092c..066972ea42 100644
--- a/ext/standard/tests/strings/htmlentities04.phpt
+++ b/ext/standard/tests/strings/htmlentities04.phpt
@@ -10,7 +10,7 @@ if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) == 0) {
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 --FILE--
 <?php
 	setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );
diff --git a/ext/standard/tests/strings/htmlentities05.phpt b/ext/standard/tests/strings/htmlentities05.phpt
index 7f8adb6b99..f65a1a435a 100644
--- a/ext/standard/tests/strings/htmlentities05.phpt
+++ b/ext/standard/tests/strings/htmlentities05.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 5 (mbstring / cp1252)
 --INI--
 output_handler=
-mbstring.internal_encoding=cp1252
+internal_encoding=cp1252
 --SKIPIF--
 <?php
 	extension_loaded("mbstring") or die("skip mbstring not available\n");
diff --git a/ext/standard/tests/strings/htmlentities06.phpt b/ext/standard/tests/strings/htmlentities06.phpt
index 4cc68d233f..5027c0c193 100644
--- a/ext/standard/tests/strings/htmlentities06.phpt
+++ b/ext/standard/tests/strings/htmlentities06.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 6 (mbstring / ISO-8859-15)
 --INI--
 output_handler=
-mbstring.internal_encoding=ISO-8859-15
+internal_encoding=ISO-8859-15
 --SKIPIF--
 <?php
 	extension_loaded("mbstring") or die("skip mbstring not available\n");
diff --git a/ext/standard/tests/strings/htmlentities07.phpt b/ext/standard/tests/strings/htmlentities07.phpt
index 144734c12e..fe43d32d49 100644
--- a/ext/standard/tests/strings/htmlentities07.phpt
+++ b/ext/standard/tests/strings/htmlentities07.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 7 (mbstring / ISO-8859-1)
 --INI--
 output_handler=
-mbstring.internal_encoding=ISO-8859-1
+internal_encoding=ISO-8859-1
 --SKIPIF--
 <?php
 	extension_loaded("mbstring") or die("skip mbstring not available\n");
diff --git a/ext/standard/tests/strings/htmlentities08.phpt b/ext/standard/tests/strings/htmlentities08.phpt
index 1f6dc90fcb..465e362837 100644
--- a/ext/standard/tests/strings/htmlentities08.phpt
+++ b/ext/standard/tests/strings/htmlentities08.phpt
@@ -3,7 +3,7 @@ htmlentities() test 8 (mbstring / EUC-JP)
 --INI--
 output_handler=
 error_reporting=~E_STRICT
-mbstring.internal_encoding=EUC-JP
+internal_encoding=EUC-JP
 --SKIPIF--
 <?php
 	extension_loaded("mbstring") or die("skip mbstring not available\n");
diff --git a/ext/standard/tests/strings/htmlentities09.phpt b/ext/standard/tests/strings/htmlentities09.phpt
index c80a77d40f..d1714ebded 100644
--- a/ext/standard/tests/strings/htmlentities09.phpt
+++ b/ext/standard/tests/strings/htmlentities09.phpt
@@ -3,7 +3,7 @@ htmlentities() test 9 (mbstring / Shift_JIS)
 --INI--
 output_handler=
 error_reporting=~E_STRICT
-mbstring.internal_encoding=Shift_JIS
+internal_encoding=Shift_JIS
 --SKIPIF--
 <?php
 	extension_loaded("mbstring") or die("skip mbstring not available\n");
diff --git a/ext/standard/tests/strings/htmlentities10.phpt b/ext/standard/tests/strings/htmlentities10.phpt
index ee5099cf34..5f6d8ffc57 100644
--- a/ext/standard/tests/strings/htmlentities10.phpt
+++ b/ext/standard/tests/strings/htmlentities10.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 10 (default_charset / cp1252)
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 default_charset=cp1252
 --FILE--
 <?php
diff --git a/ext/standard/tests/strings/htmlentities11.phpt b/ext/standard/tests/strings/htmlentities11.phpt
index 62b6aec7c8..0ee1044c13 100644
--- a/ext/standard/tests/strings/htmlentities11.phpt
+++ b/ext/standard/tests/strings/htmlentities11.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 11 (default_charset / ISO-8859-15)
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 default_charset=ISO-8859-15
 --FILE--
 <?php
diff --git a/ext/standard/tests/strings/htmlentities12.phpt b/ext/standard/tests/strings/htmlentities12.phpt
index 826706680d..c3cb7b6440 100644
--- a/ext/standard/tests/strings/htmlentities12.phpt
+++ b/ext/standard/tests/strings/htmlentities12.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 12 (default_charset / ISO-8859-1)
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 default_charset=ISO-8859-1
 --FILE--
 <?php
diff --git a/ext/standard/tests/strings/htmlentities13.phpt b/ext/standard/tests/strings/htmlentities13.phpt
index 769c77fde9..5113d7d161 100644
--- a/ext/standard/tests/strings/htmlentities13.phpt
+++ b/ext/standard/tests/strings/htmlentities13.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 13 (default_charset / EUC-JP)
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 default_charset=EUC-JP
 filter.default=unsafe_raw
 --FILE--
diff --git a/ext/standard/tests/strings/htmlentities14.phpt b/ext/standard/tests/strings/htmlentities14.phpt
index 0928f08488..1cf2769df7 100644
--- a/ext/standard/tests/strings/htmlentities14.phpt
+++ b/ext/standard/tests/strings/htmlentities14.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 14 (default_charset / Shift_JIS)
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 default_charset=Shift_JIS
 filter.default=unsafe_raw
 --FILE--
diff --git a/ext/standard/tests/strings/htmlentities15.phpt b/ext/standard/tests/strings/htmlentities15.phpt
index e5729f9976..4144d62e96 100644
--- a/ext/standard/tests/strings/htmlentities15.phpt
+++ b/ext/standard/tests/strings/htmlentities15.phpt
@@ -3,7 +3,7 @@ htmlentities() test 15 (setlocale / KOI8-R)
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=pass
+internal_encoding=pass
 --SKIPIF--
 <?php
 $result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
diff --git a/ext/standard/tests/strings/htmlentities16.phpt b/ext/standard/tests/strings/htmlentities16.phpt
index ed54670520..b253f4b1b2 100644
--- a/ext/standard/tests/strings/htmlentities16.phpt
+++ b/ext/standard/tests/strings/htmlentities16.phpt
@@ -2,7 +2,7 @@
 htmlentities() test 16 (mbstring / cp1251)
 --INI--
 output_handler=
-mbstring.internal_encoding=cp1251
+internal_encoding=cp1251
 --SKIPIF--
 <?php
 	extension_loaded("mbstring") or die("skip mbstring not available\n");
diff --git a/tests/basic/029.phpt b/tests/basic/029.phpt
index 6d95c0771d..21d9082cff 100644
--- a/tests/basic/029.phpt
+++ b/tests/basic/029.phpt
@@ -9,8 +9,8 @@ if (!extension_loaded("mbstring")) {
 --INI--
 file_uploads=1
 mbstring.encoding_translation=1
-mbstring.http_input=Shift_JIS
-mbstring.internal_encoding=UTF-8
+input_encoding=Shift_JIS
+internal_encoding=UTF-8
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737