summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2010-12-25 01:42:45 +0000
committerFelipe Pena <felipe@php.net>2010-12-25 01:42:45 +0000
commitd88a9a3f80e242f303c00333fa8c7a68e2a8fbf8 (patch)
tree16a41c43c6af1491b444b6dd6042eba70e1eac25
parent44d0082823d6165cfdb068aae086bc97e1b037b4 (diff)
downloadphp-git-d88a9a3f80e242f303c00333fa8c7a68e2a8fbf8.tar.gz
- Fixed INI test section
-rwxr-xr-xZend/tests/multibyte/multibyte_encoding_001.phpt2
-rwxr-xr-xZend/tests/multibyte/multibyte_encoding_002.phpt4
-rwxr-xr-xZend/tests/multibyte/multibyte_encoding_003.phptbin465 -> 471 bytes
-rw-r--r--Zend/tests/multibyte/multibyte_encoding_004.phpt4
-rw-r--r--Zend/tests/multibyte/multibyte_encoding_005.phpt4
-rw-r--r--Zend/tests/multibyte/multibyte_encoding_006.phptbin624 -> 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 8c8a1b855e..38aa80a40a 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 abf7aef07d..f5e13a9b35 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 08a4d2096c..0f873dd07c 100755
--- a/Zend/tests/multibyte/multibyte_encoding_003.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_003.phpt
Binary files differ
diff --git a/Zend/tests/multibyte/multibyte_encoding_004.phpt b/Zend/tests/multibyte/multibyte_encoding_004.phpt
index 09452113f3..6d121d6680 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 bf88e7ddac..6fee687483 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 680bf00f76..b87b434fe4 100644
--- a/Zend/tests/multibyte/multibyte_encoding_006.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_006.phpt
Binary files differ