- Fix tests.

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-07.phpt b/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
index db628ad6cdacfaa612897390fc36c0b62e30d5ee..dc244b72aa20f7eaa8b4e6fa6227257a5f6dcdb5 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
@@ -4,7 +4,7 @@ mb_output_handler() patterns
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 mbstring.internal_encoding=UTF-8
-mbstring.http_output_content_type_regex=html
+mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
 mb_http_output("EUC-JP");

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-08.phpt b/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
index 87f250afa61c820577e83c549386bf94bfe15113..1e835c2c67184c828e10562f736f5574c08b0157 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
@@ -4,7 +4,7 @@ mb_output_handler() patterns
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 mbstring.internal_encoding=UTF-8
-mbstring.http_output_content_type_regex=html
+mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
 mb_http_output("EUC-JP");

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-09.phpt b/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
index af3318b644e574c50e0bb714a59f330acf0f2587..f941ceb66be4494c501d47170bd7b1d5ed08f113 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
@@ -4,7 +4,7 @@ mb_output_handler() patterns
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 mbstring.internal_encoding=UTF-8
-mbstring.http_output_content_type_regex=html
+mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
 mb_http_output("EUC-JP");

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-10.phpt b/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
index 224ce88c7266412a2de17f3d72846f94c4f9e8b9..d4dbdd6d5877b4abfe02a338c7c31165d3cf159f 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
@@ -4,7 +4,7 @@ mb_output_handler() patterns
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 mbstring.internal_encoding=UTF-8
-mbstring.http_output_content_type_regex=html
+mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
 mb_http_output("EUC-JP");

diff --git a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
index 151df66a5fff8eb432292df7d265dac0ad0b3b74..b7d71f9d23dbee04dbfdf4fc262878f3f62bbd83 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
+++ b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
@@ -1,14 +1,14 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex alteration in runtime (1)
+mb_output_handler() and mbstring.http_output_conv_mimetypes alteration in runtime (1)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 mbstring.internal_encoding=UTF-8
-mbstring.http_output_content_type_regex=plain
+mbstring.http_output_conv_mimetypes=plain
 --FILE--
 <?php
 mb_http_output("EUC-JP");
-ini_set('mbstring.http_output_content_type_regex', 'text');
+ini_set('mbstring.http_output_conv_mimetypes', 'text');
 header("Content-Type: text/html");
 ob_start();
 ob_start('mb_output_handler');

diff --git a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
index 2bf8f14c746f9f2c280650540c2bedbe46db64ec..d8c21f406fb01ef3ca9908458f1ef9395fc37ebf 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
+++ b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
@@ -1,14 +1,14 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex alteration in runtime (2)
+mb_output_handler() and mbstring.http_output_conv_mimetypes alteration in runtime (2)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 mbstring.internal_encoding=UTF-8
-mbstring.http_output_content_type_regex=html
+mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php
 mb_http_output("EUC-JP");
-ini_set('mbstring.http_output_content_type_regex', 'application');
+ini_set('mbstring.http_output_conv_mimetypes', 'application');
 header("Content-Type: text/html");
 ob_start();
 ob_start('mb_output_handler');