From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Thu, 24 Jul 2008 13:49:39 +0000 (+0000)
Subject: - MFH: Fix tests.
X-Git-Tag: php-5.3.0alpha1~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=850449568e23768b6242009b9170af62cec7b1e8;p=php

- 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 f9b993041e..62825b6efb 100644
--- 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 1d93f17185..e20b115038 100644
--- 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 c0f7b8a80e..c4e9886bac 100644
--- 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 62d5396fe7..bf8bd768a9 100644
--- 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 584347d86d..c63724eb32 100644
--- 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 d528d67955..00cf4af7d8 100644
--- 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 7513553168..3cc9305a92 100644
--- 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 8709b534e0..5117decdc8 100644
--- 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 d79f786f5b..e119da0d4a 100644
--- 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 6b71a8f4d7..7aec886b75 100644
--- 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 073d4c5581..2b16479994 100644
--- 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 a8c3fafbff..d27510b57e 100644
--- 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 151df66a5f..b7d71f9d23 100644
--- 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 2bf8f14c74..d8c21f406f 100644
--- 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');