From d88a9a3f80e242f303c00333fa8c7a68e2a8fbf8 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Sat, 25 Dec 2010 01:42:45 +0000
Subject: [PATCH] - Fixed INI test section

---
 .../tests/multibyte/multibyte_encoding_001.phpt |   2 +-
 .../tests/multibyte/multibyte_encoding_002.phpt |   4 ++--
 .../tests/multibyte/multibyte_encoding_003.phpt | Bin 465 -> 471 bytes
 .../tests/multibyte/multibyte_encoding_004.phpt |   4 ++--
 .../tests/multibyte/multibyte_encoding_005.phpt |   4 ++--
 .../tests/multibyte/multibyte_encoding_006.phpt | Bin 624 -> 629 bytes
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Zend/tests/multibyte/multibyte_encoding_001.phpt b/Zend/tests/multibyte/multibyte_encoding_001.phpt
index 8c8a1b855e6..38aa80a40a4 100755
--- 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 abf7aef07d4..f5e13a9b35f 100755
--- 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
GIT binary patch
delta 18
Zcmcb}e4TlMJ8M;HUW(pE_bx_8E&xG$1^55}

delta 10
Rcmcc4e35yA`$nHGMgSP71P%ZI

diff --git a/Zend/tests/multibyte/multibyte_encoding_004.phpt b/Zend/tests/multibyte/multibyte_encoding_004.phpt
index 09452113f32..6d121d66802 100644
--- 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 bf88e7ddac3..6fee687483b 100644
--- 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
GIT binary patch
delta 16
Xcmeys@|9&m8EaK)UW(qvvR{k<Jhuk=

delta 10
Rcmey$@_}VS*~aQ$i~t=p1sebW