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

- 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 db628ad6cd..dc244b72aa 100644
--- 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 87f250afa6..1e835c2c67 100644
--- 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 af3318b644..f941ceb66b 100644
--- 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 224ce88c72..d4dbdd6d58 100644
--- 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 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');