felipe Sat, 25 Dec 2010 01:42:45 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=306629
Log:
- Fixed INI test section
Changed paths:
U php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_001.phpt
U php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_002.phpt
U php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_003.phpt
U php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_004.phpt
U php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_005.phpt
U php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_006.phpt
Modified: php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_001.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_001.phpt
2010-12-25 00:20:48 UTC (rev 306628)
+++ php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_001.phpt
2010-12-25 01:42:45 UTC (rev 306629)
@@ -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")) {
Modified: php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_002.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_002.phpt
2010-12-25 00:20:48 UTC (rev 306628)
+++ php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_002.phpt
2010-12-25 01:42:45 UTC (rev 306629)
@@ -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 @@
?>
--INI--
zend.multibyte=1
-mbstring.internal_encoding=iso-8859-1
+zend.internal_encoding=iso-8859-1
--FILE--
<?php
print "Hello World\n";
Modified: php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_003.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_003.phpt
2010-12-25 00:20:48 UTC (rev 306628)
+++ php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_003.phpt
2010-12-25 01:42:45 UTC (rev 306629)
@@ -2,7 +2,7 @@
Zend Multibyte and UTF-16 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")) {
@@ -20,4 +20,4 @@
--EXPECT--
Hello World
-===DONE===
\ No newline at end of file
+===DONE===
Modified: php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_004.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_004.phpt
2010-12-25 00:20:48 UTC (rev 306628)
+++ php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_004.phpt
2010-12-25 01:42:45 UTC (rev 306629)
@@ -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 @@
?>
--INI--
zend.multibyte=1
-mbstring.script_encoding=Shift_JIS
+zend.script_encoding=Shift_JIS
mbstring.internal_encoding=Shift_JIS
--FILE--
<?php
Modified: php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_005.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_005.phpt
2010-12-25 00:20:48 UTC (rev 306628)
+++ php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_005.phpt
2010-12-25 01:42:45 UTC (rev 306629)
@@ -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 @@
--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
Modified: php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_006.phpt
===================================================================
(Binary files differ)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
