- MFH: Fix tests.

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-01.phpt b/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
index f9b993041ee4137f51afc1bb48cb6d736a0225a6..62825b6efb988646f5cbde11a643a70c835396d8 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-01.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (1)
+mb_output_handler() and mbstring.http_output_conv_mimetypes (1)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-02.phpt b/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
index 1d93f1718509c9857e14400ae2a883fad8c03333..e20b1150387f6fb9e30a2f75924d9b447a0e7260 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-02.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (2)
+mb_output_handler() and mbstring.http_output_conv_mimetypes (2)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-03.phpt b/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
index c0f7b8a80ed33bfe301702201a4fa610a90a92b3..c4e9886baceebb036bbd94d7c496c40d8e2bf13e 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-03.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (3)
+mb_output_handler() and mbstring.http_output_conv_mimetypes (3)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-04.phpt b/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
index 62d5396fe78918840b8011a522b99c6439f0f763..bf8bd768a9d078365b4f5977d654f79dd422ec30 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-04.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (4)
+mb_output_handler() and mbstring.http_output_conv_mimetypes (4)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-05.phpt b/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
index 584347d86db3cd64031dd9860b777c15aba27daf..c63724eb3262ddb8766f825c386961ac623ae87a 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-05.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (5)
+mb_output_handler() and mbstring.http_output_conv_mimetypes (5)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-06.phpt b/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
index d528d679559d82044d283dbc19d5b1e833ff2625..00cf4af7d8477fc72de1f6704d93c2d31f5bf129 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-06.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (6)
+mb_output_handler() and mbstring.http_output_conv_mimetypes (6)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-07.phpt b/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
index 75135531689a402ab77525009cbb562e0158f19d..3cc9305a927ab76d3d5f7617a7ee8de70bde5ffc 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-07.phpt
@@ -1,10 +1,10 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (7)
+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_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 8709b534e0e5755c77d5274431b0fa658deb1a10..5117decdc8bc53365e6a3a23b322445026f0c1dc 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-08.phpt
@@ -1,10 +1,10 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (8)
+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_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 d79f786f5bc1d8c7745ee48b5ad46cd80ca085af..e119da0d4a60f7136c426df025ffcee3a73acbcd 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-09.phpt
@@ -1,10 +1,10 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (9)
+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_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 6b71a8f4d7e6305d5807a91a37e272a797888656..7aec886b75dfec3991fb2e4f4f6025f6c70611d4 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-10.phpt
@@ -1,10 +1,10 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (10)
+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_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-11.phpt b/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
index 073d4c558151d5cfed86f5889b550fcd4df78f0c..2b16479994f90f72561ad8a0fa783591ad5fff8d 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (11)
+mb_output_handler() and mbstring.http_output_conv_mimetypes (11)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_output_handler_pattern-12.phpt b/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
index a8c3fafbff6871155dfc812646b92627c66d36dc..d27510b57ea0853bdeeb60ebcb021db21b70730f 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
+++ b/ext/mbstring/tests/mb_output_handler_pattern-12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_output_handler() and mbstring.http_output_content_type_regex (12)
+mb_output_handler() and mbstring.http_output_conv_mimetypes (12)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--

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');