diff options
Diffstat (limited to 'ext/mbstring/tests')
112 files changed, 40 insertions, 146 deletions
diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt index ea6ce1a37d..1585274f65 100644 --- a/ext/mbstring/tests/bug20087.phpt +++ b/ext/mbstring/tests/bug20087.phpt @@ -21,4 +21,3 @@ string(0) "" ERR: Deprecated bool(true) string(3) "moo" - diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt index 753842cac4..01ae2a7525 100644 --- a/ext/mbstring/tests/bug43841.phpt +++ b/ext/mbstring/tests/bug43841.phpt @@ -33,9 +33,7 @@ foreach ($offsets as $i) { var_dump(strrpos('This is na English ta', 'a', $i)); } ?> - --EXPECTF-- - -- Offset is -25 -- Multibyte String: diff --git a/ext/mbstring/tests/bug43994.phpt b/ext/mbstring/tests/bug43994.phpt index e9a11d054e..5825a4901a 100644 --- a/ext/mbstring/tests/bug43994.phpt +++ b/ext/mbstring/tests/bug43994.phpt @@ -37,9 +37,7 @@ foreach($inputs as $input) { $iterator++; }; ?> - --EXPECTF-- - -- Iteration 1 -- Without $regs arg: diff --git a/ext/mbstring/tests/bug43998.phpt b/ext/mbstring/tests/bug43998.phpt index da5e599da0..72ea62a7fc 100644 --- a/ext/mbstring/tests/bug43998.phpt +++ b/ext/mbstring/tests/bug43998.phpt @@ -29,7 +29,6 @@ foreach($inputs as $input) { }; ?> --EXPECTF-- - -- Iteration 1 -- Warning: mb_strtolower(): Unknown encoding "12345" in %s on line %d diff --git a/ext/mbstring/tests/bug45923.phpt b/ext/mbstring/tests/bug45923.phpt index 41ffd70924..aad4b0de4f 100644 --- a/ext/mbstring/tests/bug45923.phpt +++ b/ext/mbstring/tests/bug45923.phpt @@ -243,4 +243,4 @@ int(4) > Offset: -20 Warning: mb_strripos(): Offset is greater than the length of haystack string in %s on line %d -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/mbstring/tests/bug54494.phpt b/ext/mbstring/tests/bug54494.phpt index 3d7206c3ee..d2bdc9cbd2 100644 --- a/ext/mbstring/tests/bug54494.phpt +++ b/ext/mbstring/tests/bug54494.phpt @@ -49,4 +49,3 @@ Length: 12 UCS-2LE: Length: 12 6800e4006c006c00f60020007700f60072006c0064000a00 - diff --git a/ext/mbstring/tests/bug65045.phpt b/ext/mbstring/tests/bug65045.phpt index 002c5ed174..8535a95d95 100644 --- a/ext/mbstring/tests/bug65045.phpt +++ b/ext/mbstring/tests/bug65045.phpt @@ -21,9 +21,8 @@ var_dump( $expected === mb_convert_encoding($str, 'UTF-8', 'UTF-8'), $expected2 === mb_convert_encoding($str2, 'UTF-8', 'UTF-8') ); - --EXPECT-- bool(true) bool(true) bool(true) -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/mbstring/tests/bug66964.phpt b/ext/mbstring/tests/bug66964.phpt index e982aa2e01..b4e87a6ae1 100644 --- a/ext/mbstring/tests/bug66964.phpt +++ b/ext/mbstring/tests/bug66964.phpt @@ -50,4 +50,4 @@ array(5) { string(21) "ユ茯鴻" [4]=> *RECURSION* -}
\ No newline at end of file +} diff --git a/ext/mbstring/tests/bug68846.phpt b/ext/mbstring/tests/bug68846.phpt index 1b43e3d11b..c0a7c267fd 100644 --- a/ext/mbstring/tests/bug68846.phpt +++ b/ext/mbstring/tests/bug68846.phpt @@ -9,4 +9,4 @@ var_dump( ); ?> --EXPECT-- -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/mbstring/tests/bug72402.phpt b/ext/mbstring/tests/bug72402.phpt index abb290bf4d..6e3286cbfa 100644 --- a/ext/mbstring/tests/bug72402.phpt +++ b/ext/mbstring/tests/bug72402.phpt @@ -14,4 +14,4 @@ try { ?> DONE --EXPECT-- -DONE
\ No newline at end of file +DONE diff --git a/ext/mbstring/tests/bug75944.phpt b/ext/mbstring/tests/bug75944.phpt index cb66d4e230..dc11ea244d 100644 --- a/ext/mbstring/tests/bug75944.phpt +++ b/ext/mbstring/tests/bug75944.phpt @@ -10,4 +10,3 @@ var_dump(mb_detect_encoding(chr(0xff), array('CP-1251'))); // letter '?' --EXPECT-- string(12) "Windows-1251" string(12) "Windows-1251" - diff --git a/ext/mbstring/tests/bug76532.phpt b/ext/mbstring/tests/bug76532.phpt index e61e403dbf..321af91947 100644 --- a/ext/mbstring/tests/bug76532.phpt +++ b/ext/mbstring/tests/bug76532.phpt @@ -9,4 +9,4 @@ $width = 2147483647; var_dump(mb_strimwidth($string_to_trim, 0, $width)); ?> --EXPECT-- -string(81) "緇緇綛悟筝紊鐚筝筝水緇筝篋阪研筝Ŭ薊ュ亥"
\ No newline at end of file +string(81) "緇緇綛悟筝紊鐚筝筝水緇筝篋阪研筝Ŭ薊ュ亥" diff --git a/ext/mbstring/tests/casefold.phpt b/ext/mbstring/tests/casefold.phpt index 002269b680..2138aff255 100644 --- a/ext/mbstring/tests/casefold.phpt +++ b/ext/mbstring/tests/casefold.phpt @@ -16,7 +16,6 @@ output_handler= print mb_strtoupper( "粳\n" ); print mb_convert_case( "粳\n", MB_CASE_TITLE ); ?> - --EXPECT-- abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ diff --git a/ext/mbstring/tests/ini_encoding.phpt b/ext/mbstring/tests/ini_encoding.phpt index b9809b2bfe..4d65c3c5d9 100644 --- a/ext/mbstring/tests/ini_encoding.phpt +++ b/ext/mbstring/tests/ini_encoding.phpt @@ -43,8 +43,6 @@ var_dump(ini_get('mbstring.internal_encoding')); var_dump(mb_internal_encoding()); var_dump(ini_get('mbstring.http_input')); var_dump(ini_get('mbstring.http_output')); - - --EXPECT-- Getting INI string(9) "Shift_JIS" diff --git a/ext/mbstring/tests/ini_encoding2.phpt b/ext/mbstring/tests/ini_encoding2.phpt index f0f62dab07..f3728486ae 100644 --- a/ext/mbstring/tests/ini_encoding2.phpt +++ b/ext/mbstring/tests/ini_encoding2.phpt @@ -43,8 +43,6 @@ var_dump(ini_get('mbstring.internal_encoding')); var_dump(mb_internal_encoding()); var_dump(ini_get('mbstring.http_input')); var_dump(ini_get('mbstring.http_output')); - - --EXPECT-- Getting INI string(0) "" diff --git a/ext/mbstring/tests/mb_chr_ord.phpt b/ext/mbstring/tests/mb_chr_ord.phpt index 153699b1b0..cf2e74cb34 100644 --- a/ext/mbstring/tests/mb_chr_ord.phpt +++ b/ext/mbstring/tests/mb_chr_ord.phpt @@ -2066,4 +2066,3 @@ ERROR(57341) ERROR(57342) ERROR(57343) OK - diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt index 13faa9d12d..06f10c291e 100644 --- a/ext/mbstring/tests/mb_convert_encoding.phpt +++ b/ext/mbstring/tests/mb_convert_encoding.phpt @@ -108,7 +108,6 @@ print("MP: $s\n"); // Missing parameter ?> - --EXPECT-- == BASIC TEST == EUC-JP: 日本語テキストです。01234５６７８９。 @@ -134,5 +133,3 @@ ERR: Warning BAD: ERR: Warning MP: - - diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt index 50e7076a13..e29b9c063e 100644 --- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt @@ -204,4 +204,3 @@ string(24) "68656c6c6f2c20776f726c64" Warning: mb_convert_encoding() expects parameter 2 to be string, resource given in %s on line %d string(0) "" Done - diff --git a/ext/mbstring/tests/mb_convert_kana.phpt b/ext/mbstring/tests/mb_convert_kana.phpt index b3bffb61d8..b83923756d 100644 --- a/ext/mbstring/tests/mb_convert_kana.phpt +++ b/ext/mbstring/tests/mb_convert_kana.phpt @@ -53,7 +53,6 @@ echo $hanKakuD . ' => ' . mb_convert_kana($hanKakuD, 'AZKH', 'utf-8'); 鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎 => 若≪ゃ宴潟泣激鴻祉 鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓 => 帥 鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓鐓 => ＜≪ゃ潟 - --CREDITS-- Jason Easter <easter@phpug-wuerzburg.de> PHPUG W端rzburg <phpug-wuerzburg.de> diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt index bc1c320c3d..e4d02a2269 100644 --- a/ext/mbstring/tests/mb_convert_variables.phpt +++ b/ext/mbstring/tests/mb_convert_variables.phpt @@ -133,7 +133,6 @@ print("{$oo->s1}{$oo->s2}{$oo->s3}\n"); // Converted to EUC-JP ?> - --EXPECT-- == SCALER TEST == SJIS @@ -161,4 +160,3 @@ EUC-JP 日本語テキストです。01234５６７８９。日本語テキストです。01234５６７８９。日本語テキストです。01234５６７８９。 日本語テキストです。01234５６７８９。日本語テキストです。01234５６７８９。日本語テキストです。01234５６７８９。 日本語テキストです。01234５６７８９。日本語テキストです。01234５６７８９。日本語テキストです。01234５６７８９。 - diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt index d50330849c..4972e9c3e0 100644 --- a/ext/mbstring/tests/mb_detect_encoding.phpt +++ b/ext/mbstring/tests/mb_detect_encoding.phpt @@ -96,7 +96,6 @@ print("MP: $s\n"); // Missing parameter ?> - --EXPECT-- == BASIC TEST == SJIS: SJIS @@ -118,4 +117,3 @@ ERR: Warning BAD: EUC-JP ERR: Warning MP: - diff --git a/ext/mbstring/tests/mb_detect_order.phpt b/ext/mbstring/tests/mb_detect_order.phpt index 8c6ee3eb5e..664ffd7bda 100644 --- a/ext/mbstring/tests/mb_detect_order.phpt +++ b/ext/mbstring/tests/mb_detect_order.phpt @@ -45,7 +45,6 @@ $r = mb_detect_order($a); print implode(', ', mb_detect_order()) . "\n"; ?> - --EXPECT-- OK_AUTO ASCII, JIS, UTF-8, EUC-JP, SJIS @@ -58,4 +57,3 @@ OK_BAD_STR ASCII, JIS, EUC-JP, UTF-8 OK_BAD_ARRAY ASCII, JIS, EUC-JP, UTF-8 - diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt index cd9eb1bb39..43b737ec66 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt @@ -5,7 +5,6 @@ Test mb_encode_mimeheader() function : basic functionality extension_loaded('mbstring') or die('skip'); function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build"); ?> - --FILE-- <?php /* Prototype : string mb_encode_mimeheader @@ -71,4 +70,4 @@ string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9 =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?= =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?= =?UTF-8?Q?=39=2E?=" -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt index 7763e2c041..8c61171179 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt @@ -5,7 +5,6 @@ Test mb_encode_mimeheader() function : basic functionality extension_loaded('mbstring') or die('skip'); function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build"); ?> - --FILE-- <?php /* Prototype : string mb_encode_mimeheader(string $str [, string $charset diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt index ad921ab108..4a297df5eb 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt @@ -5,7 +5,6 @@ Test mb_encode_mimeheader() function : basic functionality extension_loaded('mbstring') or die('skip'); function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build"); ?> - --FILE-- <?php /* Prototype : string mb_encode_mimeheader(string $str [, string $charset diff --git a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt index 00b471a747..fb548d88cb 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt @@ -5,7 +5,6 @@ Test mb_encode_mimeheader() function : basic functionality, indent extension_loaded('mbstring') or die('skip'); function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build"); ?> - --FILE-- <?php /* Prototype : string mb_encode_mimeheader @@ -898,4 +897,3 @@ string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9 =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?= =?UTF-8?Q?=39=2E?=" Done - diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt index 8f8cf3e3dc..be01edbadd 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt @@ -181,4 +181,4 @@ string(0) "" Warning: mb_encode_mimeheader() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt index fb81271f74..b02f510f64 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt @@ -36,7 +36,6 @@ foreach ($linefeeds as $linefeed) { echo "Done"; ?> - --EXPECTF-- *** Testing mb_encode_mimeheader() : usage variations *** diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt index faf6ea65e4..ff507adc07 100644 --- a/ext/mbstring/tests/mb_ereg.phpt +++ b/ext/mbstring/tests/mb_ereg.phpt @@ -30,7 +30,6 @@ output_handler= do_tests( $enc ); } ?> - --EXPECT-- (15)6162632064656620676869206a6b6c2064656620676869206a6b6c (27)a3e1a3e2a3e320a4a2a4aaa4a420a4aba4b3a4ca20a4efa4f1a4f320a3e1a3e2a3e320a4a2a4aaa4a420a4ab20a4b3a4ca20a4efa4f1a4f3 @@ -43,4 +42,4 @@ output_handler= (27)a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab20a4ada4ab20a4f2a4f020a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab2020a4ada4ab20a4f2a4f0 (15)6162632064656620676869206a6b6c2064656620676869206a6b6c (39)a3e1a3e2a3e320a4a2a4aaa4a420a4aba4b3a4ca20a4efa4f1a4f320a3e1a3e2a3e320a4a2a4aaa4a420a4ab20a4b3a4ca20a4efa4f1a4f3 -(39)a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab20a4ada4ab20a4f2a4f020a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab2020a4ada4ab20a4f2a4f0
\ No newline at end of file +(39)a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab20a4ada4ab20a4f2a4f020a3eda3faa3f8a3e6a3f020a4a6a4aaa4ab2020a4ada4ab20a4f2a4f0 diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt index 021200dfde..b13f012b7b 100644 --- a/ext/mbstring/tests/mb_ereg_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_basic.phpt @@ -75,7 +75,6 @@ function base64_encode_var_dump($regs) { } } ?> - --EXPECT-- *** Testing mb_ereg() : basic functionality *** Regex encoding set to utf-8 diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt index c82e1b6f3c..08183573b6 100644 --- a/ext/mbstring/tests/mb_ereg_match_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt @@ -42,7 +42,6 @@ var_dump(mb_ereg_match($regex2, $string_mb)); echo "Done"; ?> --EXPECTF-- - *** Testing mb_ereg_match() : basic functionality *** -- ASCII string 1 -- diff --git a/ext/mbstring/tests/mb_ereg_match_error1.phpt b/ext/mbstring/tests/mb_ereg_match_error1.phpt index d483b6609d..35fdc6339b 100644 --- a/ext/mbstring/tests/mb_ereg_match_error1.phpt +++ b/ext/mbstring/tests/mb_ereg_match_error1.phpt @@ -55,4 +55,4 @@ bool(false) Warning: mb_ereg_match() expects at least 2 parameters, 0 given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_ereg_replace.phpt b/ext/mbstring/tests/mb_ereg_replace.phpt index 9413da82b9..26838341fe 100644 --- a/ext/mbstring/tests/mb_ereg_replace.phpt +++ b/ext/mbstring/tests/mb_ereg_replace.phpt @@ -11,8 +11,6 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab print mb_ereg_replace( ' ', '-', 'a b c d e' )."\n"; print mb_ereg_replace( '([a-z]+)','[\\1]', 'abc def ghi' ); ?> - --EXPECT-- a-b-c-d-e [abc] [def] [ghi] - diff --git a/ext/mbstring/tests/mb_ereg_replace_basic.phpt b/ext/mbstring/tests/mb_ereg_replace_basic.phpt index ac30149099..3627468371 100644 --- a/ext/mbstring/tests/mb_ereg_replace_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_basic.phpt @@ -59,4 +59,4 @@ string(72) "e697a5e69cace8aa9e5f5f5f5f5f31323334efbc95efbc96efbc97efbc98efbc99e3 -- Multibyte string 2 -- string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082" -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_ereg_replace_callback.phpt b/ext/mbstring/tests/mb_ereg_replace_callback.phpt index 98a3809574..554b51fcf9 100644 --- a/ext/mbstring/tests/mb_ereg_replace_callback.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_callback.phpt @@ -12,4 +12,3 @@ echo mb_ereg_replace_callback('(\S+)', function($m){return $m[1].'('.strlen($m[1 ?> --EXPECT-- abc(3) 123(3) #",;(4) $foo(4) - diff --git a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt index e69e147e48..39bdf51020 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt @@ -175,4 +175,4 @@ string(1) "_" Warning: mb_ereg_replace() expects parameter 2 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt index c85f68aa06..deb8b2eb41 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt @@ -176,4 +176,4 @@ string(10) "str1n1_v1l" Warning: mb_ereg_replace() expects parameter 4 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt index d73046ff0f..df225549d6 100644 --- a/ext/mbstring/tests/mb_ereg_search_pos.phpt +++ b/ext/mbstring/tests/mb_ereg_search_pos.phpt @@ -27,5 +27,3 @@ array(2) { [1]=> int(6) } - - diff --git a/ext/mbstring/tests/mb_ereg_search_setpos.phpt b/ext/mbstring/tests/mb_ereg_search_setpos.phpt index 0a4c18473b..60237f04a1 100644 --- a/ext/mbstring/tests/mb_ereg_search_setpos.phpt +++ b/ext/mbstring/tests/mb_ereg_search_setpos.phpt @@ -66,5 +66,3 @@ Warning: mb_ereg_search_setpos(): Position is out of range in %s on line %d bool(false) int(0) ==DONE== - - diff --git a/ext/mbstring/tests/mb_ereg_search_xxx.phpt b/ext/mbstring/tests/mb_ereg_search_xxx.phpt index 49182248f8..a2049df144 100644 --- a/ext/mbstring/tests/mb_ereg_search_xxx.phpt +++ b/ext/mbstring/tests/mb_ereg_search_xxx.phpt @@ -34,7 +34,6 @@ output_handler= do_tests( $enc, 'x' ); } ?> - --EXPECT-- (EUC-JP) (10) ・∀ (EUC-JP) (5) abcde diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt index 999dcec574..8afbe98e2a 100644 --- a/ext/mbstring/tests/mb_ereg_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_variation1.phpt @@ -89,7 +89,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_ereg() : usage variations *** diff --git a/ext/mbstring/tests/mb_ereg_variation2.phpt b/ext/mbstring/tests/mb_ereg_variation2.phpt index f6a93ebc83..ef528a7173 100644 --- a/ext/mbstring/tests/mb_ereg_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_variation2.phpt @@ -106,7 +106,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_ereg() : usage variations *** diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt index 756e876126..5264ad4fa6 100644 --- a/ext/mbstring/tests/mb_ereg_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_variation3.phpt @@ -69,7 +69,6 @@ function base64_encode_var_dump($regs) { echo "Done"; ?> - --EXPECT-- *** Testing mb_ereg() : variation *** diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt index eb42832390..e04795d85d 100644 --- a/ext/mbstring/tests/mb_ereg_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_variation4.phpt @@ -146,4 +146,4 @@ array(1) { [0]=> string(8) "MDEyMzQ=" } -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt index c26d82ead5..52e3e356b3 100644 --- a/ext/mbstring/tests/mb_ereg_variation5.phpt +++ b/ext/mbstring/tests/mb_ereg_variation5.phpt @@ -79,4 +79,4 @@ array(1) { [0]=> string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" } -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt index 5a2e746dd6..97e5e58906 100644 --- a/ext/mbstring/tests/mb_ereg_variation6.phpt +++ b/ext/mbstring/tests/mb_ereg_variation6.phpt @@ -189,4 +189,4 @@ array(1) { [0]=> bool(false) } -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt index e35b9ef5cf..e43d051d2a 100644 --- a/ext/mbstring/tests/mb_ereg_variation7.phpt +++ b/ext/mbstring/tests/mb_ereg_variation7.phpt @@ -91,4 +91,4 @@ array(5) { [4]=> string(4) "ODk=" } -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt index 3a4916d751..5ac57d3e42 100644 --- a/ext/mbstring/tests/mb_http_input.phpt +++ b/ext/mbstring/tests/mb_http_input.phpt @@ -43,9 +43,7 @@ else { } ?> - --EXPECT-- 日本語0123456789日本語カタカナひらがな 日本語0123456789日本語カタカナひらがな OK - diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt index cb2ea21f77..da2c6407ce 100644 --- a/ext/mbstring/tests/mb_http_output.phpt +++ b/ext/mbstring/tests/mb_http_output.phpt @@ -59,7 +59,6 @@ $enc = mb_http_output(); print "$enc\n"; ?> - --EXPECT-- OK_ASCII_SET ASCII @@ -81,4 +80,3 @@ EUC-JP ERR: Warning OK_BAD_OBJ_SET EUC-JP - diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt index 6ef4be23d9..d4bc8de048 100644 --- a/ext/mbstring/tests/mb_internal_encoding.phpt +++ b/ext/mbstring/tests/mb_internal_encoding.phpt @@ -47,7 +47,6 @@ $enc = mb_internal_encoding(); print "$enc\n"; ?> - --EXPECT-- OK_EUC-JP_SET EUC-JP @@ -65,4 +64,3 @@ ASCII ERR: Warning OK_BAD_OBJ_SET ASCII - diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt index 954f7aecc2..c031569399 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt @@ -100,7 +100,6 @@ fclose($fp); echo "Done"; ?> --EXPECTF-- - *** Testing mb_internal_encoding() : usage variations *** -- Iteration 1 -- diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt index 216c789c54..ba53c48401 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt @@ -89,7 +89,6 @@ foreach($encoding as $enc) { echo "Done"; ?> --EXPECTF-- - *** Testing mb_internal_encoding() : usage variations *** -- Iteration 1 -- diff --git a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt index dff5c97743..1e99229dff 100644 --- a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt +++ b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt @@ -16,6 +16,5 @@ $output = ob_get_clean(); var_dump( $output ); ?> - --EXPECT-- string(73) "テスト用日本語文字列。このモジュールはPHPにマルチバイト関数を提供します。" diff --git a/ext/mbstring/tests/mb_output_handler_shift_jis.phpt b/ext/mbstring/tests/mb_output_handler_shift_jis.phpt index d4612d9775..01742d101e 100644 --- a/ext/mbstring/tests/mb_output_handler_shift_jis.phpt +++ b/ext/mbstring/tests/mb_output_handler_shift_jis.phpt @@ -11,6 +11,5 @@ mbstring.http_output=EUC-JP // Shift_JIS var_dump("eXgp{BW[PHP}`oCgB"); ?> - --EXPECT-- string(73) "テスト用日本語文字列。このモジュールはPHPにマルチバイト関数を提供します。" diff --git a/ext/mbstring/tests/mb_preferred_mime_name.phpt b/ext/mbstring/tests/mb_preferred_mime_name.phpt index 9a71ce2757..7cc6a6bd53 100644 --- a/ext/mbstring/tests/mb_preferred_mime_name.phpt +++ b/ext/mbstring/tests/mb_preferred_mime_name.phpt @@ -44,7 +44,6 @@ $r = mb_preferred_mime_name('BAD_NAME'); ($r === FALSE) ? print("OK_BAD_NAME\n") : print("NG_BAD_NAME\n"); ?> - --EXPECT-- Shift_JIS Shift_JIS @@ -58,4 +57,3 @@ UCS-4 == INVALID PARAMETER == ERR: Warning OK_BAD_NAME - diff --git a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt index baaab535d4..0ef9eb4384 100644 --- a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt @@ -417,4 +417,4 @@ string(6) "EUC-KR" string(6) "EUC-KR" bool(true) string(5) "KOI8R" -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_regex_set_options.phpt b/ext/mbstring/tests/mb_regex_set_options.phpt index 26c8a998f8..301df8f118 100644 --- a/ext/mbstring/tests/mb_regex_set_options.phpt +++ b/ext/mbstring/tests/mb_regex_set_options.phpt @@ -13,6 +13,5 @@ function_exists('mb_regex_set_options') or die("skip\n"); mb_regex_set_options( '' ); print mb_ereg_replace(' -', '+', '- - - - -' ); ?> - --EXPECT-- + + + + +-++++ diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt index a63c8cabbe..2ce7ab9316 100644 --- a/ext/mbstring/tests/mb_split.phpt +++ b/ext/mbstring/tests/mb_split.phpt @@ -35,7 +35,6 @@ mbstring.func_overload=0 verify_split( "\xa1\xa1+", "\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1", $i ); } ?> - --EXPECTF-- bool(true) ok @@ -46,4 +45,3 @@ ok 2-2 3-3 4-4 - diff --git a/ext/mbstring/tests/mb_strcut.phpt b/ext/mbstring/tests/mb_strcut.phpt index 7c78ffe02f..e6845db025 100644 --- a/ext/mbstring/tests/mb_strcut.phpt +++ b/ext/mbstring/tests/mb_strcut.phpt @@ -24,11 +24,8 @@ $str = mb_strcut($euc_jp, -100, 10,'EUC-JP'); ?> - --EXPECT-- の文 0123この文字列は日本語です。EUC-JPを使っています。日本語は面倒臭い。 OK OK: 0123この文 - - diff --git a/ext/mbstring/tests/mb_strimwidth.phpt b/ext/mbstring/tests/mb_strimwidth.phpt index f257604c6b..8d23276f2f 100644 --- a/ext/mbstring/tests/mb_strimwidth.phpt +++ b/ext/mbstring/tests/mb_strimwidth.phpt @@ -37,7 +37,6 @@ $str = mb_strimwidth($euc_jp, -10, -12,'...','EUC-JP'); ($str === FALSE) ? print "13 OK\n" : print "NG: $str\n"; ?> - --EXPECT-- String width: 68 1: 0123この文字... diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt index 8c8732493f..5dd9848372 100644 --- a/ext/mbstring/tests/mb_stripos_basic2.phpt +++ b/ext/mbstring/tests/mb_stripos_basic2.phpt @@ -126,4 +126,3 @@ int(11) int(2) int(11) Done - diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt index b92aceecdb..bb49022e0f 100644 --- a/ext/mbstring/tests/mb_stripos_variation2.phpt +++ b/ext/mbstring/tests/mb_stripos_variation2.phpt @@ -197,4 +197,3 @@ bool(false) Warning: mb_stripos() expects parameter 2 to be string, resource given in %s on line %d NULL Done - diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt index e762bb4e71..b2109ee8e0 100644 --- a/ext/mbstring/tests/mb_stripos_variation4.phpt +++ b/ext/mbstring/tests/mb_stripos_variation4.phpt @@ -105,7 +105,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_stripos() : usage variations *** diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt index 436ac90811..cc05393a55 100644 --- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt @@ -43,7 +43,6 @@ for ($i = -30; $i <= 60; $i += 10) { echo "Done"; ?> - --EXPECTF-- *** Testing mb_stripos() : usage variations *** diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt index 8f01425221..15b4c864c8 100644 --- a/ext/mbstring/tests/mb_stristr_variation1.phpt +++ b/ext/mbstring/tests/mb_stristr_variation1.phpt @@ -205,4 +205,3 @@ bool(false) Error: 2 - mb_stristr() expects parameter 1 to be string, resource given, %s(%d) NULL ===DONE=== - diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt index 5842a8c6fd..2352e82beb 100644 --- a/ext/mbstring/tests/mb_stristr_variation2.phpt +++ b/ext/mbstring/tests/mb_stristr_variation2.phpt @@ -213,4 +213,3 @@ bool(false) Error: 2 - mb_stristr() expects parameter 2 to be string, resource given, %s(%d) NULL ===DONE=== - diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt index 512d76de04..0ab540b959 100644 --- a/ext/mbstring/tests/mb_strlen.phpt +++ b/ext/mbstring/tests/mb_strlen.phpt @@ -73,7 +73,6 @@ echo $r."\n"; ?> - --EXPECT-- == ASCII == 40 @@ -96,6 +95,3 @@ ERR: Warning ERR: Warning ERR: Warning - - - diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt index e4a1435e90..fd678c88df 100644 --- a/ext/mbstring/tests/mb_strlen_basic.phpt +++ b/ext/mbstring/tests/mb_strlen_basic.phpt @@ -30,7 +30,6 @@ var_dump(mb_strlen($string_mb, 'UTF-8')); echo "\nDone"; ?> - --EXPECTF-- *** Testing mb_strlen() : basic functionality*** diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt index 9311127131..17c1e0c6e6 100644 --- a/ext/mbstring/tests/mb_strlen_variation2.phpt +++ b/ext/mbstring/tests/mb_strlen_variation2.phpt @@ -102,7 +102,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strlen() : usage variations *** diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt index f55ec59f6e..9965120e23 100644 --- a/ext/mbstring/tests/mb_strpos_basic.phpt +++ b/ext/mbstring/tests/mb_strpos_basic.phpt @@ -54,4 +54,4 @@ int(0) -- Multibyte string 2 -- bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt index f9b8d9bcfd..a9b168c573 100644 --- a/ext/mbstring/tests/mb_strpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strpos_variation4.phpt @@ -104,7 +104,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strpos() : usage variations *** diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt index 404af22c45..097c8dccb4 100644 --- a/ext/mbstring/tests/mb_strpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strpos_variation5.phpt @@ -43,7 +43,6 @@ for ($i = -30; $i <= 60; $i += 10) { echo "Done"; ?> - --EXPECTF-- *** Testing mb_strpos() : usage variations *** diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt index 2d8b8009c0..f13780cf3b 100644 --- a/ext/mbstring/tests/mb_strrchr_basic.phpt +++ b/ext/mbstring/tests/mb_strrchr_basic.phpt @@ -61,4 +61,4 @@ string(0) "" -- Multibyte string: needle doesn't exist -- bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt index 053a1cf726..8b3108bf69 100644 --- a/ext/mbstring/tests/mb_strrchr_variation6.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt @@ -62,4 +62,4 @@ bool(false) string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89" bool(false) bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt index be28a5955c..a6846cd124 100644 --- a/ext/mbstring/tests/mb_strrichr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt @@ -66,4 +66,4 @@ string(20) "ce9cce9dcebecebfcea0" string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb" string(20) "ce9cce9dcebecebfcea0" string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt index 43e847fef5..4023f83480 100644 --- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt @@ -204,4 +204,3 @@ int(8) Warning: mb_strripos() expects parameter 3 to be integer, resource given in %s on line %d NULL Done - diff --git a/ext/mbstring/tests/mb_strripos_variation4.phpt b/ext/mbstring/tests/mb_strripos_variation4.phpt index 195060be07..72ce6865a8 100644 --- a/ext/mbstring/tests/mb_strripos_variation4.phpt +++ b/ext/mbstring/tests/mb_strripos_variation4.phpt @@ -105,7 +105,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strripos() : usage variations *** diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt index 11d289f52d..fd8f6ae226 100644 --- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt @@ -44,7 +44,6 @@ for ($i = -10; $i <= 60; $i += 10) { echo "Done"; ?> - --EXPECTF-- *** Testing mb_strripos() : usage variations *** @@ -112,4 +111,3 @@ bool(false) Warning: mb_strripos(): Offset is greater than the length of haystack string in %s on line %d bool(false) Done - diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt index 7a49cde621..b86f24d98c 100644 --- a/ext/mbstring/tests/mb_strrpos_basic.phpt +++ b/ext/mbstring/tests/mb_strrpos_basic.phpt @@ -55,4 +55,3 @@ int(20) -- Multibyte string 2 -- bool(false) Done - diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt index cd6c111206..9376443cf4 100644 --- a/ext/mbstring/tests/mb_strrpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt @@ -101,7 +101,6 @@ foreach($inputs as $input) { echo "Done"; ?> - --EXPECTF-- *** Testing mb_strrpos() : usage variations *** diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt index 8a23321c02..85c951eb83 100644 --- a/ext/mbstring/tests/mb_strrpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt @@ -103,7 +103,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strrpos() : usage variations *** diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt index a7011dd278..3e1f6c9703 100644 --- a/ext/mbstring/tests/mb_strrpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt @@ -104,7 +104,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strrpos() : usage variations *** diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt index 5a9068e606..b7632020c5 100644 --- a/ext/mbstring/tests/mb_strstr_basic.phpt +++ b/ext/mbstring/tests/mb_strstr_basic.phpt @@ -61,4 +61,4 @@ string(0) "" -- Multibyte string: needle doesn't exist -- bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/mbstring/tests/mb_strtolower_variation1.phpt b/ext/mbstring/tests/mb_strtolower_variation1.phpt index 057fc299ce..004660ff1f 100644 --- a/ext/mbstring/tests/mb_strtolower_variation1.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation1.phpt @@ -175,4 +175,4 @@ string(0) "" Warning: mb_strtolower() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt index b5195cb995..6c462ade6f 100644 --- a/ext/mbstring/tests/mb_strtolower_variation2.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt @@ -222,4 +222,4 @@ bool(false) Warning: mb_strtolower() expects parameter 2 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strtolower_variation3.phpt b/ext/mbstring/tests/mb_strtolower_variation3.phpt index 99256e1ec4..c03ce03d6e 100644 --- a/ext/mbstring/tests/mb_strtolower_variation3.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation3.phpt @@ -43,7 +43,6 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv echo "Done"; ?> - --EXPECTF-- *** Testing mb_strtolower() : usage variations *** diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt index e8792c0d96..9d4d8a34ef 100644 --- a/ext/mbstring/tests/mb_strtolower_variation4.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt @@ -38,7 +38,6 @@ foreach ($uppers as $lang => $sourcestring) { echo "Done"; ?> - --EXPECTF-- *** Testing mb_strtolower() : usage variations *** @@ -53,4 +52,4 @@ Correctly Converted -- Russian -- string(24) "0LDQsdCy0LPQtNC10LbQtw==" Correctly Converted -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt index e8f48345fe..72601442fd 100644 --- a/ext/mbstring/tests/mb_strtoupper_basic.phpt +++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt @@ -46,7 +46,6 @@ if ($mb == $greek_upper) { echo "Done"; ?> - --EXPECT-- *** Testing mb_strtoupper() : basic functionality *** @@ -57,4 +56,4 @@ Correctly converted -- Multibyte String -- string(64) "zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p" Correctly converted -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strtoupper_error1.phpt b/ext/mbstring/tests/mb_strtoupper_error1.phpt index c14d2f1b5c..e475a7d2e6 100644 --- a/ext/mbstring/tests/mb_strtoupper_error1.phpt +++ b/ext/mbstring/tests/mb_strtoupper_error1.phpt @@ -31,7 +31,6 @@ var_dump( mb_strtoupper() ); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strtoupper() : error conditions *** diff --git a/ext/mbstring/tests/mb_strtoupper_error2.phpt b/ext/mbstring/tests/mb_strtoupper_error2.phpt index cf42926577..07c6763550 100644 --- a/ext/mbstring/tests/mb_strtoupper_error2.phpt +++ b/ext/mbstring/tests/mb_strtoupper_error2.phpt @@ -25,7 +25,6 @@ var_dump( mb_strtoupper($sourcestring, $encoding) ); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strtoupper() : error conditions *** diff --git a/ext/mbstring/tests/mb_strtoupper_variation1.phpt b/ext/mbstring/tests/mb_strtoupper_variation1.phpt index 6331db27ba..3bf6e18103 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation1.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation1.phpt @@ -101,7 +101,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strtoupper() : usage variations *** @@ -178,4 +177,4 @@ string(0) "" Warning: mb_strtoupper() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt index ec90324a10..68ddd9a242 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt @@ -108,7 +108,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing mb_strtoupper() : usage variations *** @@ -223,4 +222,4 @@ bool(false) Warning: mb_strtoupper() expects parameter 2 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strtoupper_variation3.phpt b/ext/mbstring/tests/mb_strtoupper_variation3.phpt index f0cb0fa47c..ff9f018072 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation3.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation3.phpt @@ -44,7 +44,6 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv echo "Done"; ?> - --EXPECTF-- *** Testing mb_strtoupper() : usage variations *** diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt index 733ed8a1b5..fb49540eea 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt @@ -39,7 +39,6 @@ foreach ($lowers as $lang => $sourcestring) { echo "Done"; ?> - --EXPECTF-- *** Testing mb_strtoupper() : usage variations *** @@ -54,4 +53,4 @@ Correctly Converted -- Russian -- string(24) "0JDQkdCS0JPQlNCV0JbQlw==" Correctly Converted -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_strwidth.phpt b/ext/mbstring/tests/mb_strwidth.phpt index da439b4a20..25210078b8 100644 --- a/ext/mbstring/tests/mb_strwidth.phpt +++ b/ext/mbstring/tests/mb_strwidth.phpt @@ -27,6 +27,5 @@ $str = mb_strwidth($euc_jp, -100, 10,'...','EUC-JP'); ($str !== "") ? print "6 OK: $str\n" : print "NG: $str\n"; */ ?> - --EXPECT-- 1: 68 diff --git a/ext/mbstring/tests/mb_substitute_character_error.phpt b/ext/mbstring/tests/mb_substitute_character_error.phpt index 4fe13683ea..29b93b638d 100644 --- a/ext/mbstring/tests/mb_substitute_character_error.phpt +++ b/ext/mbstring/tests/mb_substitute_character_error.phpt @@ -32,4 +32,3 @@ var_dump( mb_substitute_character($substchar, $extra_arg) ); Warning: mb_substitute_character() expects at most 1 parameter, 2 given in %s on line %d NULL ===DONE=== - diff --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt index 10df85ea27..f738876469 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt @@ -228,4 +228,3 @@ bool(false) Error: 2 - mb_substitute_character(): Unknown character, %s(%d) bool(false) ===DONE=== - diff --git a/ext/mbstring/tests/mb_substr.phpt b/ext/mbstring/tests/mb_substr.phpt index 94a0d8e368..28b35ea910 100644 --- a/ext/mbstring/tests/mb_substr.phpt +++ b/ext/mbstring/tests/mb_substr.phpt @@ -25,11 +25,8 @@ $str = mb_substr($euc_jp, -100, 10,'EUC-JP'); ($str !== "") ? print "4 OK: ".bin2hex($str)."\n" : print "NG: ".bin2hex($str)."\n"; ?> - --EXPECT-- 1: c6fccbdcb8eca4c7a4b9a1a34555432d 2: 30313233a4b3a4cecab8bbfacef3a4cfc6fccbdcb8eca4c7a4b9a1a34555432d4a50a4f2bbc8a4c3a4c6a4a4a4dea4b9a1a3c6fccbdcb8eca4cfccccc5ddbdada4a4a1a3 3 OK 4 OK: 30313233a4b3a4cecab8bbfacef3a4cf - - diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt index 3b1e442724..2324ed0939 100644 --- a/ext/mbstring/tests/mb_substr_count_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt @@ -217,4 +217,4 @@ bool(false) Warning: mb_substr_count() expects parameter 3 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt index cef5fdd9aa..010158cc88 100644 --- a/ext/mbstring/tests/mb_substr_count_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt @@ -41,4 +41,4 @@ int(1) -- Multibyte String -- int(1) -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt index 6e5ec9ef2b..5fa4f25975 100644 --- a/ext/mbstring/tests/mb_substr_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_variation1.phpt @@ -178,4 +178,3 @@ string(0) "" Warning: mb_substr() expects parameter 1 to be string, resource given in %s on line %d NULL Done - diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt index 5a72406b6b..d65774ab60 100644 --- a/ext/mbstring/tests/mb_substr_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_variation2.phpt @@ -224,4 +224,3 @@ bool(false) Warning: mb_substr() expects parameter 4 to be string, resource given in %s on line %d string(0) "" Done - diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt index f4a4643421..c31af9b9ef 100644 --- a/ext/mbstring/tests/mb_substr_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_variation4.phpt @@ -129,4 +129,4 @@ string(0) "" string(0) "" --Multibyte String -- string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt index a9be0686fa..94231a4624 100644 --- a/ext/mbstring/tests/mb_substr_variation5.phpt +++ b/ext/mbstring/tests/mb_substr_variation5.phpt @@ -130,4 +130,4 @@ string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII= string(28) "SXMgYW4gRW5nbGlzaCBzdHJpbmc=" --Multibyte String -- string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt index b1783c839f..172ab962b0 100644 --- a/ext/mbstring/tests/mb_substr_variation6.phpt +++ b/ext/mbstring/tests/mb_substr_variation6.phpt @@ -134,4 +134,4 @@ string(0) "" string(0) "" --Multibyte String -- string(0) "" -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt index da00d4b80a..909393177e 100644 --- a/ext/mbstring/tests/mb_substr_variation7.phpt +++ b/ext/mbstring/tests/mb_substr_variation7.phpt @@ -135,4 +135,4 @@ string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efb string(40) "497320616e20456e676c69736820737472696e67" --Multibyte String -- string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082" -Done
\ No newline at end of file +Done diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt index fff136d692..99ff6594ee 100644 --- a/ext/mbstring/tests/php_gr_jp_10830.phpt +++ b/ext/mbstring/tests/php_gr_jp_10830.phpt @@ -12,7 +12,6 @@ $a="aaa\n<>"; var_dump( mb_ereg("^[^><]+$",$a) ); var_dump( !!preg_match("/^[^><]+$/",$a) ); ?> - --EXPECTF-- bool(false) bool(false) diff --git a/ext/mbstring/tests/simpletest.phpt b/ext/mbstring/tests/simpletest.phpt index b07b6f52bc..18a223e70c 100644 --- a/ext/mbstring/tests/simpletest.phpt +++ b/ext/mbstring/tests/simpletest.phpt @@ -31,4 +31,3 @@ print: マルチバイト関数が使えます。この文字が連結されているはず。 printf: マルチバイト関数が使えます。この文字が連結されているはず。 sprintf: マルチバイト関数が使えます。この文字が連結されているはず。 echo: マルチバイト関数が使えます。この文字が連結されているはず。 - diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt index ef8ce9d0bc..138b4899fe 100644 --- a/ext/mbstring/tests/zend_multibyte-10.phpt +++ b/ext/mbstring/tests/zend_multibyte-10.phpt @@ -9,4 +9,4 @@ declare(encoding="ISO-8859-1"); echo "ok\n"; ?> --EXPECTF-- -ok
\ No newline at end of file +ok diff --git a/ext/mbstring/tests/zend_multibyte-11.phpt b/ext/mbstring/tests/zend_multibyte-11.phpt index 0f9874b538..ca86951d1a 100644 --- a/ext/mbstring/tests/zend_multibyte-11.phpt +++ b/ext/mbstring/tests/zend_multibyte-11.phpt @@ -10,4 +10,4 @@ declare(encoding="ISO-8859-15") { } ?> --EXPECTF-- -Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d
\ No newline at end of file +Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d diff --git a/ext/mbstring/tests/zend_multibyte-15.phpt b/ext/mbstring/tests/zend_multibyte-15.phpt index 6995444bbb..3a9339ffb8 100644 --- a/ext/mbstring/tests/zend_multibyte-15.phpt +++ b/ext/mbstring/tests/zend_multibyte-15.phpt @@ -13,4 +13,4 @@ declare(encoding="UTF-8") { ?> --EXPECTF-- ok -ok
\ No newline at end of file +ok diff --git a/ext/mbstring/tests/zend_multibyte-16.phpt b/ext/mbstring/tests/zend_multibyte-16.phpt index 4470e3a87f..f5d89c4357 100644 --- a/ext/mbstring/tests/zend_multibyte-16.phpt +++ b/ext/mbstring/tests/zend_multibyte-16.phpt @@ -11,4 +11,4 @@ echo "ok\n"; ?> --EXPECTF-- ok -ok
\ No newline at end of file +ok |