- Fixed INI test section

diff --git a/Zend/tests/multibyte/multibyte_encoding_001.phpt b/Zend/tests/multibyte/multibyte_encoding_001.phpt
index 8c8a1b855e68c2e7fed3bef9385b3bae00219ce8..38aa80a40a4266b7a56da91f0af5d73d9712e71e 100755 (executable)
--- a/Zend/tests/multibyte/multibyte_encoding_001.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_001.phpt
@@ -2,7 +2,7 @@
 Zend Multibyte and ShiftJIS
 --SKIPIF--
 <?php
-if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
+if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
   die("skip Requires configure --enable-zend-multibyte option");
 }
 if (!extension_loaded("mbstring")) {

diff --git a/Zend/tests/multibyte/multibyte_encoding_002.phpt b/Zend/tests/multibyte/multibyte_encoding_002.phpt
index abf7aef07d46a3c9d45bd0fdd50dd686b5af4fac..f5e13a9b35ff0e9aa954a937f0d3c4ad1ed90a13 100755 (executable)
--- a/Zend/tests/multibyte/multibyte_encoding_002.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_002.phpt
@@ -2,7 +2,7 @@
 Zend Multibyte and UTF-8 BOM
 --SKIPIF--
 <?php
-if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
+if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
   die("skip Requires configure --enable-zend-multibyte option");
 }
 if (!extension_loaded("mbstring")) {
@@ -11,7 +11,7 @@ if (!extension_loaded("mbstring")) {
 ?>
 --INI--
 zend.multibyte=1
-mbstring.internal_encoding=iso-8859-1
+zend.internal_encoding=iso-8859-1
 --FILE--
 <?php
 print "Hello World\n";

diff --git a/Zend/tests/multibyte/multibyte_encoding_003.phpt b/Zend/tests/multibyte/multibyte_encoding_003.phpt
index 08a4d2096c9c9cb844b5e22e6a42794334616614..0f873dd07cd13ec3e9f9877d41056d8604d459e7 100755 (executable)
Binary files a/Zend/tests/multibyte/multibyte_encoding_003.phpt and b/Zend/tests/multibyte/multibyte_encoding_003.phpt differ

diff --git a/Zend/tests/multibyte/multibyte_encoding_004.phpt b/Zend/tests/multibyte/multibyte_encoding_004.phpt
index 09452113f32669864746ce43af34f8903dfd07c3..6d121d668020098e666cfca48fdc2e614f907f55 100644 (file)
--- a/Zend/tests/multibyte/multibyte_encoding_004.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_004.phpt
@@ -2,7 +2,7 @@
 test for mbstring script_encoding for flex unsafe encoding (Shift_JIS)
 --SKIPIF--
 <?php
-if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
+if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
   die("skip Requires configure --enable-zend-multibyte option");
 }
 if (!extension_loaded("mbstring")) {
@@ -11,7 +11,7 @@ if (!extension_loaded("mbstring")) {
 ?>
 --INI--
 zend.multibyte=1
-mbstring.script_encoding=Shift_JIS
+zend.script_encoding=Shift_JIS
 mbstring.internal_encoding=Shift_JIS
 --FILE--
 <?php

diff --git a/Zend/tests/multibyte/multibyte_encoding_005.phpt b/Zend/tests/multibyte/multibyte_encoding_005.phpt
index bf88e7ddac3a59246474e639e2746abaed2549aa..6fee687483bbe12b8bb552e46e150e8f89f3d1d2 100644 (file)
--- a/Zend/tests/multibyte/multibyte_encoding_005.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_005.phpt
@@ -2,7 +2,7 @@
 encoding conversion from script encoding into internal encoding
 --SKIPIF--
 <?php
-if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
+if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
   die("skip Requires configure --enable-zend-multibyte option");
 }
 if (!extension_loaded("mbstring")) {
@@ -12,7 +12,7 @@ if (!extension_loaded("mbstring")) {
 --INI--
 zend.multibyte=1
 mbstring.encoding_translation = On
-mbstring.script_encoding=Shift_JIS
+zend.script_encoding=Shift_JIS
 mbstring.internal_encoding=UTF-8
 --FILE--
 <?php

diff --git a/Zend/tests/multibyte/multibyte_encoding_006.phpt b/Zend/tests/multibyte/multibyte_encoding_006.phpt
index 680bf00f76120e849ba23a26001663a71e6ce6ed..b87b434fe440b1bd422b57e5fec7e3d20dae85e5 100644 (file)
Binary files a/Zend/tests/multibyte/multibyte_encoding_006.phpt and b/Zend/tests/multibyte/multibyte_encoding_006.phpt differ