Merge branch 'PHP-7.4'

2024-11-23 09:54:15 +08:00 · 2019-04-17 14:25:34 +02:00 · 2019-04-17 14:25:34 +02:00 · f9e918b17d
commit f9e918b17d
parent 1d53d6df7e 487d4d07b4
49 changed files with 43 additions and 70 deletions
--- 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('', ''));
--- 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--
--- 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])
--- 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');
--- 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

--- 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--
--- 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");
--- 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");
--- 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");
--- 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");
--- 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");
--- 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");
--- 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
--- 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
--- 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
--- 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
--- 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");
--- 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");
--- 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
--- 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) {
--- 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]])
--- 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 —\Ž\”\($ˆø<CB86>”)
--- 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("テスト"));
--- 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("テスト"));
--- 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("テスト"));
--- 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
--- 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");
--- 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");
--- 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");
--- 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");
--- 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__));
--- 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__));
--- 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'));
--- 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');
--- 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");
--- 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" );
--- 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");
--- 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");
--- 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");
--- 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");
--- 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");
--- 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
--- 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
--- 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
--- 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--
--- 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--
--- 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");
--- 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");
--- 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