diff options
| author | Pedro Magalh達es <mail@pmmaga.net> | 2016-11-06 22:28:42 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-11-20 21:11:53 +0100 |
| commit | 9c5af4e4cb2f1cadc659542dad8967e9fd05f1d4 (patch) | |
| tree | 8223a6d88419c2d2a3008e35c4059b075422dd42 /ext/mbstring | |
| parent | b98357823a816a55097fc7f6f833db88722efeea (diff) | |
| download | php-git-9c5af4e4cb2f1cadc659542dad8967e9fd05f1d4.tar.gz | |
Remove the b prefix from literals on unrelated tests
Diffstat (limited to 'ext/mbstring')
94 files changed, 356 insertions, 356 deletions
diff --git a/ext/mbstring/tests/bug43840.phpt b/ext/mbstring/tests/bug43840.phpt index 626cd70f8f..b2dd048186 100644 --- a/ext/mbstring/tests/bug43840.phpt +++ b/ext/mbstring/tests/bug43840.phpt @@ -28,7 +28,7 @@ foreach($offsets as $i) { echo "--Multibyte String:--\n"; var_dump( mb_strpos($string_mb, $needle, $i, 'UTF-8') ); echo"--ASCII String:--\n"; - var_dump(mb_strpos(b'This is na English ta', b'a', $i)); + var_dump(mb_strpos('This is na English ta', 'a', $i)); } ?> --EXPECTF-- diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt index 9f2583286c..c4be058ffa 100644 --- a/ext/mbstring/tests/bug43841.phpt +++ b/ext/mbstring/tests/bug43841.phpt @@ -28,9 +28,9 @@ foreach ($offsets as $i) { var_dump( mb_strrpos($string_mb, $needle, $i, 'UTF-8') ); echo "ASCII String:\n"; echo "mb_strrpos:\n"; - var_dump(mb_strrpos(b'This is na English ta', b'a', $i)); + var_dump(mb_strrpos('This is na English ta', 'a', $i)); echo "strrpos:\n"; - var_dump(strrpos(b'This is na English ta', b'a', $i)); + var_dump(strrpos('This is na English ta', 'a', $i)); } ?> diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt index e3f1c83a12..c8d2114380 100644 --- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt @@ -21,7 +21,7 @@ echo "*** Testing mb_convert_encoding() : usage variations ***\n"; // Initialise function arguments not being substituted mb_internal_encoding('utf-8'); -$sourcestring = b'hello, world'; +$sourcestring = 'hello, world'; //get an unset variable $unset_var = 10; diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt index 8fc5b94da7..3b2d13de51 100644 --- a/ext/mbstring/tests/mb_ereg.phpt +++ b/ext/mbstring/tests/mb_ereg.phpt @@ -17,13 +17,13 @@ output_handler= mb_regex_encoding( $test_enc ); $pat = mb_convert_encoding( $pat, $test_enc, $in_enc ); $str = mb_convert_encoding( $str, $test_enc, $in_enc ); - printf( "(%d)%s\n", mb_ereg( $pat, $str, $reg ), ( is_array( $reg )? bin2hex(mb_convert_encoding( implode( b' ', $reg ), $in_enc, $test_enc )) : '' ) ); + printf( "(%d)%s\n", mb_ereg( $pat, $str, $reg ), ( is_array( $reg )? bin2hex(mb_convert_encoding( implode( ' ', $reg ), $in_enc, $test_enc )) : '' ) ); } function do_tests( $enc ) { - test_ereg( $enc, b'abc ([a-z]+) ([a-z]+) ([a-z]+)$', b"abc def ghi jkl" ); - $pat = b'([ａ-ｚ]+) ([ あ-か]+)([か-な]+) ([わ-ん]+)$'; - test_ereg( $enc, $pat, b'ａｂｃ あおい かこな わゑん' ); - test_ereg( $enc, $pat, b'ｍｚｘｆｐ うおか きか をゐ' ); + test_ereg( $enc, 'abc ([a-z]+) ([a-z]+) ([a-z]+)$', "abc def ghi jkl" ); + $pat = '([ａ-ｚ]+) ([ あ-か]+)([か-な]+) ([わ-ん]+)$'; + test_ereg( $enc, $pat, 'ａｂｃ あおい かこな わゑん' ); + test_ereg( $enc, $pat, 'ｍｚｘｆｐ うおか きか をゐ' ); } foreach( $encs as $enc ) { diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt index 6ab15f4a5b..ff64666f08 100644 --- a/ext/mbstring/tests/mb_ereg_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_basic.phpt @@ -23,9 +23,9 @@ if(mb_regex_encoding('utf-8') == true) { } else { echo "Could not set regex encoding to utf-8\n"; } -$string_ascii = b'This is an English string. 0123456789.'; -$regex_ascii1 = b'(.*is)+.*\.[[:blank:]][0-9]{9}'; -$regex_ascii2 = b'.*is+'; +$string_ascii = 'This is an English string. 0123456789.'; +$regex_ascii1 = '(.*is)+.*\.[[:blank:]][0-9]{9}'; +$regex_ascii2 = '.*is+'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); $regex_mb1 = base64_decode('KOaXpeacrOiqnikuKj8oWzEtOV0rKQ=='); diff --git a/ext/mbstring/tests/mb_ereg_error.phpt b/ext/mbstring/tests/mb_ereg_error.phpt index 3610aea4eb..21216257cd 100644 --- a/ext/mbstring/tests/mb_ereg_error.phpt +++ b/ext/mbstring/tests/mb_ereg_error.phpt @@ -21,15 +21,15 @@ echo "*** Testing mb_ereg() : error conditions ***\n"; //Test mb_ereg with one more than the expected number of arguments echo "\n-- Testing mb_ereg() function with more than expected no. of arguments --\n"; -$pattern = b'string_val'; -$string = b'string_val'; +$pattern = 'string_val'; +$string = 'string_val'; $registers = array(1, 2); $extra_arg = 10; var_dump( mb_ereg($pattern, $string, $registers, $extra_arg) ); // Testing mb_ereg with one less than the expected number of arguments echo "\n-- Testing mb_ereg() function with less than expected no. of arguments --\n"; -$pattern = b'string_val'; +$pattern = 'string_val'; var_dump( mb_ereg($pattern) ); echo "Done"; diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt index 56710a93e2..c035acc018 100644 --- a/ext/mbstring/tests/mb_ereg_match_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt @@ -20,20 +20,20 @@ mb_internal_encoding('UTF-8'); mb_regex_encoding('UTF-8'); echo "*** Testing mb_ereg_match() : basic functionality ***\n"; -$string_ascii = b'abc def, 0123456789'; +$string_ascii = 'abc def, 0123456789'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //will return true as pattern matches from start of string echo "\n-- ASCII string 1 --\n"; -var_dump(mb_ereg_match(b'.*def', $string_ascii)); +var_dump(mb_ereg_match('.*def', $string_ascii)); //will return false as pattern would match half way through string echo "\n-- ASCII string 2 --\n"; -var_dump(mb_ereg_match(b'def', $string_ascii)); +var_dump(mb_ereg_match('def', $string_ascii)); echo "\n-- Multibyte string 1 --\n"; $regex1 = base64_decode('5pel5pys6KqeKC4qKT9bMS05XSs='); -var_dump(mb_ereg_match($regex1, $string_mb, b'i')); +var_dump(mb_ereg_match($regex1, $string_mb, 'i')); echo "\n-- Multibyte string 2 --\n"; $regex2 = base64_decode('5LiW55WM'); diff --git a/ext/mbstring/tests/mb_ereg_match_error1.phpt b/ext/mbstring/tests/mb_ereg_match_error1.phpt index b36c68621b..aab95fe6cd 100644 --- a/ext/mbstring/tests/mb_ereg_match_error1.phpt +++ b/ext/mbstring/tests/mb_ereg_match_error1.phpt @@ -21,15 +21,15 @@ echo "*** Testing mb_ereg_match() : error conditions ***\n"; //Test mb_ereg_match with one more than the expected number of arguments echo "\n-- Testing mb_ereg_match() function with more than expected no. of arguments --\n"; -$pattern = b'string_val'; -$string = b'string_val'; +$pattern = 'string_val'; +$string = 'string_val'; $option = 'string_val'; $extra_arg = 10; var_dump( mb_ereg_match($pattern, $string, $option, $extra_arg) ); // Testing mb_ereg_match with one less than the expected number of arguments echo "\n-- Testing mb_ereg_match() function with less than expected no. of arguments --\n"; -$pattern = b'string_val'; +$pattern = 'string_val'; var_dump( mb_ereg_match($pattern) ); // Testing mb_ereg_match with zero arguments diff --git a/ext/mbstring/tests/mb_ereg_replace_basic.phpt b/ext/mbstring/tests/mb_ereg_replace_basic.phpt index 5a07004d58..746dd4e1a4 100644 --- a/ext/mbstring/tests/mb_ereg_replace_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_basic.phpt @@ -22,25 +22,25 @@ echo "*** Testing mb_ereg_replace() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); mb_regex_encoding('UTF-8'); -$string_ascii = b'abc def'; +$string_ascii = 'abc def'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string 1 --\n"; -$result_1 = mb_ereg_replace(b'(.*)def', b'\\1 123', $string_ascii); +$result_1 = mb_ereg_replace('(.*)def', '\\1 123', $string_ascii); var_dump(bin2hex($result_1)); echo "\n-- ASCII string 2 --\n"; -$result_2 = mb_ereg_replace(b'123', b'abc', $string_ascii); +$result_2 = mb_ereg_replace('123', 'abc', $string_ascii); var_dump(bin2hex($result_2)); echo "\n-- Multibyte string 1 --\n"; $regex1 = base64_decode('KOaXpeacrOiqnikuKj8oWzEtOV0rKQ=='); //Japanese regex in UTF-8 -$result_3 = mb_ereg_replace($regex1, b'\\1_____\\2', $string_mb); +$result_3 = mb_ereg_replace($regex1, '\\1_____\\2', $string_mb); var_dump(bin2hex($result_3)); echo "\n-- Multibyte string 2 --\n"; $regex2 = base64_decode('5LiW55WM'); -$result_4 = mb_ereg_replace($regex2, b'_____', $string_mb); +$result_4 = mb_ereg_replace($regex2, '_____', $string_mb); var_dump(bin2hex($result_4)); echo "Done"; diff --git a/ext/mbstring/tests/mb_ereg_replace_error.phpt b/ext/mbstring/tests/mb_ereg_replace_error.phpt index 9413936b2d..4e8a3388dd 100644 --- a/ext/mbstring/tests/mb_ereg_replace_error.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_error.phpt @@ -17,17 +17,17 @@ echo "*** Testing mb_ereg_replace() : error conditions ***\n"; //Test mb_ereg_replace with one more than the expected number of arguments echo "\n-- Testing mb_ereg_replace() function with more than expected no. of arguments --\n"; -$pattern = b'[a-k]'; -$replacement = b'1'; -$string = b'string_val'; +$pattern = '[a-k]'; +$replacement = '1'; +$string = 'string_val'; $option = ''; $extra_arg = 10; var_dump( mb_ereg_replace($pattern, $replacement, $string, $option, $extra_arg) ); // Testing mb_ereg_replace with one less than the expected number of arguments echo "\n-- Testing mb_ereg_replace() function with less than expected no. of arguments --\n"; -$pattern = b'string_val'; -$replacement = b'string_val'; +$pattern = 'string_val'; +$replacement = 'string_val'; var_dump( mb_ereg_replace($pattern, $replacement) ); echo "Done"; diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt index d30ddc786b..9ccb1a2124 100644 --- a/ext/mbstring/tests/mb_ereg_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_variation3.phpt @@ -21,18 +21,18 @@ echo "*** Testing mb_ereg() : variation ***\n"; mb_regex_encoding('utf-8'); // have to set otherwise won't match $mb properly $mb = base64_decode('5pel5pys6Kqe'); -$character_classes = array (b'aB1' => b'[[:alnum:]]+', /*1*/ - b'aBcD' => b'[[:alpha:]]+', - b'ab/=' => b'[[:ascii:]]+', - b" \t" => b'[[:blank:]]+', - b'234' => b'[[:digit:]]+', /*5*/ - "$mb" => b'[[:graph:]]+', - b'fjds' => b'[[:lower:]]+', - b"$mb\t" => b'[[:print:]]+', - b'.!"*@' => b'[[:punct:]]+', - b"\t" => b'[[:space:]]+', /*10*/ - b'IDSJV' => b'[[:upper:]]+', - b'3b5D' => b'[[:xdigit:]]+'); /*12*/ +$character_classes = array ('aB1' => '[[:alnum:]]+', /*1*/ + 'aBcD' => '[[:alpha:]]+', + 'ab/=' => '[[:ascii:]]+', + " \t" => '[[:blank:]]+', + '234' => '[[:digit:]]+', /*5*/ + "$mb" => '[[:graph:]]+', + 'fjds' => '[[:lower:]]+', + "$mb\t" => '[[:print:]]+', + '.!"*@' => '[[:punct:]]+', + "\t" => '[[:space:]]+', /*10*/ + 'IDSJV' => '[[:upper:]]+', + '3b5D' => '[[:xdigit:]]+'); /*12*/ $iterator = 1; foreach($character_classes as $string => $pattern) { diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt index 788d4feffe..7f7d6dfc93 100644 --- a/ext/mbstring/tests/mb_ereg_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_variation4.phpt @@ -23,19 +23,19 @@ mb_regex_encoding('utf-8'); //contains japanese characters, ASCII digits and different, UTF-8 encoded digits $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); -$character_classes = array (b'[[:alnum:]]+', /*1*/ - b'[[:alpha:]]+', - b'[[:ascii:]]+', - b'[[:blank:]]+', - b'[[:cntrl:]]+',/*5*/ - b'[[:digit:]]+', - b'[[:graph:]]+', - b'[[:lower:]]+', - b'[[:print:]]+', - b'[[:punct:]]+', /*10*/ - b'[[:space:]]+', - b'[[:upper:]]+', - b'[[:xdigit:]]+'); /*13*/ +$character_classes = array ('[[:alnum:]]+', /*1*/ + '[[:alpha:]]+', + '[[:ascii:]]+', + '[[:blank:]]+', + '[[:cntrl:]]+',/*5*/ + '[[:digit:]]+', + '[[:graph:]]+', + '[[:lower:]]+', + '[[:print:]]+', + '[[:punct:]]+', /*10*/ + '[[:space:]]+', + '[[:upper:]]+', + '[[:xdigit:]]+'); /*13*/ $iterator = 1; foreach ($character_classes as $pattern) { diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt index 1cecb09429..c26d82ead5 100644 --- a/ext/mbstring/tests/mb_ereg_variation5.phpt +++ b/ext/mbstring/tests/mb_ereg_variation5.phpt @@ -20,10 +20,10 @@ echo "*** Testing mb_ereg() : usage variations ***\n"; mb_regex_encoding('utf-8'); -$string_ascii = b'This is an English string. 0123456789.'; +$string_ascii = 'This is an English string. 0123456789.'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); -$regex = b'^.*?[[:blank:]]?[[:punct:][:digit:]]+\.?$'; +$regex = '^.*?[[:blank:]]?[[:punct:][:digit:]]+\.?$'; echo "\nASCII String without \$regs arg:\t\t"; var_dump(mb_ereg($regex, $string_ascii)); diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt index 0d8687b95f..0de5064fed 100644 --- a/ext/mbstring/tests/mb_ereg_variation6.phpt +++ b/ext/mbstring/tests/mb_ereg_variation6.phpt @@ -24,16 +24,16 @@ if(mb_regex_encoding('utf-8') == true) { echo "Could not set regex encoding to utf-8\n"; } -$regex_char = array ('\w+' => b'\w+', - '\W+' => b'\W+', - '\s+' => b'\s+', - '\S+' => b'\S+', - '\d+' => b'\d+', - '\D+' => b'\D+', - '\b' => b'\b', - '\B' => b'\B'); - -$string_ascii = b'This is an English string. 0123456789.'; +$regex_char = array ('\w+' => '\w+', + '\W+' => '\W+', + '\s+' => '\s+', + '\S+' => '\S+', + '\d+' => '\d+', + '\D+' => '\D+', + '\b' => '\b', + '\B' => '\B'); + +$string_ascii = 'This is an English string. 0123456789.'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); foreach ($regex_char as $displayChar => $char) { diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt index 170497d800..41c427162e 100644 --- a/ext/mbstring/tests/mb_ereg_variation7.phpt +++ b/ext/mbstring/tests/mb_ereg_variation7.phpt @@ -27,8 +27,8 @@ if(mb_regex_encoding('utf-8') == true) { echo "Could not set regex encoding to utf-8\n"; } -$string_ascii = b'This is an English string. 0123456789.'; -$regex_ascii = b'([A-Z]\w{1,4}is( [aeiou]|h)) ?.*\.\s[0-9]+(5([6-9][79]){2})[[:punct:]]$'; +$string_ascii = 'This is an English string. 0123456789.'; +$regex_ascii = '([A-Z]\w{1,4}is( [aeiou]|h)) ?.*\.\s[0-9]+(5([6-9][79]){2})[[:punct:]]$'; var_dump(mb_ereg($regex_ascii, $string_ascii, $regs_ascii)); base64_encode_var_dump($regs_ascii); diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt index 1031cd26d7..45d361c598 100644 --- a/ext/mbstring/tests/mb_split.phpt +++ b/ext/mbstring/tests/mb_split.phpt @@ -24,15 +24,15 @@ mbstring.func_overload=0 } } - var_dump( mb_split( b" ", b"a b c d e f g" ) - == mb_split( b"[[:space:]]", b"a\nb\tc\nd e f g" ) ); + var_dump( mb_split( " ", "a b c d e f g" ) + == mb_split( "[[:space:]]", "a\nb\tc\nd e f g" ) ); for ( $i = 1; $i < 5; ++$i ) { - verify_split( b" ", b"a\tb\tc\td e\tf g", $i ); + verify_split( " ", "a\tb\tc\td e\tf g", $i ); } for ( $i = 1; $i < 5; ++$i ) { - verify_split( b"\xa1\xa1+", b"\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1", $i ); + verify_split( "\xa1\xa1+", "\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1", $i ); } ?> diff --git a/ext/mbstring/tests/mb_stripos.phpt b/ext/mbstring/tests/mb_stripos.phpt index 8268872223..ac84b58242 100644 --- a/ext/mbstring/tests/mb_stripos.phpt +++ b/ext/mbstring/tests/mb_stripos.phpt @@ -12,7 +12,7 @@ include_once('common.inc'); // Test string -$euc_jp = b'0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。'; +$euc_jp = '0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。'; $slen = mb_strlen($euc_jp, 'EUC-JP'); echo "String len: $slen\n"; @@ -22,12 +22,12 @@ mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n"); echo "== POSITIVE OFFSET ==\n"; -print mb_stripos($euc_jp, b'日本語', 0, 'EUC-JP') . "\n"; -print mb_stripos($euc_jp, b'0', 0, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '日本語', 0, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '0', 0, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 3, 0, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 0, 0, 'EUC-JP') . "\n"; -print mb_stripos($euc_jp, b'日本語', 15, 'EUC-JP') . "\n"; -print mb_stripos($euc_jp, b'0', 15, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '日本語', 15, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '0', 15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 3, 15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 0, 15, 'EUC-JP') . "\n"; @@ -35,8 +35,8 @@ print mb_stripos($euc_jp, 0, 15, 'EUC-JP') . "\n"; // Negative offset echo "== NEGATIVE OFFSET ==\n"; -print mb_stripos($euc_jp, b'日本語', -15, 'EUC-JP') . "\n"; -print mb_stripos($euc_jp, b'0', -15, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '日本語', -15, 'EUC-JP') . "\n"; +print mb_stripos($euc_jp, '0', -15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 3, -15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 0, -15, 'EUC-JP') . "\n"; print mb_stripos($euc_jp, 0, -43, 'EUC-JP') . "\n"; @@ -45,19 +45,19 @@ print mb_stripos($euc_jp, 0, -43, 'EUC-JP') . "\n"; // Invalid offset - should return false with warning print ("== INVALID OFFSET ==\n"); -$r = mb_stripos($euc_jp, b'日本語', 44, 'EUC-JP'); +$r = mb_stripos($euc_jp, '日本語', 44, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_stripos($euc_jp, b'日本語', 50, 'EUC-JP'); +$r = mb_stripos($euc_jp, '日本語', 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_stripos($euc_jp, b'0', 50, 'EUC-JP'); +$r = mb_stripos($euc_jp, '0', 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_stripos($euc_jp, 3, 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_stripos($euc_jp, 0, 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_stripos($euc_jp, b'日本語', -50, 'EUC-JP'); +$r = mb_stripos($euc_jp, '日本語', -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_stripos($euc_jp, b'0', -50, 'EUC-JP'); +$r = mb_stripos($euc_jp, '0', -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_stripos($euc_jp, 3, -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; @@ -69,17 +69,17 @@ $r = mb_stripos($euc_jp, 0, -44, 'EUC-JP'); // Out of range - should return false print ("== OUT OF RANGE ==\n"); -$r = mb_stripos($euc_jp, b'日本語', 40, 'EUC-JP'); +$r = mb_stripos($euc_jp, '日本語', 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_stripos($euc_jp, b'0', 40, 'EUC-JP'); +$r = mb_stripos($euc_jp, '0', 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_stripos($euc_jp, 3, 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_stripos($euc_jp, 0, 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_stripos($euc_jp, b'日本語', -3, 'EUC-JP'); +$r = mb_stripos($euc_jp, '日本語', -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_stripos($euc_jp, b'0', -3, 'EUC-JP'); +$r = mb_stripos($euc_jp, '0', -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_stripos($euc_jp, 3, -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; @@ -90,9 +90,9 @@ $r = mb_stripos($euc_jp, 0, -3, 'EUC-JP'); // Non-existent echo "== NON-EXISTENT ==\n"; -$r = mb_stripos($euc_jp, b'韓国語', 0, 'EUC-JP'); +$r = mb_stripos($euc_jp, '韓国語', 0, 'EUC-JP'); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_stripos($euc_jp, b"\n", 0, 'EUC-JP'); +$r = mb_stripos($euc_jp, "\n", 0, 'EUC-JP'); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; @@ -101,14 +101,14 @@ echo "== NO ENCODING PARAMETER ==\n"; mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n"); -print mb_stripos($euc_jp, b'日本語', 0) . "\n"; -print mb_stripos($euc_jp, b'0', 0) . "\n"; +print mb_stripos($euc_jp, '日本語', 0) . "\n"; +print mb_stripos($euc_jp, '0', 0) . "\n"; print mb_stripos($euc_jp, 3, 0) . "\n"; print mb_stripos($euc_jp, 0, 0) . "\n"; -$r = mb_stripos($euc_jp, b'韓国語', 0); +$r = mb_stripos($euc_jp, '韓国語', 0); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_stripos($euc_jp, b"\n", 0); +$r = mb_stripos($euc_jp, "\n", 0); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; // EUC-JP - No offset and encoding parameter @@ -116,14 +116,14 @@ echo "== NO OFFSET AND ENCODING PARAMETER ==\n"; mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n"); -print mb_stripos($euc_jp, b'日本語') . "\n"; -print mb_stripos($euc_jp, b'0') . "\n"; +print mb_stripos($euc_jp, '日本語') . "\n"; +print mb_stripos($euc_jp, '0') . "\n"; print mb_stripos($euc_jp, 3) . "\n"; print mb_stripos($euc_jp, 0) . "\n"; -$r = mb_stripos($euc_jp, b'韓国語'); +$r = mb_stripos($euc_jp, '韓国語'); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_stripos($euc_jp, b"\n"); +$r = mb_stripos($euc_jp, "\n"); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt index bb33bb1076..e061d8f7cc 100644 --- a/ext/mbstring/tests/mb_stripos_basic.phpt +++ b/ext/mbstring/tests/mb_stripos_basic.phpt @@ -23,26 +23,26 @@ mb_internal_encoding('UTF-8'); //ascii strings $ascii_haystacks = array( - b'abc defabc def', - b'ABC DEFABC DEF', - b'Abc dEFaBC Def', + 'abc defabc def', + 'ABC DEFABC DEF', + 'Abc dEFaBC Def', ); $ascii_needles = array( // 4 good ones - b'DE', - b'de', - b'De', - b'dE', + 'DE', + 'de', + 'De', + 'dE', //flag a swap between good and bad '!', // 4 bad ones - b'df', - b'Df', - b'dF', - b'DF' + 'df', + 'Df', + 'dF', + 'DF' ); //greek strings in UTF-8 diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt index f9131d9879..76a6cc5066 100644 --- a/ext/mbstring/tests/mb_stripos_basic2.phpt +++ b/ext/mbstring/tests/mb_stripos_basic2.phpt @@ -23,17 +23,17 @@ mb_internal_encoding('UTF-8'); //ascii strings $ascii_haystacks = array( - b'abc defabc def', - b'ABC DEFABC DEF', - b'Abc dEFaBC Def', + 'abc defabc def', + 'ABC DEFABC DEF', + 'Abc dEFaBC Def', ); $ascii_needles = array( // 4 good ones - b'DE', - b'de', - b'De', - b'dE', + 'DE', + 'de', + 'De', + 'dE', ); //greek strings in UTF-8 diff --git a/ext/mbstring/tests/mb_stripos_error1.phpt b/ext/mbstring/tests/mb_stripos_error1.phpt index 832a8661bd..4187898f01 100644 --- a/ext/mbstring/tests/mb_stripos_error1.phpt +++ b/ext/mbstring/tests/mb_stripos_error1.phpt @@ -22,8 +22,8 @@ echo "*** Testing mb_stripos() : error conditions ***\n"; //Test mb_stripos with one more than the expected number of arguments echo "\n-- Testing mb_stripos() function with more than expected no. of arguments --\n"; -$haystack = b'string_val'; -$needle = b'string_val'; +$haystack = 'string_val'; +$needle = 'string_val'; $offset = 10; $encoding = 'string_val'; $extra_arg = 10; @@ -31,7 +31,7 @@ var_dump( mb_stripos($haystack, $needle, $offset, $encoding, $extra_arg) ); // Testing mb_stripos with one less than the expected number of arguments echo "\n-- Testing mb_stripos() function with less than expected no. of arguments --\n"; -$haystack = b'string_val'; +$haystack = 'string_val'; var_dump( mb_stripos($haystack) ); echo "Done"; diff --git a/ext/mbstring/tests/mb_stripos_error2.phpt b/ext/mbstring/tests/mb_stripos_error2.phpt index c5e5c8d3bd..82b01b92f3 100644 --- a/ext/mbstring/tests/mb_stripos_error2.phpt +++ b/ext/mbstring/tests/mb_stripos_error2.phpt @@ -18,8 +18,8 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this */ echo "*** Testing mb_stripos() : error conditions ***\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $offset = 2; $encoding = 'unknown-encoding'; diff --git a/ext/mbstring/tests/mb_stripos_variation1.phpt b/ext/mbstring/tests/mb_stripos_variation1.phpt index 2fe5c022f2..39837aa080 100644 --- a/ext/mbstring/tests/mb_stripos_variation1.phpt +++ b/ext/mbstring/tests/mb_stripos_variation1.phpt @@ -20,7 +20,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this echo "*** Testing mb_stripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'string_val'; +$needle = 'string_val'; $offset = 0; $encoding = 'utf-8'; diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt index 95c2d08957..32b75467f7 100644 --- a/ext/mbstring/tests/mb_stripos_variation2.phpt +++ b/ext/mbstring/tests/mb_stripos_variation2.phpt @@ -20,7 +20,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this echo "*** Testing mb_stripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; +$haystack = 'string_val'; $offset = 0; $encoding = 'utf-8'; @@ -75,8 +75,8 @@ $inputs = array( '', // string data -/*18*/ b"string", - b'string', +/*18*/ "string", + 'string', $heredoc, // object data diff --git a/ext/mbstring/tests/mb_stripos_variation3.phpt b/ext/mbstring/tests/mb_stripos_variation3.phpt index 69c4a9e53b..9907356ccd 100644 --- a/ext/mbstring/tests/mb_stripos_variation3.phpt +++ b/ext/mbstring/tests/mb_stripos_variation3.phpt @@ -20,8 +20,8 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); echo "*** Testing mb_stripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'A'; -$haystack = b'string_val'; +$needle = 'A'; +$haystack = 'string_val'; $encoding = 'utf-8'; //get an unset variable diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt index a8d36f9e45..dc11b48d38 100644 --- a/ext/mbstring/tests/mb_stripos_variation4.phpt +++ b/ext/mbstring/tests/mb_stripos_variation4.phpt @@ -21,8 +21,8 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this echo "*** Testing mb_stripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; -$needle = b'VaL'; +$haystack = 'string_val'; +$needle = 'VaL'; $offset = 0; //get an unset variable diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt index 8ffcae5c0f..f2f9555a2b 100644 --- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt @@ -22,8 +22,8 @@ mb_internal_encoding('UTF-8'); echo "*** Testing mb_stripos() : usage variations ***\n"; -$string_ascii = b'+Is an English string'; //21 chars -$needle_ascii = b'G'; +$string_ascii = '+Is an English string'; //21 chars +$needle_ascii = 'G'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars $needle_mb = base64_decode('44CC'); diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt index 9340d35117..58a03dcb2c 100644 --- a/ext/mbstring/tests/mb_stristr_basic.phpt +++ b/ext/mbstring/tests/mb_stristr_basic.phpt @@ -17,10 +17,10 @@ echo "*** Testing mb_stristr() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'abcdef'; -$needle_ascii_upper = b"BCD"; -$needle_ascii_mixed = b"bCd"; -$needle_ascii_lower = b"bcd"; +$string_ascii = 'abcdef'; +$needle_ascii_upper = "BCD"; +$needle_ascii_mixed = "bCd"; +$needle_ascii_lower = "bcd"; //Greek string in lower case UTF-8 $string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J'); diff --git a/ext/mbstring/tests/mb_stristr_error1.phpt b/ext/mbstring/tests/mb_stristr_error1.phpt index 8c81b0766d..c20f13470d 100644 --- a/ext/mbstring/tests/mb_stristr_error1.phpt +++ b/ext/mbstring/tests/mb_stristr_error1.phpt @@ -18,8 +18,8 @@ echo "*** Testing mb_stristr() : error conditions ***\n"; //Test mb_stristr with one more than the expected number of arguments echo "\n-- Testing mb_stristr() function with more than expected no. of arguments --\n"; -$haystack = b'string_val'; -$needle = b'string_val'; +$haystack = 'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'string_val'; $extra_arg = 10; @@ -27,7 +27,7 @@ var_dump( mb_stristr($haystack, $needle, $part, $encoding, $extra_arg) ); // Testing mb_stristr with one less than the expected number of arguments echo "\n-- Testing mb_stristr() function with less than expected no. of arguments --\n"; -$haystack = b'string_val'; +$haystack = 'string_val'; var_dump( mb_stristr($haystack) ); ?> diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt index 73f13dc856..74f8bfb4eb 100644 --- a/ext/mbstring/tests/mb_stristr_error2.phpt +++ b/ext/mbstring/tests/mb_stristr_error2.phpt @@ -17,8 +17,8 @@ echo "*** Testing mb_stristr() : error conditions ***\n"; echo "\n-- Testing mb_stristr() with unknown encoding --\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $encoding = 'unknown-encoding'; $part = true; var_dump( mb_stristr($haystack, $needle, $part, $encoding) ); diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt index 9483c379e0..c8c2ae1f68 100644 --- a/ext/mbstring/tests/mb_stristr_variation1.phpt +++ b/ext/mbstring/tests/mb_stristr_variation1.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$needle = b'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt index 0aeea8e68c..498bb3b868 100644 --- a/ext/mbstring/tests/mb_stristr_variation2.phpt +++ b/ext/mbstring/tests/mb_stristr_variation2.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; +$haystack = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_stristr_variation3.phpt b/ext/mbstring/tests/mb_stristr_variation3.phpt index d06ad15070..cc0e648320 100644 --- a/ext/mbstring/tests/mb_stristr_variation3.phpt +++ b/ext/mbstring/tests/mb_stristr_variation3.phpt @@ -25,8 +25,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; -$needle = b'_'; +$haystack = 'string_val'; +$needle = '_'; $encoding = 'utf-8'; //get an unset variable @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_stristr_variation4.phpt b/ext/mbstring/tests/mb_stristr_variation4.phpt index c735e0c7a7..7da3eeced0 100644 --- a/ext/mbstring/tests/mb_stristr_variation4.phpt +++ b/ext/mbstring/tests/mb_stristr_variation4.phpt @@ -25,8 +25,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; -$needle = b'_'; +$haystack = 'string_val'; +$needle = '_'; $part = true; //get an unset variable diff --git a/ext/mbstring/tests/mb_stristr_variation5.phpt b/ext/mbstring/tests/mb_stristr_variation5.phpt index 5d54820100..54d527ecf5 100644 --- a/ext/mbstring/tests/mb_stristr_variation5.phpt +++ b/ext/mbstring/tests/mb_stristr_variation5.phpt @@ -18,10 +18,10 @@ echo "*** Testing mb_stristr() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); //ascii mixed case, multiple needles -$string_ascii = b'abcDef zBcDyx'; -$needle_ascii_upper = b"BCD"; -$needle_ascii_mixed = b"bCd"; -$needle_ascii_lower = b"bcd"; +$string_ascii = 'abcDef zBcDyx'; +$needle_ascii_upper = "BCD"; +$needle_ascii_mixed = "bCd"; +$needle_ascii_lower = "bcd"; //Greek string in mixed case UTF-8 with multiple needles $string_mb = base64_decode('zrrOu868zr3Ovs6fzqDOoSDOus67zpzOnc6+zr/OoA=='); diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt index a5dbe512b3..6214f3069c 100644 --- a/ext/mbstring/tests/mb_strlen_basic.phpt +++ b/ext/mbstring/tests/mb_strlen_basic.phpt @@ -18,7 +18,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b echo "*** Testing mb_strlen() : basic functionality***\n"; -$string_ascii = b'abc def'; +$string_ascii = 'abc def'; //Japanese string in UTF-8 $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); diff --git a/ext/mbstring/tests/mb_strlen_variation1.phpt b/ext/mbstring/tests/mb_strlen_variation1.phpt index 9388c0547d..4af8dc61aa 100644 --- a/ext/mbstring/tests/mb_strlen_variation1.phpt +++ b/ext/mbstring/tests/mb_strlen_variation1.phpt @@ -29,12 +29,12 @@ unset ($unset_var); class classA { public function __toString() { - return b"Class A object"; + return "Class A object"; } } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; @@ -72,8 +72,8 @@ $inputs = array( '', // string data -/*18*/ b"string", - b'string', +/*18*/ "string", + 'string', $heredoc, // object data diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt index 364bc7cc1a..e5a74364ff 100644 --- a/ext/mbstring/tests/mb_strpos.phpt +++ b/ext/mbstring/tests/mb_strpos.phpt @@ -12,7 +12,7 @@ include_once('common.inc'); // Test string -$euc_jp = b'0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。'; +$euc_jp = '0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。'; $slen = mb_strlen($euc_jp, 'EUC-JP'); echo "String len: $slen\n"; @@ -22,12 +22,12 @@ mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n"); echo "== POSITIVE OFFSET ==\n"; -print mb_strpos($euc_jp, b'日本語', 0, 'EUC-JP') . "\n"; -print mb_strpos($euc_jp, b'0', 0, 'EUC-JP') . "\n"; +print mb_strpos($euc_jp, '日本語', 0, 'EUC-JP') . "\n"; +print mb_strpos($euc_jp, '0', 0, 'EUC-JP') . "\n"; print mb_strpos($euc_jp, 3, 0, 'EUC-JP') . "\n"; print mb_strpos($euc_jp, 0, 0, 'EUC-JP') . "\n"; -print mb_strpos($euc_jp, b'日本語', 15, 'EUC-JP') . "\n"; -print mb_strpos($euc_jp, b'0', 15, 'EUC-JP') . "\n"; +print mb_strpos($euc_jp, '日本語', 15, 'EUC-JP') . "\n"; +print mb_strpos($euc_jp, '0', 15, 'EUC-JP') . "\n"; print mb_strpos($euc_jp, 3, 15, 'EUC-JP') . "\n"; print mb_strpos($euc_jp, 0, 15, 'EUC-JP') . "\n"; @@ -35,8 +35,8 @@ print mb_strpos($euc_jp, 0, 15, 'EUC-JP') . "\n"; // Negative offset echo "== NEGATIVE OFFSET ==\n"; -print mb_strpos($euc_jp, b'日本語', -15, 'EUC-JP') . "\n"; -print mb_strpos($euc_jp, b'0', -15, 'EUC-JP') . "\n"; +print mb_strpos($euc_jp, '日本語', -15, 'EUC-JP') . "\n"; +print mb_strpos($euc_jp, '0', -15, 'EUC-JP') . "\n"; print mb_strpos($euc_jp, 3, -15, 'EUC-JP') . "\n"; print mb_strpos($euc_jp, 0, -15, 'EUC-JP') . "\n"; print mb_strpos($euc_jp, 0, -43, 'EUC-JP') . "\n"; @@ -45,19 +45,19 @@ print mb_strpos($euc_jp, 0, -43, 'EUC-JP') . "\n"; // Invalid offset - should return false with warning print ("== INVALID OFFSET ==\n"); -$r = mb_strpos($euc_jp, b'日本語', 44, 'EUC-JP'); +$r = mb_strpos($euc_jp, '日本語', 44, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_strpos($euc_jp, b'日本語', 50, 'EUC-JP'); +$r = mb_strpos($euc_jp, '日本語', 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_strpos($euc_jp, b'0', 50, 'EUC-JP'); +$r = mb_strpos($euc_jp, '0', 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_strpos($euc_jp, 3, 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_strpos($euc_jp, 0, 50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_strpos($euc_jp, b'日本語', -50, 'EUC-JP'); +$r = mb_strpos($euc_jp, '日本語', -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; -$r = mb_strpos($euc_jp, b'0', -50, 'EUC-JP'); +$r = mb_strpos($euc_jp, '0', -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; $r = mb_strpos($euc_jp, 3, -50, 'EUC-JP'); ($r === FALSE) ? print "OK_INVALID_OFFSET\n" : print "NG_INVALID_OFFSET\n"; @@ -69,17 +69,17 @@ $r = mb_strpos($euc_jp, 0, -44, 'EUC-JP'); // Out of range - should return false print ("== OUT OF RANGE ==\n"); -$r = mb_strpos($euc_jp, b'日本語', 40, 'EUC-JP'); +$r = mb_strpos($euc_jp, '日本語', 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_strpos($euc_jp, b'0', 40, 'EUC-JP'); +$r = mb_strpos($euc_jp, '0', 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_strpos($euc_jp, 3, 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_strpos($euc_jp, 0, 40, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_strpos($euc_jp, b'日本語', -3, 'EUC-JP'); +$r = mb_strpos($euc_jp, '日本語', -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; -$r = mb_strpos($euc_jp, b'0', -3, 'EUC-JP'); +$r = mb_strpos($euc_jp, '0', -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; $r = mb_strpos($euc_jp, 3, -3, 'EUC-JP'); ($r === FALSE) ? print "OK_OUT_RANGE\n" : print "NG_OUT_RANGE\n"; @@ -90,9 +90,9 @@ $r = mb_strpos($euc_jp, 0, -3, 'EUC-JP'); // Non-existent echo "== NON-EXISTENT ==\n"; -$r = mb_strpos($euc_jp, b'韓国語', 0, 'EUC-JP'); +$r = mb_strpos($euc_jp, '韓国語', 0, 'EUC-JP'); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_strpos($euc_jp, b"\n", 0, 'EUC-JP'); +$r = mb_strpos($euc_jp, "\n", 0, 'EUC-JP'); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; @@ -101,14 +101,14 @@ echo "== NO ENCODING PARAMETER ==\n"; mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n"); -print mb_strpos($euc_jp, b'日本語', 0) . "\n"; -print mb_strpos($euc_jp, b'0', 0) . "\n"; +print mb_strpos($euc_jp, '日本語', 0) . "\n"; +print mb_strpos($euc_jp, '0', 0) . "\n"; print mb_strpos($euc_jp, 3, 0) . "\n"; print mb_strpos($euc_jp, 0, 0) . "\n"; -$r = mb_strpos($euc_jp, b'韓国語', 0); +$r = mb_strpos($euc_jp, '韓国語', 0); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_strpos($euc_jp, b"\n", 0); +$r = mb_strpos($euc_jp, "\n", 0); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; // EUC-JP - No offset and encoding parameter @@ -116,14 +116,14 @@ echo "== NO OFFSET AND ENCODING PARAMETER ==\n"; mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n"); -print mb_strpos($euc_jp, b'日本語') . "\n"; -print mb_strpos($euc_jp, b'0') . "\n"; +print mb_strpos($euc_jp, '日本語') . "\n"; +print mb_strpos($euc_jp, '0') . "\n"; print mb_strpos($euc_jp, 3) . "\n"; print mb_strpos($euc_jp, 0) . "\n"; -$r = mb_strpos($euc_jp, b'韓国語'); +$r = mb_strpos($euc_jp, '韓国語'); ($r === FALSE) ? print "OK_STR\n" : print "NG_STR\n"; -$r = mb_strpos($euc_jp, b"\n"); +$r = mb_strpos($euc_jp, "\n"); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt index 36641b127b..1197fbadd7 100644 --- a/ext/mbstring/tests/mb_strpos_basic.phpt +++ b/ext/mbstring/tests/mb_strpos_basic.phpt @@ -20,12 +20,12 @@ echo "*** Testing mb_strpos() : basic functionality***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'abc def'; +$string_ascii = 'abc def'; //Japanese string in UTF-8 $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string 1 --\n"; -var_dump(mb_strpos($string_ascii, b'd', 2, 'ISO-8859-1')); +var_dump(mb_strpos($string_ascii, 'd', 2, 'ISO-8859-1')); echo "\n-- ASCII string 2 --\n"; var_dump(mb_strpos($string_ascii, '123')); diff --git a/ext/mbstring/tests/mb_strpos_variation2.phpt b/ext/mbstring/tests/mb_strpos_variation2.phpt index 486b2bb3e5..fb2d7227b9 100644 --- a/ext/mbstring/tests/mb_strpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strpos_variation2.phpt @@ -19,7 +19,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b echo "*** Testing mb_strpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; +$haystack = 'string_val'; $offset = 0; $encoding = 'utf-8'; @@ -31,12 +31,12 @@ unset ($unset_var); class classA { public function __toString() { - return b"Class A object"; + return "Class A object"; } } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; @@ -74,8 +74,8 @@ $inputs = array( '', // string data -/*18*/ b"string", - b'string', +/*18*/ "string", + 'string', $heredoc, // object data diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt index f30b708183..ce43080dc3 100644 --- a/ext/mbstring/tests/mb_strpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strpos_variation3.phpt @@ -20,8 +20,8 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); echo "*** Testing mb_strpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'a'; -$haystack = b'string_val'; +$needle = 'a'; +$haystack = 'string_val'; $encoding = 'utf-8'; //get an unset variable diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt index 4051646ae4..31b43bacb7 100644 --- a/ext/mbstring/tests/mb_strpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strpos_variation4.phpt @@ -20,8 +20,8 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b echo "*** Testing mb_strpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; -$needle = b'val'; +$haystack = 'string_val'; +$needle = 'val'; $offset = 0; //get an unset variable diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt index 23bfa22b61..1dccce6385 100644 --- a/ext/mbstring/tests/mb_strpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strpos_variation5.phpt @@ -22,8 +22,8 @@ mb_internal_encoding('UTF-8'); echo "*** Testing mb_strpos() : usage variations ***\n"; -$string_ascii = b'+Is an English string'; //21 chars -$needle_ascii = b'g'; +$string_ascii = '+Is an English string'; //21 chars +$needle_ascii = 'g'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars $needle_mb = base64_decode('44CC'); diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt index 595d808d4d..8c227487f0 100644 --- a/ext/mbstring/tests/mb_strrchr_basic.phpt +++ b/ext/mbstring/tests/mb_strrchr_basic.phpt @@ -17,18 +17,18 @@ echo "*** Testing mb_strrchr() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'abc def'; +$string_ascii = 'abc def'; //Japanese string in UTF-8 $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string: needle exists --\n"; -var_dump(bin2hex(mb_strrchr($string_ascii, b'd', false, 'ISO-8859-1'))); -var_dump(bin2hex(mb_strrchr($string_ascii, b'd'))); -var_dump(bin2hex(mb_strrchr($string_ascii, b'd', true))); +var_dump(bin2hex(mb_strrchr($string_ascii, 'd', false, 'ISO-8859-1'))); +var_dump(bin2hex(mb_strrchr($string_ascii, 'd'))); +var_dump(bin2hex(mb_strrchr($string_ascii, 'd', true))); echo "\n-- ASCII string: needle doesn't exist --\n"; -var_dump(mb_strrchr($string_ascii, b'123')); +var_dump(mb_strrchr($string_ascii, '123')); echo "\n-- Multibyte string: needle exists --\n"; $needle1 = base64_decode('5pel5pys6Kqe'); diff --git a/ext/mbstring/tests/mb_strrchr_error1.phpt b/ext/mbstring/tests/mb_strrchr_error1.phpt index bb6ff0fab0..42346afbf0 100644 --- a/ext/mbstring/tests/mb_strrchr_error1.phpt +++ b/ext/mbstring/tests/mb_strrchr_error1.phpt @@ -18,8 +18,8 @@ echo "*** Testing mb_strrchr() : error conditions ***\n"; //Test mb_strrchr with one more than the expected number of arguments echo "\n-- Testing mb_strrchr() function with more than expected no. of arguments --\n"; -$haystack = b'string_val'; -$needle = b'string_val'; +$haystack = 'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'string_val'; $extra_arg = 10; @@ -27,7 +27,7 @@ var_dump( mb_strrchr($haystack, $needle, $part, $encoding, $extra_arg) ); // Testing mb_strrchr with one less than the expected number of arguments echo "\n-- Testing mb_strrchr() function with less than expected no. of arguments --\n"; -$haystack = b'string_val'; +$haystack = 'string_val'; var_dump( mb_strrchr($haystack) ); ?> diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt index cfbcd66a09..11abee609b 100644 --- a/ext/mbstring/tests/mb_strrchr_error2.phpt +++ b/ext/mbstring/tests/mb_strrchr_error2.phpt @@ -17,8 +17,8 @@ echo "*** Testing mb_strrchr() : error conditions ***\n"; echo "\n-- Testing mb_strrchr() with unknown encoding --\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $encoding = 'unknown-encoding'; $part = true; var_dump( mb_strrchr($haystack, $needle, $part, $encoding) ); diff --git a/ext/mbstring/tests/mb_strrchr_variation1.phpt b/ext/mbstring/tests/mb_strrchr_variation1.phpt index a0952a87ea..7284939a57 100644 --- a/ext/mbstring/tests/mb_strrchr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation1.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$needle = b'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strrchr_variation2.phpt b/ext/mbstring/tests/mb_strrchr_variation2.phpt index c368bd8c9d..074cdda108 100644 --- a/ext/mbstring/tests/mb_strrchr_variation2.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation2.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; +$haystack = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strrchr_variation3.phpt b/ext/mbstring/tests/mb_strrchr_variation3.phpt index ad9c4e356d..c93895c7a5 100644 --- a/ext/mbstring/tests/mb_strrchr_variation3.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation3.phpt @@ -25,8 +25,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; -$needle = b'_'; +$haystack = 'string_val'; +$needle = '_'; $encoding = 'utf-8'; //get an unset variable @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strrchr_variation4.phpt b/ext/mbstring/tests/mb_strrchr_variation4.phpt index f9dadab5f0..a85979c988 100644 --- a/ext/mbstring/tests/mb_strrchr_variation4.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation4.phpt @@ -25,8 +25,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; -$needle = b'_'; +$haystack = 'string_val'; +$needle = '_'; $part = true; //get an unset variable diff --git a/ext/mbstring/tests/mb_strrchr_variation5.phpt b/ext/mbstring/tests/mb_strrchr_variation5.phpt index 84a73a2f52..fa37db646c 100644 --- a/ext/mbstring/tests/mb_strrchr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation5.phpt @@ -18,8 +18,8 @@ echo "*** Testing mb_strrchr() : variation ***\n"; mb_internal_encoding('UTF-8'); //with repeated needles -$string_ascii = b'abcdef zbcdyx'; -$needle_ascii = b"bcd"; +$string_ascii = 'abcdef zbcdyx'; +$needle_ascii = "bcd"; //Japanese string in UTF-8 with repeated needles $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OIMzTvvJXvvJbml6XmnKzoqp7jg4bjgq3jgrnjg4g='); diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt index 86009496e1..2c941c5114 100644 --- a/ext/mbstring/tests/mb_strrchr_variation6.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt @@ -18,10 +18,10 @@ echo "*** Testing mb_strrchr() : variation ***\n"; mb_internal_encoding('UTF-8'); //ascii -$string_ascii = b'abcdef'; -$needle_ascii_upper = b"BCD"; -$needle_ascii_mixed = b"bCd"; -$needle_ascii_lower = b"bcd"; +$string_ascii = 'abcdef'; +$needle_ascii_upper = "BCD"; +$needle_ascii_mixed = "bCd"; +$needle_ascii_lower = "bcd"; //Greek string in lower case UTF-8 $string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J'); diff --git a/ext/mbstring/tests/mb_strrichr_basic.phpt b/ext/mbstring/tests/mb_strrichr_basic.phpt index 5a38e6506f..2670de774c 100644 --- a/ext/mbstring/tests/mb_strrichr_basic.phpt +++ b/ext/mbstring/tests/mb_strrichr_basic.phpt @@ -17,10 +17,10 @@ echo "*** Testing mb_strrichr() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'abcdef'; -$needle_ascii_upper = b"BCD"; -$needle_ascii_mixed = b"bCd"; -$needle_ascii_lower = b"bcd"; +$string_ascii = 'abcdef'; +$needle_ascii_upper = "BCD"; +$needle_ascii_mixed = "bCd"; +$needle_ascii_lower = "bcd"; //Greek string in lower case UTF-8 $string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J'); @@ -35,7 +35,7 @@ var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_mixed, true))); echo "\n-- ASCII string: needle doesn't exist --\n"; -var_dump(mb_strrichr($string_ascii, b'123')); +var_dump(mb_strrichr($string_ascii, '123')); echo "\n-- Multibyte string: needle exists --\n"; var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_upper))); diff --git a/ext/mbstring/tests/mb_strrichr_error1.phpt b/ext/mbstring/tests/mb_strrichr_error1.phpt index 01d33f342f..7280c53085 100644 --- a/ext/mbstring/tests/mb_strrichr_error1.phpt +++ b/ext/mbstring/tests/mb_strrichr_error1.phpt @@ -18,8 +18,8 @@ echo "*** Testing mb_strrichr() : error conditions ***\n"; //Test mb_strrichr with one more than the expected number of arguments echo "\n-- Testing mb_strrichr() function with more than expected no. of arguments --\n"; -$haystack = b'string_val'; -$needle = b'string_val'; +$haystack = 'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'string_val'; $extra_arg = 10; @@ -27,7 +27,7 @@ var_dump( mb_strrichr($haystack, $needle, $part, $encoding, $extra_arg) ); // Testing mb_strrichr with one less than the expected number of arguments echo "\n-- Testing mb_strrichr() function with less than expected no. of arguments --\n"; -$haystack = b'string_val'; +$haystack = 'string_val'; var_dump( mb_strrichr($haystack) ); ?> diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt index e8f98ef442..b1877db9c1 100644 --- a/ext/mbstring/tests/mb_strrichr_error2.phpt +++ b/ext/mbstring/tests/mb_strrichr_error2.phpt @@ -17,8 +17,8 @@ echo "*** Testing mb_strrichr() : error conditions ***\n"; echo "\n-- Testing mb_strrichr() with unknown encoding --\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $encoding = 'unknown-encoding'; $part = true; var_dump( mb_strrichr($haystack, $needle, $part, $encoding) ); diff --git a/ext/mbstring/tests/mb_strrichr_variation1.phpt b/ext/mbstring/tests/mb_strrichr_variation1.phpt index e350718e77..06ca5e31c9 100644 --- a/ext/mbstring/tests/mb_strrichr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation1.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$needle = b'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strrichr_variation2.phpt b/ext/mbstring/tests/mb_strrichr_variation2.phpt index 3300ea5a61..e2c979b428 100644 --- a/ext/mbstring/tests/mb_strrichr_variation2.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation2.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; +$haystack = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strrichr_variation3.phpt b/ext/mbstring/tests/mb_strrichr_variation3.phpt index b57f309022..3949c148d1 100644 --- a/ext/mbstring/tests/mb_strrichr_variation3.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation3.phpt @@ -25,8 +25,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; -$needle = b'_'; +$haystack = 'string_val'; +$needle = '_'; $encoding = 'utf-8'; //get an unset variable diff --git a/ext/mbstring/tests/mb_strrichr_variation4.phpt b/ext/mbstring/tests/mb_strrichr_variation4.phpt index 2d04665884..f9d9f68037 100644 --- a/ext/mbstring/tests/mb_strrichr_variation4.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation4.phpt @@ -25,8 +25,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; -$needle = b'_'; +$haystack = 'string_val'; +$needle = '_'; $part = true; //get an unset variable diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt index 417f53fde6..0e5d472fd8 100644 --- a/ext/mbstring/tests/mb_strrichr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt @@ -18,10 +18,10 @@ echo "*** Testing mb_strrichr() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); //ascii mixed case, multiple needles -$string_ascii = b'abcDef zBcDyx'; -$needle_ascii_upper = b"BCD"; -$needle_ascii_mixed = b"bCd"; -$needle_ascii_lower = b"bcd"; +$string_ascii = 'abcDef zBcDyx'; +$needle_ascii_upper = "BCD"; +$needle_ascii_mixed = "bCd"; +$needle_ascii_lower = "bcd"; //Greek string in mixed case UTF-8 with multiple needles $string_mb = base64_decode('zrrOu868zr3Ovs6fzqDOoSDOus67zpzOnc6+zr/OoA=='); diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt index 32787a6eb9..c9e1ff84fc 100644 --- a/ext/mbstring/tests/mb_strripos_basic.phpt +++ b/ext/mbstring/tests/mb_strripos_basic.phpt @@ -23,26 +23,26 @@ mb_internal_encoding('UTF-8'); //ascii strings $ascii_haystacks = array( - b'abc defabc def', - b'ABC DEFABC DEF', - b'Abc dEFaBC Def', + 'abc defabc def', + 'ABC DEFABC DEF', + 'Abc dEFaBC Def', ); $ascii_needles = array( // 4 good ones - b'DE', - b'de', - b'De', - b'dE', + 'DE', + 'de', + 'De', + 'dE', //flag a swap between good and bad '!', // 4 bad ones - b'df', - b'Df', - b'dF', - b'DF' + 'df', + 'Df', + 'dF', + 'DF' ); //greek strings in UTF-8 diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt index 9d7befc931..b330323c7e 100644 --- a/ext/mbstring/tests/mb_strripos_basic2.phpt +++ b/ext/mbstring/tests/mb_strripos_basic2.phpt @@ -23,17 +23,17 @@ mb_internal_encoding('UTF-8'); //ascii strings $ascii_haystacks = array( - b'abc defabc def', - b'ABC DEFABC DEF', - b'Abc dEFaBC Def', + 'abc defabc def', + 'ABC DEFABC DEF', + 'Abc dEFaBC Def', ); $ascii_needles = array( // 4 good ones - b'DE', - b'de', - b'De', - b'dE', + 'DE', + 'de', + 'De', + 'dE', ); //greek strings in UTF-8 diff --git a/ext/mbstring/tests/mb_strripos_error1.phpt b/ext/mbstring/tests/mb_strripos_error1.phpt index 955482b66f..3e2f6d928d 100644 --- a/ext/mbstring/tests/mb_strripos_error1.phpt +++ b/ext/mbstring/tests/mb_strripos_error1.phpt @@ -22,8 +22,8 @@ echo "*** Testing mb_strripos() : error conditions ***\n"; //Test mb_strripos with one more than the expected number of arguments echo "\n-- Testing mb_strripos() function with more than expected no. of arguments --\n"; -$haystack = b'string_val'; -$needle = b'string_val'; +$haystack = 'string_val'; +$needle = 'string_val'; $offset = 10; $encoding = 'string_val'; $extra_arg = 10; @@ -31,7 +31,7 @@ var_dump( mb_strripos($haystack, $needle, $offset, $encoding, $extra_arg) ); // Testing mb_strripos with one less than the expected number of arguments echo "\n-- Testing mb_strripos() function with less than expected no. of arguments --\n"; -$haystack = b'string_val'; +$haystack = 'string_val'; var_dump( mb_strripos($haystack) ); echo "Done"; diff --git a/ext/mbstring/tests/mb_strripos_error2.phpt b/ext/mbstring/tests/mb_strripos_error2.phpt index 4790ffbcb5..d01a774107 100644 --- a/ext/mbstring/tests/mb_strripos_error2.phpt +++ b/ext/mbstring/tests/mb_strripos_error2.phpt @@ -18,8 +18,8 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th */ echo "*** Testing mb_strripos() : error conditions ***\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $offset = 2; $encoding = 'unknown-encoding'; diff --git a/ext/mbstring/tests/mb_strripos_variation1.phpt b/ext/mbstring/tests/mb_strripos_variation1.phpt index 858705afc2..0a3be0a7da 100644 --- a/ext/mbstring/tests/mb_strripos_variation1.phpt +++ b/ext/mbstring/tests/mb_strripos_variation1.phpt @@ -20,7 +20,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th echo "*** Testing mb_strripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'string_val'; +$needle = 'string_val'; $offset = 0; $encoding = 'utf-8'; @@ -32,12 +32,12 @@ unset ($unset_var); class classA { public function __toString() { - return b"Class A object"; + return "Class A object"; } } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strripos_variation2.phpt b/ext/mbstring/tests/mb_strripos_variation2.phpt index d16c250078..eafe7f79e9 100644 --- a/ext/mbstring/tests/mb_strripos_variation2.phpt +++ b/ext/mbstring/tests/mb_strripos_variation2.phpt @@ -20,7 +20,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th echo "*** Testing mb_strripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; +$haystack = 'string_val'; $offset = 0; $encoding = 'utf-8'; @@ -32,12 +32,12 @@ unset ($unset_var); class classA { public function __toString() { - return b"Class A object"; + return "Class A object"; } } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; @@ -75,8 +75,8 @@ $inputs = array( '', // string data -/*18*/ b"string", - b'string', +/*18*/ "string", + 'string', $heredoc, // object data diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt index d580000463..cc3843e102 100644 --- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt @@ -21,8 +21,8 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); echo "*** Testing mb_strripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'A'; -$haystack = b'string_val'; +$needle = 'A'; +$haystack = 'string_val'; $encoding = 'utf-8'; //get an unset variable @@ -33,12 +33,12 @@ unset ($unset_var); class classA { public function __toString() { - return b"Class A object"; + return "Class A object"; } } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; @@ -76,8 +76,8 @@ $inputs = array( '', // string data -/*18*/ b"string", - b'string', +/*18*/ "string", + 'string', $heredoc, // object data diff --git a/ext/mbstring/tests/mb_strripos_variation4.phpt b/ext/mbstring/tests/mb_strripos_variation4.phpt index c58568b697..27973e51ea 100644 --- a/ext/mbstring/tests/mb_strripos_variation4.phpt +++ b/ext/mbstring/tests/mb_strripos_variation4.phpt @@ -21,8 +21,8 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th echo "*** Testing mb_strripos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'string_val'; -$needle = b'VaL'; +$haystack = 'string_val'; +$needle = 'VaL'; $offset = 0; //get an unset variable diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt index 8bd0e2e8bf..ce3074abf0 100644 --- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt @@ -23,8 +23,8 @@ mb_internal_encoding('UTF-8'); echo "*** Testing mb_strripos() : usage variations ***\n"; -$string_ascii = b'+Is an English string'; //21 chars -$needle_ascii = b'G'; +$string_ascii = '+Is an English string'; //21 chars +$needle_ascii = 'G'; $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars $needle_mb = base64_decode('44CC'); diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt index ec6b86c292..9de0388f43 100644 --- a/ext/mbstring/tests/mb_strrpos_basic.phpt +++ b/ext/mbstring/tests/mb_strrpos_basic.phpt @@ -20,15 +20,15 @@ echo "*** Testing mb_strrpos() : basic ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'This is an English string. 0123456789.'; +$string_ascii = 'This is an English string. 0123456789.'; //Japanese string in UTF-8 $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string 1 --\n"; -var_dump(mb_strrpos($string_ascii, b'is', 4, 'ISO-8859-1')); +var_dump(mb_strrpos($string_ascii, 'is', 4, 'ISO-8859-1')); echo "\n-- ASCII string 2 --\n"; -var_dump(mb_strrpos($string_ascii, b'hello, world')); +var_dump(mb_strrpos($string_ascii, 'hello, world')); echo "\n-- Multibyte string 1 --\n"; $needle1 = base64_decode('44CC'); diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt index 8b1713f9f1..f0e6e47987 100644 --- a/ext/mbstring/tests/mb_strrpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt @@ -19,7 +19,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this echo "*** Testing mb_strrpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'world'; +$needle = 'world'; $offset = 0; $encoding = 'utf-8'; @@ -31,12 +31,12 @@ unset ($unset_var); class classA { public function __toString() { - return b"hello, world"; + return "hello, world"; } } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello, world EOT; @@ -74,8 +74,8 @@ $inputs = array( '', // string data -/*18*/ b"hello, world", - b'hello, world', +/*18*/ "hello, world", + 'hello, world', $heredoc, // object data diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt index 95840f9e73..da28d6ed7c 100644 --- a/ext/mbstring/tests/mb_strrpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt @@ -19,8 +19,8 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this echo "*** Testing mb_strrpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$needle = b'a'; -$haystack = b'string_val'; +$needle = 'a'; +$haystack = 'string_val'; $encoding = 'utf-8'; //get an unset variable @@ -31,12 +31,12 @@ unset ($unset_var); class classA { public function __toString() { - return b"7"; + return "7"; } } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt index 9d9a5f2358..287142793b 100644 --- a/ext/mbstring/tests/mb_strrpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt @@ -20,8 +20,8 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this echo "*** Testing mb_strrpos() : usage variations ***\n"; // Initialise function arguments not being substituted -$haystack = b'hello, world'; -$needle = b'world'; +$haystack = 'hello, world'; +$needle = 'world'; $offset = 0; //get an unset variable diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt index efa11056a1..2b41707a6a 100644 --- a/ext/mbstring/tests/mb_strstr_basic.phpt +++ b/ext/mbstring/tests/mb_strstr_basic.phpt @@ -17,18 +17,18 @@ echo "*** Testing mb_strstr() : basic functionality ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'abc def'; +$string_ascii = 'abc def'; //Japanese string in UTF-8 $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); echo "\n-- ASCII string: needle exists --\n"; -var_dump(bin2hex(mb_strstr($string_ascii, b'd', false, 'ISO-8859-1'))); -var_dump(bin2hex(mb_strstr($string_ascii, b'd'))); -var_dump(bin2hex(mb_strstr($string_ascii, b'd', true))); +var_dump(bin2hex(mb_strstr($string_ascii, 'd', false, 'ISO-8859-1'))); +var_dump(bin2hex(mb_strstr($string_ascii, 'd'))); +var_dump(bin2hex(mb_strstr($string_ascii, 'd', true))); echo "\n-- ASCII string: needle doesn't exist --\n"; -var_dump(mb_strstr($string_ascii, b'123')); +var_dump(mb_strstr($string_ascii, '123')); echo "\n-- Multibyte string: needle exists --\n"; $needle1 = base64_decode('5pel5pys6Kqe'); diff --git a/ext/mbstring/tests/mb_strstr_error1.phpt b/ext/mbstring/tests/mb_strstr_error1.phpt index ffbb636160..cf7c0b1f17 100644 --- a/ext/mbstring/tests/mb_strstr_error1.phpt +++ b/ext/mbstring/tests/mb_strstr_error1.phpt @@ -18,8 +18,8 @@ echo "*** Testing mb_strstr() : error conditions ***\n"; //Test mb_strstr with one more than the expected number of arguments echo "\n-- Testing mb_strstr() function with more than expected no. of arguments --\n"; -$haystack = b'string_val'; -$needle = b'string_val'; +$haystack = 'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'string_val'; $extra_arg = 10; @@ -27,7 +27,7 @@ var_dump( mb_strstr($haystack, $needle, $part, $encoding, $extra_arg) ); // Testing mb_strstr with one less than the expected number of arguments echo "\n-- Testing mb_strstr() function with less than expected no. of arguments --\n"; -$haystack = b'string_val'; +$haystack = 'string_val'; var_dump( mb_strstr($haystack) ); ?> diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt index 163c80026a..8df700080e 100644 --- a/ext/mbstring/tests/mb_strstr_error2.phpt +++ b/ext/mbstring/tests/mb_strstr_error2.phpt @@ -17,8 +17,8 @@ echo "*** Testing mb_strstr() : error conditions ***\n"; echo "\n-- Testing mb_strstr() with unknown encoding --\n"; -$haystack = b'Hello, world'; -$needle = b'world'; +$haystack = 'Hello, world'; +$needle = 'world'; $encoding = 'unknown-encoding'; $part = true; var_dump( mb_strstr($haystack, $needle, $part, $encoding) ); diff --git a/ext/mbstring/tests/mb_strstr_variation1.phpt b/ext/mbstring/tests/mb_strstr_variation1.phpt index 826014feae..a9406f1cad 100644 --- a/ext/mbstring/tests/mb_strstr_variation1.phpt +++ b/ext/mbstring/tests/mb_strstr_variation1.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$needle = b'string_val'; +$needle = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strstr_variation2.phpt b/ext/mbstring/tests/mb_strstr_variation2.phpt index 18820bab0f..8c059cb6b2 100644 --- a/ext/mbstring/tests/mb_strstr_variation2.phpt +++ b/ext/mbstring/tests/mb_strstr_variation2.phpt @@ -25,7 +25,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; +$haystack = 'string_val'; $part = true; $encoding = 'utf-8'; @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strstr_variation3.phpt b/ext/mbstring/tests/mb_strstr_variation3.phpt index 7a8b7c6757..6bb1c88729 100644 --- a/ext/mbstring/tests/mb_strstr_variation3.phpt +++ b/ext/mbstring/tests/mb_strstr_variation3.phpt @@ -25,8 +25,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; -$needle = b'_'; +$haystack = 'string_val'; +$needle = '_'; $encoding = 'utf-8'; //get an unset variable @@ -37,7 +37,7 @@ unset ($unset_var); class classWithToString { public function __toString() { - return b"Class A object"; + return "Class A object"; } } @@ -46,7 +46,7 @@ class classWithoutToString } // heredoc string -$heredoc = b<<<EOT +$heredoc = <<<EOT hello world EOT; diff --git a/ext/mbstring/tests/mb_strstr_variation4.phpt b/ext/mbstring/tests/mb_strstr_variation4.phpt index e13428f633..8a0efcba8e 100644 --- a/ext/mbstring/tests/mb_strstr_variation4.phpt +++ b/ext/mbstring/tests/mb_strstr_variation4.phpt @@ -25,8 +25,8 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { set_error_handler('test_error_handler'); // Initialise function arguments not being substituted (if any) -$haystack = b'string_val'; -$needle = b'_'; +$haystack = 'string_val'; +$needle = '_'; $part = true; //get an unset variable diff --git a/ext/mbstring/tests/mb_strstr_variation5.phpt b/ext/mbstring/tests/mb_strstr_variation5.phpt index 3bfbd61642..ab6315be44 100644 --- a/ext/mbstring/tests/mb_strstr_variation5.phpt +++ b/ext/mbstring/tests/mb_strstr_variation5.phpt @@ -18,8 +18,8 @@ echo "*** Testing mb_strstr() : variation ***\n"; mb_internal_encoding('UTF-8'); //with repeated needles -$string_ascii = b'abcdef zbcdyx'; -$needle_ascii = b"bcd"; +$string_ascii = 'abcdef zbcdyx'; +$needle_ascii = "bcd"; //Japanese string in UTF-8 with repeated needles $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OIMzTvvJXvvJbml6XmnKzoqp7jg4bjgq3jgrnjg4g='); diff --git a/ext/mbstring/tests/mb_strstr_variation6.phpt b/ext/mbstring/tests/mb_strstr_variation6.phpt index 1242e02d17..d00f15cfa3 100644 --- a/ext/mbstring/tests/mb_strstr_variation6.phpt +++ b/ext/mbstring/tests/mb_strstr_variation6.phpt @@ -18,10 +18,10 @@ echo "*** Testing mb_strstr() : variation ***\n"; mb_internal_encoding('UTF-8'); //ascii -$string_ascii = b'abcdef'; -$needle_ascii_upper = b"BCD"; -$needle_ascii_mixed = b"bCd"; -$needle_ascii_lower = b"bcd"; +$string_ascii = 'abcdef'; +$needle_ascii_upper = "BCD"; +$needle_ascii_mixed = "bCd"; +$needle_ascii_lower = "bcd"; //Greek string in lower case UTF-8 $string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J'); diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt index 293c9559a9..43d0f53728 100644 --- a/ext/mbstring/tests/mb_strtolower_variation2.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt @@ -20,7 +20,7 @@ function_exists('mb_strtolower') or die("skip mb_strtolower() is not available i echo "*** Testing mb_strtolower() : usage variations ***\n"; // Initialise function arguments not being substituted -$sourcestring = b'Hello, World'; +$sourcestring = 'Hello, World'; //get an unset variable $unset_var = 10; diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt index 37357a1898..f08b508798 100644 --- a/ext/mbstring/tests/mb_strtolower_variation4.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt @@ -18,10 +18,10 @@ function_exists('mb_strtolower') or die("skip mb_strtolower() is not available i echo "*** Testing mb_strtolower() : usage variations ***\n"; -$uppers = array('Basic Latin' => b'ABCDEFGHIJKLMNOPQRSTUVWXYZ', +$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='), 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw==')); -$lowers = array('Basic Latin' => b'abcdefghijklmnopqrstuvwxyz', +$lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz', 'Characters With Accents' => base64_decode('w6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XDtg=='), 'Russian' => base64_decode('0LDQsdCy0LPQtNC10LbQtw==')); diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt index e77646923c..e8f48345fe 100644 --- a/ext/mbstring/tests/mb_strtoupper_basic.phpt +++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt @@ -19,8 +19,8 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i echo "*** Testing mb_strtoupper() : basic functionality ***\n"; mb_internal_encoding('utf-8'); -$ascii_lower = b'abcdefghijklmnopqrstuvwxyz'; -$ascii_upper = b'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; +$ascii_lower = 'abcdefghijklmnopqrstuvwxyz'; +$ascii_upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; $greek_lower = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J'); $greek_upper = base64_decode('zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p'); diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt index 035cd63f49..52beb3d741 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt @@ -20,7 +20,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i echo "*** Testing mb_strtoupper() : usage variations ***\n"; // Initialise function arguments not being substituted -$sourcestring = b'Hello, World'; +$sourcestring = 'Hello, World'; //get an unset variable $unset_var = 10; diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt index 7d91c8a2de..8f5abe7269 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt @@ -19,10 +19,10 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i echo "*** Testing mb_strtoupper() : usage variations ***\n"; -$uppers = array('Basic Latin' => b'ABCDEFGHIJKLMNOPQRSTUVWXYZ', +$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='), 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw==')); -$lowers = array('Basic Latin' => b'abcdefghijklmnopqrstuvwxyz', +$lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz', 'Characters With Accents' => base64_decode('w6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XDtg=='), 'Russian' => base64_decode('0LDQsdCy0LPQtNC10LbQtw==')); diff --git a/ext/mbstring/tests/mb_substr.phpt b/ext/mbstring/tests/mb_substr.phpt index d9269c3777..94a0d8e368 100644 --- a/ext/mbstring/tests/mb_substr.phpt +++ b/ext/mbstring/tests/mb_substr.phpt @@ -12,7 +12,7 @@ ini_set('include_path','.'); include_once('common.inc'); // EUC-JP -$euc_jp = b'0123この文字列は日本語です。EUC-JPを使っています。日本語は面倒臭い。'; +$euc_jp = '0123この文字列は日本語です。EUC-JPを使っています。日本語は面倒臭い。'; print "1: ". bin2hex(mb_substr($euc_jp, 10, 10,'EUC-JP')) . "\n"; print "2: ". bin2hex(mb_substr($euc_jp, 0, 100,'EUC-JP')) . "\n"; diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt index 65c8769b0b..d2e7a60566 100644 --- a/ext/mbstring/tests/mb_substr_count_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt @@ -20,8 +20,8 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab echo "*** Testing mb_substr_count() : usage variations ***\n"; // Initialise function arguments not being substituted (if any) -$haystack = b'hello, world'; -$needle = b'world'; +$haystack = 'hello, world'; +$needle = 'world'; //get an unset variable $unset_var = 10; diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt index 624c95a956..21c9f956fb 100644 --- a/ext/mbstring/tests/mb_substr_count_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt @@ -22,8 +22,8 @@ echo "*** Testing mb_substr_count() : usage variations ***\n"; echo "\n-- ASCII String --\n"; -$string_ascii = b'abcabcabc'; -var_dump(mb_substr_count($string_ascii, b'abcabc')); //needle overlaps in haystack +$string_ascii = 'abcabcabc'; +var_dump(mb_substr_count($string_ascii, 'abcabc')); //needle overlaps in haystack echo "\n-- Multibyte String --\n"; $string_mb = base64_decode('5pel5pys6Kqe5pel5pys6Kqe5pel5pys6Kqe'); diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt index 7c02601f17..7c763f3616 100644 --- a/ext/mbstring/tests/mb_substr_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_variation2.phpt @@ -20,7 +20,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b echo "*** Testing mb_substr() : usage variations ***\n"; // Initialise function arguments not being substituted -$str = b'string_val'; +$str = 'string_val'; $start = 1; $length = 5; diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt index c4a723a0a1..ce4df53005 100644 --- a/ext/mbstring/tests/mb_substr_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_variation4.phpt @@ -20,7 +20,7 @@ echo "*** Testing mb_substr() : usage variations ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'+Is an English string'; //21 chars +$string_ascii = '+Is an English string'; //21 chars $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt index 11caa9cab3..1ec92be993 100644 --- a/ext/mbstring/tests/mb_substr_variation5.phpt +++ b/ext/mbstring/tests/mb_substr_variation5.phpt @@ -20,7 +20,7 @@ echo "*** Testing mb_substr() : usage variations ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'+Is an English string'; //21 chars +$string_ascii = '+Is an English string'; //21 chars //Japanese string, 21 characters $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt index 20ee1ec156..aa75c70c00 100644 --- a/ext/mbstring/tests/mb_substr_variation6.phpt +++ b/ext/mbstring/tests/mb_substr_variation6.phpt @@ -20,7 +20,7 @@ echo "*** Testing mb_substr() : usage variations ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'+Is an English string'; //21 chars +$string_ascii = '+Is an English string'; //21 chars $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt index 4d68097df6..22b5fa2fe3 100644 --- a/ext/mbstring/tests/mb_substr_variation7.phpt +++ b/ext/mbstring/tests/mb_substr_variation7.phpt @@ -20,7 +20,7 @@ echo "*** Testing mb_substr() : usage variations ***\n"; mb_internal_encoding('UTF-8'); -$string_ascii = b'+Is an English string'; //21 chars +$string_ascii = '+Is an English string'; //21 chars //Japanese string, 21 characters $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); |