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 6c8606536d74a554a11268ad2affea23fc879854..cf8c65bd3a41164dd9659b8b6edf8323b47b7e42 100644 (file)
--- 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 e69e4175a8f8615f6371014ce954892e1f08d663..d5473103813cbedf5958e3ed5b8a75a871c3733a 100644 (file)
--- 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 582529d54d185c56659f64a82a4f32324b90b8d0..58b98407e6a75d69f662d6798b081cd86365c0f3 100644 (file)
--- 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 8d8ef4831ea8d26451c23b08cbe9c25944527d6a..d67aedc4134defb6bc7596fc2135488d85b50bfd 100644 (file)
--- 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 aad4b0de4f0919cd101c4521c4d4d94fdc3bb911..eace49678c73e831936337493d811991a8ff82af 100644 (file)
--- 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 ab8c8df7235a98a7c7a4006f35fb23fcdfbd6364..e7d7b6dda416ce093c2f9d0ebbaf4d452f764a8f 100644 (file)
--- 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 91ab5bd507913e8c70ee3541f695996b5de3eac2..50235b2fedf7d8703b8f8bef37d6ffc5c5856f4b 100644 (file)
--- 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 62825b6efb988646f5cbde11a643a70c835396d8..d80b6daf5e232132d9ab2e3566ec530de8262643 100644 (file)
--- 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 e20b1150387f6fb9e30a2f75924d9b447a0e7260..756610cdf37780d965fa7c503f47b84de79e0b2a 100644 (file)
--- 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 c4e9886baceebb036bbd94d7c496c40d8e2bf13e..f634decb4b9d054244d7691563708bdf108e4c8f 100644 (file)
--- 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 bf8bd768a9d078365b4f5977d654f79dd422ec30..f0ab94da3a0e15f805011197618afde8a84030c0 100644 (file)
--- 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 c63724eb3262ddb8766f825c386961ac623ae87a..b211a30c6d5f91ca0be8a6ebe59a370c388a395f 100644 (file)
--- 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 00cf4af7d8477fc72de1f6704d93c2d31f5bf129..efbbfa659fcf1ff3f7bf95fefa6dd3a249577bb5 100644 (file)
--- 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 3cc9305a927ab76d3d5f7617a7ee8de70bde5ffc..60f03f91c50c2c27a2fcf5edd6ab4bb92f27bc40 100644 (file)
--- 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 5117decdc8bc53365e6a3a23b322445026f0c1dc..5168be8ae6458d46ae6742d3f53b368a67dacb98 100644 (file)
--- 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 e119da0d4a60f7136c426df025ffcee3a73acbcd..4caa8ea8404c34f0a8ab81b7d095ab2f854b7835 100644 (file)
--- 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 7aec886b75dfec3991fb2e4f4f6025f6c70611d4..732e68fa5923e6b655bf1b513e2f584d28f44dcf 100644 (file)
--- 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 2b16479994f90f72561ad8a0fa783591ad5fff8d..b8856184ebf571a487f7daa5b6cf08c52ab7f6f6 100644 (file)
--- 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 d27510b57ea0853bdeeb60ebcb021db21b70730f..0b41989429604808aed619659c83bdcdf13735eb 100644 (file)
--- 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 01742d101eeb924e65feea757dc913982b4f07d1..adf61f4959530de46a2cb3ec991fa2cb4b7fd856 100644 (file)
--- 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 d224475370d1febace74eeff1ee2c4abca215a8a..61b2fcb1c338f9fd1d33b5e37b08f783e05b6cb1 100644 (file)
--- 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 2edb91291f09b1453f176a51fbdbe2f8c9008841..ecc04af973078bcbb47411c7aade6d17becdb332 100644 (file)
--- 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 4e6802b930419592c04943ba30269528fa4b24e6..436608a89c2ae78fae7351c6b32571168056424d 100644 (file)
--- 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 2aa30ad02585ad3ce88b6d6b83a30edbe7bcf976..2e4bbe856a7e1125c4515db7b1a0a61e42f1b07f 100644 (file)
--- 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 5802cf2f21db139a28e50bee303a58765b028631..aae944de3558fba9653319a3809fcd2a2504b163 100644 (file)
--- 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 \97\\8e\\94\($\88ø\90\94)

diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt
index 6008be5a1173bbcfd6e935fce0b306ecc4c356d2..a284aca41b491e15eea8d936078b095733ddccf8 100644 (file)
--- 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 b7e13d46edcb6c529b2f1cd7faaa24c655b954ad..86b187b9c04c37415672a439a9d81903e7717a82 100644 (file)
--- 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 5cb3af347269af7d14492a2f1028366eb0785f28..fd114fda82459cd3339011d7b0af725aed68be75 100644 (file)
--- 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("\83e\83X\83g"));

diff --git a/ext/mbstring/tests/zend_multibyte-05.phpt b/ext/mbstring/tests/zend_multibyte-05.phpt
index 4d0c236b7a664bd0aeff6fb3847c0c83e10a64a6..c678123f8a286eb313599039316643cc30d35b35 100644 (file)
--- 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 c75c0b8cb2d0a9df225db566be8323ef25cb9146..8f8ac6c3b72360c500a1ca86e00a0ada0ba090cd 100644 (file)
--- 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 b81104ca3efbe20d844b09dbb4b39c089ab04acf..14fffd13287372f52c3659c970c47f59d3897a9f 100644 (file)
--- 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 1030dfdc91f71564237bc44ea933ba7c69d0dbd1..d04d99ed83c9466636efe36de5cc9269fb44c04a 100644 (file)
--- 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 17d5840e478b292917ebdb3c34b6a2aa26856b3d..4feb5926a820c230cd69823df487da799df29499 100644 (file)
--- 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 f3a18fe48186437536fd56ea40accfaef2443735..5075c5e55e7d82905dadd14c9ab079f489a7465d 100644 (file)
--- 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 36c7c5355c6fc0f327bcae4fe9b3955704a242ea..df7d03a653cba296cd5195887e4f78f6d078893f 100644 (file)
--- 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 b82615ac4abb8ec8844bdf4657fde46a00da2218..1a967facafb0ed1abfe1f9176cdb18f4d07b674c 100644 (file)
--- 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 4ab49472d1f38fd7bf9714e9c09ff7186e7fccdb..092027a7a46bbec9010db761c2d2eb5a24740486 100644 (file)
--- 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 161f02e24a5705a4eb9d9cc018718ba256662423..ad75766ee6aff5fdfce1dce2c36c410e5d34fdfb 100644 (file)
--- 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 9f40ff3bc6f63da6adbab1a7e01dbda35b51160a..6b00e8b48c394d43c275a6e85fc25cab4294e6b6 100644 (file)
--- 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 2501ff092ced412741197ffe9c0d79cbf40b05e6..066972ea42607b99c7888c238d5fe2944f5cc3e0 100644 (file)
--- 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 7f8adb6b99ef6f2d48a0e0b4dcc604abdfc414fa..f65a1a435a00e536b836390390ff50994eb57c45 100644 (file)
--- 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 4cc68d233f518a9c18a8fb141ddbe40319c71849..5027c0c19393291770905eecb2ca25d1ff3ad019 100644 (file)
--- 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 144734c12e6cc1ea6fcf350e80796e2c147f7eea..fe43d32d49f178c64c41b11553b50e6adb58ea5b 100644 (file)
--- 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 1f6dc90fcb5a4517b0cb8b09d745b52b06c06f82..465e36283792c0f179de462d4ee4cb29e4b22337 100644 (file)
--- 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 c80a77d40f39ddae07ff274f2722a3e9006e09fd..d1714ebded2d2e62017342fc8a0bbcf614187ce4 100644 (file)
--- 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 ee5099cf3416ae1db9b3ddec9903295234f0bc78..5f6d8ffc57bb5fd988a5ed6590f6622ffa735b0b 100644 (file)
--- 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 62b6aec7c8e36f73186418184a2d8dd8e18b0393..0ee1044c135d42027a88512135e39213d4c9d183 100644 (file)
--- 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 826706680d4f06cc528876168709fdc63ab8af0f..c3cb7b6440b6a59122473e6e1dc16865824063c3 100644 (file)
--- 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 769c77fde9c1703714c7519e423105d8c0b0abe8..5113d7d1615cac82864a856851ee100e2855a1ae 100644 (file)
--- 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 0928f08488c94fc12945dc43b001c42f333e2bc4..1cf2769df7fb503f05ee318b9c0b09af49f0d807 100644 (file)
--- 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 e5729f9976ab4fe8ca07eeff3dc84ecb19cafc5b..4144d62e9692016457efd916afcb6811f716f954 100644 (file)
--- 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 ed54670520361a6b18422957755206bd48887ea6..b253f4b1b2e5887e23ad6332f87715be42eb4459 100644 (file)
--- 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 6d95c0771d733351b0c9b86810ce3c50c366eb16..21d9082cffb8bae50f2e5b7159fc88e68bb8d382 100644 (file)
--- 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