diff options
Diffstat (limited to 'ext/mbstring/tests')
44 files changed, 44 insertions, 44 deletions
diff --git a/ext/mbstring/tests/bug40685.phpt b/ext/mbstring/tests/bug40685.phpt index 1a673e5d15..9434158106 100644 --- a/ext/mbstring/tests/bug40685.phpt +++ b/ext/mbstring/tests/bug40685.phpt @@ -14,7 +14,7 @@ var_dump(mb_decode_numericentity('=', $map, 'UTF-8')); var_dump(mb_decode_numericentity('=', $map, 'UTF-8')); var_dump(mb_decode_numericentity('=', $map, 'UTF-8')); ?> ---EXPECTF-- +--EXPECT-- string(1) "&" string(3) "&&&" string(2) "&#" diff --git a/ext/mbstring/tests/bug52931.phpt b/ext/mbstring/tests/bug52931.phpt index 72debf7d05..ab8c8df723 100644 --- a/ext/mbstring/tests/bug52931.phpt +++ b/ext/mbstring/tests/bug52931.phpt @@ -17,7 +17,7 @@ var_dump(strripos($string, '</body>')); var_dump(mb_strripos($string, '</body>')); ?> ---EXPECTF-- +--EXPECT-- Deprecated: The mbstring.func_overload directive is deprecated in Unknown on line 0 int(27) int(27) diff --git a/ext/mbstring/tests/bug52981.phpt b/ext/mbstring/tests/bug52981.phpt index 7dce14a7ad..f6be08bf33 100644 --- a/ext/mbstring/tests/bug52981.phpt +++ b/ext/mbstring/tests/bug52981.phpt @@ -17,7 +17,7 @@ test("\xF0\x90\x90\xB8");// U+10438 DESERET SMALL LETTER H (added in 3.1.0, Marc // not OK test("\xE2\xB0\xB0"); // U+2C30 GLAGOLITIC SMALL LETTER AZU (added in 4.1.0, March 2005) test("\xD4\xA5"); // U+0525 CYRILLIC SMALL LETTER PE WITH DESCENDER (added in 5.2.0, October 2009) ---EXPECTF-- +--EXPECT-- f0 90 90 90 e2 b0 80 d4 a4 diff --git a/ext/mbstring/tests/bug66797.phpt b/ext/mbstring/tests/bug66797.phpt index df9e789be6..3709dc2bb2 100644 --- a/ext/mbstring/tests/bug66797.phpt +++ b/ext/mbstring/tests/bug66797.phpt @@ -15,7 +15,7 @@ var_dump( ); ?> ==DONE== ---EXPECTF-- +--EXPECT-- string(3) "bar" string(3) "bar" string(0) "" diff --git a/ext/mbstring/tests/bug73532.phpt b/ext/mbstring/tests/bug73532.phpt index 8173a20f68..87689d450a 100644 --- a/ext/mbstring/tests/bug73532.phpt +++ b/ext/mbstring/tests/bug73532.phpt @@ -6,5 +6,5 @@ Bug #73532 (Null pointer dereference in mb_eregi) <?php var_dump(mb_eregi("a", "\xf5")); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/ext/mbstring/tests/mb_chr_ord.phpt b/ext/mbstring/tests/mb_chr_ord.phpt index 153699b1b0..f2d42fa682 100644 --- a/ext/mbstring/tests/mb_chr_ord.phpt +++ b/ext/mbstring/tests/mb_chr_ord.phpt @@ -16,7 +16,7 @@ for($ch = 1; $ch < 80000; $ch++) { } } echo 'OK'; ---EXPECTF-- +--EXPECT-- ERROR(55296) ERROR(55297) ERROR(55298) diff --git a/ext/mbstring/tests/mb_convert_encoding_array.phpt b/ext/mbstring/tests/mb_convert_encoding_array.phpt index 5bb78df028..b41c717873 100644 --- a/ext/mbstring/tests/mb_convert_encoding_array.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_array.phpt @@ -70,7 +70,7 @@ var_dump(base64_encode_array(mb_convert_encoding($euc_jp_string, 'UTF-8', 'EUC-J echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_convert_encoding() : array functionality *** -- Convert to JIS -- diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt index 0060a71808..19626795eb 100644 --- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt @@ -58,7 +58,7 @@ var_dump(base64_encode(mb_convert_encoding($euc_jp_string, 'UTF-8', 'EUC-JP'))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_convert_encoding() : basic functionality *** -- Convert to JIS -- diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt index 0487a194f2..4aa1323adb 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt @@ -46,7 +46,7 @@ foreach ($nonEnglish as $lang => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : basic *** Language: English diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt index cd52fa526d..3e05b77611 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt @@ -41,7 +41,7 @@ foreach ($inputs as $lang => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : basic2 *** Language: SJIS diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt index b2f0c8b7d1..f43717327c 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt @@ -41,7 +41,7 @@ foreach ($inputs as $lang => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : basic2 *** Language: SJIS diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt index 668ae8bfea..de2a848172 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt @@ -37,7 +37,7 @@ foreach ($linefeeds as $linefeed) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : usage variations *** -- Iteration 1 -- diff --git a/ext/mbstring/tests/mb_encode_numericentity.phpt b/ext/mbstring/tests/mb_encode_numericentity.phpt index dffb419662..51ad6c22a1 100644 --- a/ext/mbstring/tests/mb_encode_numericentity.phpt +++ b/ext/mbstring/tests/mb_encode_numericentity.phpt @@ -16,7 +16,7 @@ echo mb_encode_numericentity($str2, $convmap, "UTF-8")."\n"; $convmap = array(0xFF, 0x2FFFF, 0, 0xFFFF); echo mb_encode_numericentity('aŒbœcŠdše€fg', $convmap, "UTF-8")."\n"; ?> ---EXPECTF-- +--EXPECT-- ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ ƒΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψωϑϒϖ•…′″‾⁄℘ℑℜ™ℵ←↑→↓↔↵⇐⇑⇒⇓⇔∀∂∃∅∇∈∉∋∏∑−∗√∝∞∠∧∨∩∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌈⌉⌊⌋〈〉◊♠♣♥♦ aŒbœcŠdše€fg diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt index c035acc018..f730a637d3 100644 --- a/ext/mbstring/tests/mb_ereg_match_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt @@ -41,7 +41,7 @@ var_dump(mb_ereg_match($regex2, $string_mb)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg_match() : basic functionality *** diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt index 3077bcbd5d..7172dd2a75 100644 --- a/ext/mbstring/tests/mb_ereg_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_variation1.phpt @@ -90,7 +90,7 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** -- Iteration 1 -- diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt index 7f7d6dfc93..80c879e38c 100644 --- a/ext/mbstring/tests/mb_ereg_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_variation4.phpt @@ -73,7 +73,7 @@ function base64_encode_var_dump($regs) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** -- Iteration 1 -- diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt index c26d82ead5..0a7eb53d77 100644 --- a/ext/mbstring/tests/mb_ereg_variation5.phpt +++ b/ext/mbstring/tests/mb_ereg_variation5.phpt @@ -61,7 +61,7 @@ function base64_encode_var_dump($regs) { } } ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** ASCII String without $regs arg: int(1) diff --git a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt index eb8fea2b9b..4f9a6a6026 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt @@ -38,7 +38,7 @@ var_dump(mb_internal_encoding()); //check internal encoding is now set to UTF echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_internal_encoding() : basic functionality *** string(0) "" string(10) "ISO-8859-1" diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt index 45d361c598..4f5171623c 100644 --- a/ext/mbstring/tests/mb_split.phpt +++ b/ext/mbstring/tests/mb_split.phpt @@ -36,7 +36,7 @@ mbstring.func_overload=0 } ?> ---EXPECTF-- +--EXPECT-- bool(true) ok ok diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt index e061d8f7cc..5a2fb6cb37 100644 --- a/ext/mbstring/tests/mb_stripos_basic.phpt +++ b/ext/mbstring/tests/mb_stripos_basic.phpt @@ -97,7 +97,7 @@ foreach ($greek_needles as $needle) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_stripos() : basic functionality*** -- ASCII Strings, needle should be found -- diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt index 76a6cc5066..a9399da391 100644 --- a/ext/mbstring/tests/mb_stripos_basic2.phpt +++ b/ext/mbstring/tests/mb_stripos_basic2.phpt @@ -71,7 +71,7 @@ foreach ($greek_needles as $needle) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_stripos() : basic functionality*** -- ASCII Strings -- diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt index 6214f3069c..0e62b881b4 100644 --- a/ext/mbstring/tests/mb_strlen_basic.phpt +++ b/ext/mbstring/tests/mb_strlen_basic.phpt @@ -31,7 +31,7 @@ var_dump(mb_strlen($string_mb, 'UTF-8')); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strlen() : basic functionality*** -- ASCII String -- diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt index efa11ad47e..b254cbc712 100644 --- a/ext/mbstring/tests/mb_strlen_variation3.phpt +++ b/ext/mbstring/tests/mb_strlen_variation3.phpt @@ -104,7 +104,7 @@ foreach($encoding as $enc) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strlen() : usage variations *** -- Iteration 1: UCS-4 -- diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt index c9e1ff84fc..d63a2eaf6c 100644 --- a/ext/mbstring/tests/mb_strripos_basic.phpt +++ b/ext/mbstring/tests/mb_strripos_basic.phpt @@ -97,7 +97,7 @@ foreach ($greek_needles as $needle) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strripos() : basic functionality*** -- ASCII Strings, needle should be found -- diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt index b330323c7e..09fc7e352b 100644 --- a/ext/mbstring/tests/mb_strripos_basic2.phpt +++ b/ext/mbstring/tests/mb_strripos_basic2.phpt @@ -71,7 +71,7 @@ foreach ($greek_needles as $needle) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strripos() : basic functionality*** -- ASCII Strings -- diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt index 9de0388f43..aac9fc020f 100644 --- a/ext/mbstring/tests/mb_strrpos_basic.phpt +++ b/ext/mbstring/tests/mb_strrpos_basic.phpt @@ -40,7 +40,7 @@ var_dump(mb_strrpos($string_mb, $needle2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : basic *** -- ASCII string 1 -- diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt index cb5089679b..6205ecac48 100644 --- a/ext/mbstring/tests/mb_strrpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation5.phpt @@ -38,7 +38,7 @@ foreach ($inputs as $type => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : usage variations *** -- Double Quoted String -- diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt index 6d9cba72fe..4f727094b1 100644 --- a/ext/mbstring/tests/mb_strtolower_basic.phpt +++ b/ext/mbstring/tests/mb_strtolower_basic.phpt @@ -45,7 +45,7 @@ if ($mb == $greek_lower) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtolower() : basic functionality*** -- ASCII String -- diff --git a/ext/mbstring/tests/mb_strtolower_variation3.phpt b/ext/mbstring/tests/mb_strtolower_variation3.phpt index 99256e1ec4..bf918df182 100644 --- a/ext/mbstring/tests/mb_strtolower_variation3.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation3.phpt @@ -44,7 +44,7 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtolower() : usage variations *** -- Mixed string (mulitbyte and ASCII characters) -- diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt index f08b508798..007430b262 100644 --- a/ext/mbstring/tests/mb_strtolower_variation4.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt @@ -39,7 +39,7 @@ foreach ($uppers as $lang => $sourcestring) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtolower() : usage variations *** -- Basic Latin -- diff --git a/ext/mbstring/tests/mb_strtoupper_variation3.phpt b/ext/mbstring/tests/mb_strtoupper_variation3.phpt index f0cb0fa47c..de77f39225 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation3.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation3.phpt @@ -45,7 +45,7 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : usage variations *** -- Mixed string (mulitbyte and ASCII characters) -- diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt index 8f5abe7269..739671b6c4 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt @@ -40,7 +40,7 @@ foreach ($lowers as $lang => $sourcestring) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : usage variations *** -- Basic Latin -- diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt index d6d6b75d23..8842e7a3d1 100644 --- a/ext/mbstring/tests/mb_substr_basic.phpt +++ b/ext/mbstring/tests/mb_substr_basic.phpt @@ -40,7 +40,7 @@ var_dump(base64_encode($result_2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : basic functionality *** -- ASCII string 1 -- diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt index c4d1d7830a..13cd4a7f25 100644 --- a/ext/mbstring/tests/mb_substr_count_basic.phpt +++ b/ext/mbstring/tests/mb_substr_count_basic.phpt @@ -34,7 +34,7 @@ var_dump(mb_substr_count($string_mb, $needle_mb2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr_count() : basic functionality *** -- ASCII String -- diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt index 21c9f956fb..0a98d2051b 100644 --- a/ext/mbstring/tests/mb_substr_count_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt @@ -33,7 +33,7 @@ var_dump(mb_substr_count($string_mb, $needle_mb, 'utf-8')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr_count() : usage variations *** -- ASCII String -- diff --git a/ext/mbstring/tests/mb_substr_variation3.phpt b/ext/mbstring/tests/mb_substr_variation3.phpt index f0ba2bc0a2..702bdda147 100644 --- a/ext/mbstring/tests/mb_substr_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_variation3.phpt @@ -104,7 +104,7 @@ foreach($encoding as $enc) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : usage variations *** -- Iteration 1: UCS-4 -- diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt index f9599d995f..375520af88 100644 --- a/ext/mbstring/tests/php_gr_jp_10830.phpt +++ b/ext/mbstring/tests/php_gr_jp_10830.phpt @@ -13,6 +13,6 @@ var_dump( mb_ereg("^[^><]+$",$a) ); var_dump( !!preg_match("/^[^><]+$/",$a) ); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) diff --git a/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt b/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt index 4978d0ce57..b6c97b324a 100644 --- a/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt +++ b/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt @@ -11,6 +11,6 @@ set_time_limit(2); var_dump(preg_replace("/.*/", "b", "a")); var_dump(mb_ereg_replace(".*", "b", "a")); ?> ---EXPECTF-- +--EXPECT-- string(2) "bb" string(2) "bb" diff --git a/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt b/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt index 2f74dff64b..7c4ebc9a4e 100644 --- a/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt +++ b/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt @@ -12,7 +12,7 @@ var_dump(preg_replace("/C?$/", "Z", "ABC")); var_dump(mb_ereg_replace("C*$", "Z", "ABC")); var_dump(preg_replace("/C*$/", "Z", "ABC")); ?> ---EXPECTF-- +--EXPECT-- string(4) "ABZZ" string(4) "ABZZ" string(4) "ABZZ" diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt index 43eb0aebd8..6008be5a11 100644 --- a/ext/mbstring/tests/zend_multibyte-02.phpt +++ b/ext/mbstring/tests/zend_multibyte-02.phpt @@ -11,5 +11,5 @@ mbstring.internal_encoding=CP932 <?php var_dump(bin2hex("テスト")); ?> ---EXPECTF-- +--EXPECT-- string(12) "836583588367" diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt index 71e5c903b9..c75c0b8cb2 100644 --- a/ext/mbstring/tests/zend_multibyte-06.phpt +++ b/ext/mbstring/tests/zend_multibyte-06.phpt @@ -11,5 +11,5 @@ mbstring.internal_encoding=CP932 declare(encoding="UTF-8"); var_dump(bin2hex("テスト")); ?> ---EXPECTF-- +--EXPECT-- string(12) "836583588367" diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt index ad70b853af..498170e747 100644 --- a/ext/mbstring/tests/zend_multibyte-10.phpt +++ b/ext/mbstring/tests/zend_multibyte-10.phpt @@ -10,5 +10,5 @@ declare(encoding="ISO-8859-15"); declare(encoding="ISO-8859-1"); echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok diff --git a/ext/mbstring/tests/zend_multibyte-15.phpt b/ext/mbstring/tests/zend_multibyte-15.phpt index 35246bcdca..b24ed25fb2 100644 --- a/ext/mbstring/tests/zend_multibyte-15.phpt +++ b/ext/mbstring/tests/zend_multibyte-15.phpt @@ -13,6 +13,6 @@ declare(encoding="UTF-8") { echo "ok\n"; } ?> ---EXPECTF-- +--EXPECT-- ok ok diff --git a/ext/mbstring/tests/zend_multibyte-16.phpt b/ext/mbstring/tests/zend_multibyte-16.phpt index 7f1d91e294..a9b0920184 100644 --- a/ext/mbstring/tests/zend_multibyte-16.phpt +++ b/ext/mbstring/tests/zend_multibyte-16.phpt @@ -11,6 +11,6 @@ declare(encoding="ISO-8859-15") { } echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok ok |