diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2014-01-29 15:56:13 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2014-01-29 15:56:13 +0900 |
| commit | 3828b5d83d7fb8b1aea7871e1b3f151aeccb39d0 (patch) | |
| tree | 036891e50f733fc9a18df64baf2d6bd115041fec | |
| parent | 6edc84fcdfc8e76507bc73122310fff4b6170b88 (diff) | |
| parent | a6ac64bdbbf9e299377d0e9a063f496e7fcdc99a (diff) | |
| download | php-git-3828b5d83d7fb8b1aea7871e1b3f151aeccb39d0.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed zend.multibyte tests partially
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-02.phpt | 6 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-06.phpt | 6 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-10.phpt | 4 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-11.phpt | 4 | ||||
| -rw-r--r-- | ext/mbstring/tests/zend_multibyte-12.phpt | 4 |
5 files changed, 10 insertions, 14 deletions
diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt index 8e15ae8849..84eae89d9e 100644 --- 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 024a67bbb6..11e263f0b6 100644 --- 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 4d448a8ccf..139d973b95 100644 --- 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 91a7d8c44b..c6e45fa5cd 100644 --- 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 2f2606244c..90968e8820 100644 --- 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"); |