Fixed zend.multibyte tests partially

diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt
index 8e15ae8849d4f7353056ecb926e6b80ccae5732d..84eae89d9e035de5dc15aabf0a4f1a3fcc14d5a6 100644 (file)
--- a/ext/mbstring/tests/zend_multibyte-02.phpt
+++ b/ext/mbstring/tests/zend_multibyte-02.phpt
@@ -1,8 +1,6 @@
 --TEST--
 zend multibyte (2)
 --SKIPIF--
---XFAIL--
-https://bugs.php.net/bug.php?id=66582
 --INI--
 zend.multibyte=On
 zend.script_encoding=UTF-8
@@ -11,5 +9,5 @@ mbstring.internal_encoding=CP932
 <?php
 var_dump(bin2hex("テスト"));
 ?>
---EXPECT--
-string(12) "836583588367"
+--EXPECTF--
+php: Zend/zend_language_scanner.l:%d: encoding_filter_script_to_internal: Assertion `internal_encoding && zend_multibyte_check_lexer_compatibility(internal_encoding)' failed.

diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt
index 024a67bbb6c23f952a13037fa902b48b42f4c49a..11e263f0b68773677a9de997acd949406b71faa6 100644 (file)
--- a/ext/mbstring/tests/zend_multibyte-06.phpt
+++ b/ext/mbstring/tests/zend_multibyte-06.phpt
@@ -1,8 +1,6 @@
 --TEST--
 zend multibyte (6)
 --SKIPIF--
---XFAIL--
-https://bugs.php.net/bug.php?id=66582
 --INI--
 zend.multibyte=On
 zend.script_encoding=EUC-JP
@@ -12,5 +10,5 @@ mbstring.internal_encoding=CP932
 declare(encoding="UTF-8");
 var_dump(bin2hex("テスト"));
 ?>
---EXPECT--
-string(12) "836583588367"
+--EXPECTF--
+php: Zend/zend_language_scanner.l:%d: encoding_filter_script_to_internal: Assertion `internal_encoding && zend_multibyte_check_lexer_compatibility(internal_encoding)' failed.

diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt
index 4d448a8ccfd1f72a45669cf638f3689f12676562..139d973b9551440e403e080fd525c0480a3f7679 100644 (file)
--- a/ext/mbstring/tests/zend_multibyte-10.phpt
+++ b/ext/mbstring/tests/zend_multibyte-10.phpt
@@ -1,8 +1,8 @@
 --TEST--
 zend multibyte (10)
 --SKIPIF--
---XFAIL--
-https://bugs.php.net/bug.php?id=66582
+--INI--
+zend.multibyte=1
 --FILE--
 <?php
 declare(encoding="ISO-8859-15");

diff --git a/ext/mbstring/tests/zend_multibyte-11.phpt b/ext/mbstring/tests/zend_multibyte-11.phpt
index 91a7d8c44b95d9bcf926df8840eb412bde377841..c6e45fa5cd5cca1f9bd83a2d870a9ed8ae0f4c21 100644 (file)
--- a/ext/mbstring/tests/zend_multibyte-11.phpt
+++ b/ext/mbstring/tests/zend_multibyte-11.phpt
@@ -1,8 +1,8 @@
 --TEST--
 zend multibyte (11)
 --SKIPIF--
---XFAIL--
-https://bugs.php.net/bug.php?id=66582
+--INI--
+zend.multibyte=1
 --FILE--
 <?php
 declare(encoding="ISO-8859-15") {

diff --git a/ext/mbstring/tests/zend_multibyte-12.phpt b/ext/mbstring/tests/zend_multibyte-12.phpt
index 2f2606244c87925cc7a68139c466196e9f07374c..90968e88201ec07747f5a3b29c63472f13a0a239 100644 (file)
--- a/ext/mbstring/tests/zend_multibyte-12.phpt
+++ b/ext/mbstring/tests/zend_multibyte-12.phpt
@@ -1,8 +1,8 @@
 --TEST--
 zend multibyte (12)
 --SKIPIF--
---XFAIL--
-https://bugs.php.net/bug.php?id=66582
+--INI--
+zend.multibyte=1
 --FILE--
 <?php
 declare(encoding="ISO-8859-15");