diff options
Diffstat (limited to 'ext/mbstring')
186 files changed, 509 insertions, 509 deletions
diff --git a/ext/mbstring/tests/bug43840.phpt b/ext/mbstring/tests/bug43840.phpt index b2dd048186..9cf7cacdb9 100644 --- a/ext/mbstring/tests/bug43840.phpt +++ b/ext/mbstring/tests/bug43840.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt index c4be058ffa..753842cac4 100644 --- a/ext/mbstring/tests/bug43841.phpt +++ b/ext/mbstring/tests/bug43841.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/bug43994.phpt b/ext/mbstring/tests/bug43994.phpt index b2fd867da9..e9a11d054e 100644 --- a/ext/mbstring/tests/bug43994.phpt +++ b/ext/mbstring/tests/bug43994.phpt @@ -8,12 +8,12 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ /* - * mb_ereg 'successfully' matching incorrectly: + * mb_ereg 'successfully' matching incorrectly: * Bug now seems to be fixed - error message is now generated when an 'empty' * pattern is supplied to mb_ereg. Similar error message to ereg(). */ @@ -38,7 +38,7 @@ foreach($inputs as $input) { }; ?> ---EXPECTF-- +--EXPECTF-- -- Iteration 1 -- Without $regs arg: diff --git a/ext/mbstring/tests/bug46806.phpt b/ext/mbstring/tests/bug46806.phpt index eec44b5232..ea00035c0f 100644 --- a/ext/mbstring/tests/bug46806.phpt +++ b/ext/mbstring/tests/bug46806.phpt @@ -3,7 +3,7 @@ Bug #46806 (mb_wtrimwidth cutting to early) --CREDITS-- Sebastian Sch端rmann sebs@php.net -Testfest 2009 +Testfest 2009 --SKIPIF-- <?php if (!extension_loaded("mbstring")) die("skip mbstring is not available"); ?> --FILE-- diff --git a/ext/mbstring/tests/bug65045.phpt b/ext/mbstring/tests/bug65045.phpt index 03a090ded2..002c5ed174 100644 --- a/ext/mbstring/tests/bug65045.phpt +++ b/ext/mbstring/tests/bug65045.phpt @@ -17,7 +17,7 @@ $expected2 = "\xF0\xA4\xAD\xA2"."\xF0\xA4\xAD\xA2"."\xEF\xBF\xBD"; mb_substitute_character(0xFFFD); var_dump( $expected === htmlspecialchars_decode(htmlspecialchars($str, ENT_SUBSTITUTE, 'UTF-8')), - $expected2 === htmlspecialchars_decode(htmlspecialchars($str2, ENT_SUBSTITUTE, 'UTF-8')), + $expected2 === htmlspecialchars_decode(htmlspecialchars($str2, ENT_SUBSTITUTE, 'UTF-8')), $expected === mb_convert_encoding($str, 'UTF-8', 'UTF-8'), $expected2 === mb_convert_encoding($str2, 'UTF-8', 'UTF-8') ); diff --git a/ext/mbstring/tests/bug69079.phpt b/ext/mbstring/tests/bug69079.phpt index 65b1fd45a5..287b577ce4 100644 --- a/ext/mbstring/tests/bug69079.phpt +++ b/ext/mbstring/tests/bug69079.phpt @@ -7,7 +7,7 @@ Bug #69079 (enhancement for mb_substitute_character) mb_internal_encoding('UTF-8'); var_dump(mb_substitute_character(0x1F600)); -var_dump(bin2hex(mb_scrub("\xff"))); +var_dump(bin2hex(mb_scrub("\xff"))); mb_substitute_character(0x3f); // Reset to '?', as the next call will fail var_dump(mb_substitute_character(0xD800)); // Surrogate (illegal) var_dump(bin2hex(mb_scrub("\xff"))); diff --git a/ext/mbstring/tests/casefold.phpt b/ext/mbstring/tests/casefold.phpt index 977b0bb658..002269b680 100644 --- a/ext/mbstring/tests/casefold.phpt +++ b/ext/mbstring/tests/casefold.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_strtoupper() / mb_strtolower() +mb_strtoupper() / mb_strtolower() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt index 5af96c7c41..943e0751a7 100644 --- a/ext/mbstring/tests/htmlent.phpt +++ b/ext/mbstring/tests/htmlent.phpt @@ -1,9 +1,9 @@ --TEST-- HTML input/output --SKIPIF-- -<?php - ini_set('include_path', dirname(__FILE__)); - extension_loaded('mbstring') or die('skip mbstring not available'); +<?php + ini_set('include_path', dirname(__FILE__)); + extension_loaded('mbstring') or die('skip mbstring not available'); ?> --INI-- output_buffering=4096 @@ -20,7 +20,7 @@ filter.default=unsafe_raw <?php // enable output encoding through output handler //ob_start("mb_output_handler"); -// @... are must be decoded on input these are not reencoded on output. +// @... are must be decoded on input these are not reencoded on output. // If you see @AB on output this means input encoding fails. // If you do not see ä... on output this means output encoding fails. // Using UTF-8 internally allows to encode/decode ALL characters. diff --git a/ext/mbstring/tests/illformed_utf_sequences.phpt b/ext/mbstring/tests/illformed_utf_sequences.phpt index 378b956d68..11ab1799e9 100644 --- a/ext/mbstring/tests/illformed_utf_sequences.phpt +++ b/ext/mbstring/tests/illformed_utf_sequences.phpt @@ -128,7 +128,7 @@ echo "UTF-32 and surrogates area with BOM\n"; $out = ''; $cnt = 0; for ($i = 0xd7ff; $i <= 0xe000; ++$i) { - $s = chk_enc("\x00\x00\xfe\xff". pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff), + $s = chk_enc("\x00\x00\xfe\xff". pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff), 1, "UTF-32", true); if ($s === false) { $cnt++; @@ -142,7 +142,7 @@ var_dump(str_replace("0000feff","",$out)); $out = ''; $cnt = 0; for ($i = 0xd7ff; $i <= 0xe000; ++$i) { - $s = chk_enc("\xff\xfe\x00\x00". pack('C4', $i & 0xff, ($i >> 8) & 0xff, ($i >> 16) & 0xff, ($i >> 24) & 0xff), + $s = chk_enc("\xff\xfe\x00\x00". pack('C4', $i & 0xff, ($i >> 8) & 0xff, ($i >> 16) & 0xff, ($i >> 24) & 0xff), 1, "UTF-32", true); if ($s === false) { $cnt++; diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt index 1bc7c8673a..13faa9d12d 100644 --- a/ext/mbstring/tests/mb_convert_encoding.phpt +++ b/ext/mbstring/tests/mb_convert_encoding.phpt @@ -39,7 +39,7 @@ $s = mb_convert_encoding($s, 'JIS', 'EUC-JP'); print("JIS: ".base64_encode($s)."\n"); // JIS -// Using Encoding List Array +// Using Encoding List Array echo "== STRING ENCODING LIST ==\n"; $a = 'JIS,UTF-8,EUC-JP,SJIS'; @@ -56,7 +56,7 @@ $s = mb_convert_encoding($s, 'JIS', $a); print("JIS: ".base64_encode($s)."\n"); // JIS -// Using Encoding List Array +// Using Encoding List Array echo "== ARRAY ENCODING LIST ==\n"; $a = array(0=>'JIS', 1=>'UTF-8', 2=>'EUC-JP', 3=>'SJIS'); @@ -73,7 +73,7 @@ $s = mb_convert_encoding($s, 'JIS', $a); print("JIS: ".base64_encode($s)."\n"); // JIS -// Using Detect Order +// Using Detect Order echo "== DETECT ORDER ==\n"; $s = $jis; diff --git a/ext/mbstring/tests/mb_convert_encoding_array.phpt b/ext/mbstring/tests/mb_convert_encoding_array.phpt index 5bb78df028..d689e24ecf 100644 --- a/ext/mbstring/tests/mb_convert_encoding_array.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_array.phpt @@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not --FILE-- <?php /* Prototype : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding]) - * Description: Returns converted string in desired encoding + * Description: Returns converted string in desired encoding * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt index 0060a71808..cf641e6431 100644 --- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_convert_encoding() function : basic functionality +Test mb_convert_encoding() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not --FILE-- <?php /* Prototype : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding]) - * Description: Returns converted string in desired encoding + * Description: Returns converted string in desired encoding * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt index c8d2114380..50e7076a13 100644 --- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not --FILE-- <?php /* Prototype : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding]) - * Description: Returns converted string in desired encoding + * Description: Returns converted string in desired encoding * Source code: ext/mbstring/mbstring.c */ @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt index 22253b5352..bc1c320c3d 100644 --- a/ext/mbstring/tests/mb_convert_variables.phpt +++ b/ext/mbstring/tests/mb_convert_variables.phpt @@ -70,32 +70,32 @@ print("{$aa[0]}{$aa[1]}{$aa[2]}\n"); // Converted to EUC-JP // Test for object echo "== OBJECT TEST ==\n"; -class foo +class foo { public $s1; public $s2; public $s3; - function __construct() + function __construct() { global $sjis, $jis, $euc_jp; - + $this->s1 = $euc_jp; $this->s2 = $euc_jp; $this->s3 = $euc_jp; } } -class bar +class bar { public $s1; public $s2; public $s3; - function __construct() + function __construct() { global $sjis, $jis, $euc_jp; - + $this->s1 = $euc_jp; $this->s2 = $euc_jp; $this->s3 = $euc_jp; diff --git a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt index 5374c31c15..39bea621fe 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : basic functionality +Test mb_decode_mimeheader() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,15 +8,15 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : basic functionality ***\n"; mb_internal_encoding('utf-8'); -//the following encoded-words are identical and are UTF-8 Japanese. +//the following encoded-words are identical and are UTF-8 Japanese. $a = "=?UTF-8?b?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="; $b = mb_decode_mimeheader($a); var_dump(bin2hex($b)); diff --git a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt index c40cdbd643..3ceff967f5 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : error conditions +Test mb_decode_mimeheader() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt index e07ccad998..5ee6fc569c 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : usage variation +Test mb_decode_mimeheader() function : usage variation --CREDITS-- D. Kesley --SKIPIF-- @@ -10,9 +10,9 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : usage variation ***\n"; @@ -101,9 +101,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for string diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt index 7527c9aa5a..33c022b087 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : variation +Test mb_decode_mimeheader() function : variation --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : variation ***\n"; @@ -33,7 +33,7 @@ $encoded_words = array( "=?EUC-JP?Q?=C6=FC=CB=DC=B8=EC=A5=C6=A5=AD=A5=B9=A5=C8=A4=C7=A4=B9=A1=A3?= =?EUC-JP?Q?=30=31=32=33=34=A3=B5=A3=B6=A3=B7=A3=B8=A3=B9=A1=A3?=" ); - + foreach ($encoded_words as $word) { var_dump(bin2hex(mb_decode_mimeheader($word))); } diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt index 968e76eaf6..6f5c8b9c53 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : variation +Test mb_decode_mimeheader() function : variation --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt index 4fd22a69c3..d50330849c 100644 --- a/ext/mbstring/tests/mb_detect_encoding.phpt +++ b/ext/mbstring/tests/mb_detect_encoding.phpt @@ -23,7 +23,7 @@ $euc_jp = '日本語テキストです。01234５６７８９。'; echo "== BASIC TEST ==\n"; $s = $sjis; $s = mb_detect_encoding($s, 'SJIS'); -print("SJIS: $s\n"); +print("SJIS: $s\n"); $s = $jis; $s = mb_detect_encoding($s, 'JIS'); @@ -39,7 +39,7 @@ print("EUC-JP: $s\n"); -// Using Encoding List Array +// Using Encoding List Array echo "== ARRAY ENCODING LIST ==\n"; $a = array(0=>'UTF-8',1=>'EUC-JP', 2=>'SJIS', 3=>'JIS'); @@ -55,10 +55,10 @@ print("EUC-JP: $s\n"); $s = $sjis; $s = mb_detect_encoding($s, $a); -print("SJIS: $s\n"); +print("SJIS: $s\n"); -// Using Detect Order +// Using Detect Order echo "== DETECT ORDER ==\n"; mb_detect_order('auto'); @@ -66,15 +66,15 @@ mb_detect_order('auto'); $s = $jis; $s = mb_detect_encoding($s); -print("JIS: $s\n"); +print("JIS: $s\n"); $s = $euc_jp; $s = mb_detect_encoding($s); -print("EUC-JP: $s\n"); +print("EUC-JP: $s\n"); $s = $sjis; $s = mb_detect_encoding($s); -print("SJIS: $s\n"); +print("SJIS: $s\n"); // Invalid(?) Parameters diff --git a/ext/mbstring/tests/mb_detect_order.phpt b/ext/mbstring/tests/mb_detect_order.phpt index 382691cfc8..8c6ee3eb5e 100644 --- a/ext/mbstring/tests/mb_detect_order.phpt +++ b/ext/mbstring/tests/mb_detect_order.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_detect_order() +mb_detect_order() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --INI-- diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt index 0487a194f2..cd9eb1bb39 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer-encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt index cd52fa526d..7763e2c041 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt @@ -8,9 +8,9 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n --FILE-- <?php -/* Prototype : string mb_encode_mimeheader(string $str [, string $charset +/* Prototype : string mb_encode_mimeheader(string $str [, string $charset * [, string $transfer-encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt index b2f0c8b7d1..ad921ab108 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt @@ -8,9 +8,9 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n --FILE-- <?php -/* Prototype : string mb_encode_mimeheader(string $str [, string $charset +/* Prototype : string mb_encode_mimeheader(string $str [, string $charset * [, string $transfer-encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt index 11fe23f531..00b471a747 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt @@ -10,7 +10,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ @@ -30,7 +30,7 @@ $linefeed = "\r\n"; for ($i = 0; $i < 100; $i++) { echo "\n-- Iteration $i --\n"; var_dump( mb_encode_mimeheader($str, $charset, "B", $linefeed, $i)); - var_dump( mb_encode_mimeheader($str, $charset, "Q", $linefeed, $i)); + var_dump( mb_encode_mimeheader($str, $charset, "Q", $linefeed, $i)); }; echo "Done"; ?> diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt index 7b5bd30661..8f8cf3e3dc 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt index e765e94388..e9d9fa2dd6 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -81,7 +81,7 @@ $inputs = array( /*18*/ "utf-8", 'utf-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt index c2976f5d00..1da923ec21 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -81,7 +81,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt index fe050840ef..11279c7bf6 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ @@ -73,7 +73,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt index d8712e3949..e0de4e63c6 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt @@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ @@ -73,7 +73,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt index 668ae8bfea..fb81271f74 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt index 3b2d13de51..faf6ea65e4 100644 --- a/ext/mbstring/tests/mb_ereg.phpt +++ b/ext/mbstring/tests/mb_ereg.phpt @@ -18,10 +18,10 @@ output_handler= $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( ' ', $reg ), $in_enc, $test_enc )) : '' ) ); - } + } function do_tests( $enc ) { test_ereg( $enc, 'abc ([a-z]+) ([a-z]+) ([a-z]+)$', "abc def ghi jkl" ); - $pat = '([ａ-ｚ]+) ([ あ-か]+)([か-な]+) ([わ-ん]+)$'; + $pat = '([ａ-ｚ]+) ([ あ-か]+)([か-な]+) ([わ-ん]+)$'; test_ereg( $enc, $pat, 'ａｂｃ あおい かこな わゑん' ); test_ereg( $enc, $pat, 'ｍｚｘｆｐ うおか きか をゐ' ); } diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt index c61cdb6da2..59ef788a77 100644 --- a/ext/mbstring/tests/mb_ereg1.phpt +++ b/ext/mbstring/tests/mb_ereg1.phpt @@ -19,7 +19,7 @@ foreach ($a as $args) { } ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(false) array(3) { [0]=> diff --git a/ext/mbstring/tests/mb_ereg2.phpt b/ext/mbstring/tests/mb_ereg2.phpt index 2b79bafd14..ecae0aca49 100644 --- a/ext/mbstring/tests/mb_ereg2.phpt +++ b/ext/mbstring/tests/mb_ereg2.phpt @@ -5,19 +5,19 @@ mb_ereg() returning matches --FILE-- <?php -$a = -1; $b = -1; $c = -1; -mbereg($a, $b, $c); -var_dump($a, $b, $c); +$a = -1; $b = -1; $c = -1; +mbereg($a, $b, $c); +var_dump($a, $b, $c); -mberegi($a, $b, $c); -var_dump($a, $b, $c); +mberegi($a, $b, $c); +var_dump($a, $b, $c); -mbereg_search_init($a, $b, $c); +mbereg_search_init($a, $b, $c); var_dump($a, $b, $c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(-1) array(1) { diff --git a/ext/mbstring/tests/mb_ereg3.phpt b/ext/mbstring/tests/mb_ereg3.phpt index 8dca4358fc..fe779fcc85 100644 --- a/ext/mbstring/tests/mb_ereg3.phpt +++ b/ext/mbstring/tests/mb_ereg3.phpt @@ -8,19 +8,19 @@ if (!function_exists("mb_ereg")) print "skip mb_ereg() not available"; --FILE-- <?php -$a = -1; $b = -1; $c = -1; -mbereg($a, $b, $c); -var_dump($a, $b, $c); +$a = -1; $b = -1; $c = -1; +mbereg($a, $b, $c); +var_dump($a, $b, $c); -mberegi($a, $b, $c); -var_dump($a, $b, $c); +mberegi($a, $b, $c); +var_dump($a, $b, $c); -mbereg_search_init($a, $b, $c); +mbereg_search_init($a, $b, $c); var_dump($a, $b, $c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(-1) array(1) { diff --git a/ext/mbstring/tests/mb_ereg4.phpt b/ext/mbstring/tests/mb_ereg4.phpt index 8dca4358fc..fe779fcc85 100644 --- a/ext/mbstring/tests/mb_ereg4.phpt +++ b/ext/mbstring/tests/mb_ereg4.phpt @@ -8,19 +8,19 @@ if (!function_exists("mb_ereg")) print "skip mb_ereg() not available"; --FILE-- <?php -$a = -1; $b = -1; $c = -1; -mbereg($a, $b, $c); -var_dump($a, $b, $c); +$a = -1; $b = -1; $c = -1; +mbereg($a, $b, $c); +var_dump($a, $b, $c); -mberegi($a, $b, $c); -var_dump($a, $b, $c); +mberegi($a, $b, $c); +var_dump($a, $b, $c); -mbereg_search_init($a, $b, $c); +mbereg_search_init($a, $b, $c); var_dump($a, $b, $c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(-1) array(1) { diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt index ff64666f08..021200dfde 100644 --- a/ext/mbstring/tests/mb_ereg_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_ereg() function : basic functionality +Test mb_ereg() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_error.phpt b/ext/mbstring/tests/mb_ereg_error.phpt index 21216257cd..2081f54b4c 100644 --- a/ext/mbstring/tests/mb_ereg_error.phpt +++ b/ext/mbstring/tests/mb_ereg_error.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt index c035acc018..c82e1b6f3c 100644 --- a/ext/mbstring/tests/mb_ereg_match_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg_match') or die("skip mb_ereg_match() is not available i --FILE-- <?php /* Prototype : bool mb_ereg_match(string $pattern, string $string [,string $option]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ @@ -27,7 +27,7 @@ $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXv echo "\n-- ASCII string 1 --\n"; var_dump(mb_ereg_match('.*def', $string_ascii)); -//will return false as pattern would match half way through string +//will return false as pattern would match half way through string echo "\n-- ASCII string 2 --\n"; var_dump(mb_ereg_match('def', $string_ascii)); diff --git a/ext/mbstring/tests/mb_ereg_match_error1.phpt b/ext/mbstring/tests/mb_ereg_match_error1.phpt index aab95fe6cd..d483b6609d 100644 --- a/ext/mbstring/tests/mb_ereg_match_error1.phpt +++ b/ext/mbstring/tests/mb_ereg_match_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg_match') or die("skip mb_ereg_match() is not available i --FILE-- <?php /* Prototype : bool mb_ereg_match(string $pattern, string $string [,string $option]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt index ad2c6c1c56..6e988555ae 100644 --- a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt +++ b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt @@ -2,7 +2,7 @@ mb_ereg_replace() compat test 1 --SKIPIF-- <?php -extension_loaded('mbstring') or die('skip'); +extension_loaded('mbstring') or die('skip'); function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build"); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_ereg_replace_basic.phpt b/ext/mbstring/tests/mb_ereg_replace_basic.phpt index 746dd4e1a4..ac30149099 100644 --- a/ext/mbstring/tests/mb_ereg_replace_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_ereg_replace() function : basic +Test mb_ereg_replace() function : basic --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -7,9 +7,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab ?> --FILE-- <?php -/* Prototype : string mb_ereg_replace(string $pattern, string $replacement, +/* Prototype : string mb_ereg_replace(string $pattern, string $replacement, * string $string [, string o$ption]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_replace_error.phpt b/ext/mbstring/tests/mb_ereg_replace_error.phpt index 4e8a3388dd..58a69c075d 100644 --- a/ext/mbstring/tests/mb_ereg_replace_error.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_ereg_replace() function : error conditions +Test mb_ereg_replace() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt index cbf3dd98cd..6a1231bf8b 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt @@ -10,9 +10,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : usage variations ***\n"; @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt index 37a89fcba7..e69e147e48 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : usage variations ***\n"; @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt index 09da6cd3ee..2e115f5d6f 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt @@ -4,13 +4,13 @@ Test mb_ereg_replace() function : usage variations <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build"); -?> +?> --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : usage variations ***\n"; @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt index 05b4f60da3..c85f68aa06 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt @@ -1,16 +1,16 @@ --TEST-- -Test mb_ereg_replace() function : usage variations +Test mb_ereg_replace() function : usage variations --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build"); -?> +?> --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : usage variations ***\n"; @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt index 08fcd7f87b..d73046ff0f 100644 --- a/ext/mbstring/tests/mb_ereg_search_pos.phpt +++ b/ext/mbstring/tests/mb_ereg_search_pos.phpt @@ -12,9 +12,9 @@ $test_str = 'Itrntinliztin'; if(mb_ereg_search_init($test_str)) { $val=mb_ereg_search_pos("ntin"); - + var_dump($val); - + } else{ var_dump("false"); diff --git a/ext/mbstring/tests/mb_ereg_search_regs.phpt b/ext/mbstring/tests/mb_ereg_search_regs.phpt index 2cc55a7bdc..813dabf641 100644 --- a/ext/mbstring/tests/mb_ereg_search_regs.phpt +++ b/ext/mbstring/tests/mb_ereg_search_regs.phpt @@ -7,19 +7,19 @@ function_exists('mb_ereg_search_regs') or die("skip mb_ereg_search_regs() not av ?> --FILE-- <?php - // homepage: - + // homepage: + //$mb_str = "仍亠从亠亶 个亠亟仂仂于亳 舒舒仄舒亰仂于 弍仍 仍亠从亠亶 个亠亟仂仂于亳 舒舒仄舒亰仂于 弍仍 kyrillischer string string"; // = "Lorem ipsum dolor sit amet" - + mb_ereg_search_init("仍亠从亠亶 个亠亟仂仂于亳 舒舒仄舒亰仂于 弍仍 仍亠从亠亶 个亠亟仂仂于亳 舒舒仄舒亰仂于 弍仍"); - - - + + + $match= mb_ereg_search_regs("仂于"); - var_dump($match); - - + var_dump($match); + + ?> --EXPECT-- array(1) { diff --git a/ext/mbstring/tests/mb_ereg_search_xxx.phpt b/ext/mbstring/tests/mb_ereg_search_xxx.phpt index c2c0b84a85..49182248f8 100644 --- a/ext/mbstring/tests/mb_ereg_search_xxx.phpt +++ b/ext/mbstring/tests/mb_ereg_search_xxx.phpt @@ -23,7 +23,7 @@ output_handler= array_shift( $regs ); printf( "(%s) (%d) %s\n", $test_enc, mb_ereg_search_getpos(), mb_convert_encoding( ( is_array( $regs ) ? implode( '-', $regs ): '' ), $in_enc, $test_enc ) ); } - } + } function do_tests( $enc, $opt ) { test_search( $enc, "∀・ ・∀\n", ' (・?∀・?)[[:space:]]', $opt ); test_search( $enc, 'abcde abdeabcf anvfabc odu abcd ', '(ab[a-z]+)', $opt ); diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt index 3077bcbd5d..999dcec574 100644 --- a/ext/mbstring/tests/mb_ereg_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_variation1.phpt @@ -8,8 +8,8 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string - * Source code: ext/mbstring/php_mbregex.c + * Description: Regular expression match for multibyte string + * Source code: ext/mbstring/php_mbregex.c */ /* @@ -65,7 +65,7 @@ $inputs = array( /*12*/ "string", 'string', $heredoc, - + // object data /*15*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_variation2.phpt b/ext/mbstring/tests/mb_ereg_variation2.phpt index 291c1c1ec4..f6a93ebc83 100644 --- a/ext/mbstring/tests/mb_ereg_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -75,7 +75,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt index a71f2395da..756e876126 100644 --- a/ext/mbstring/tests/mb_ereg_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt index 7f7d6dfc93..eb42832390 100644 --- a/ext/mbstring/tests/mb_ereg_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt index 0de5064fed..5a2e746dd6 100644 --- a/ext/mbstring/tests/mb_ereg_variation6.phpt +++ b/ext/mbstring/tests/mb_ereg_variation6.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ @@ -24,13 +24,13 @@ if(mb_regex_encoding('utf-8') == true) { echo "Could not set regex encoding to utf-8\n"; } -$regex_char = array ('\w+' => '\w+', - '\W+' => '\W+', - '\s+' => '\s+', - '\S+' => '\S+', - '\d+' => '\d+', - '\D+' => '\D+', - '\b' => '\b', +$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.'; diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt index 41c427162e..e35b9ef5cf 100644 --- a/ext/mbstring/tests/mb_ereg_variation7.phpt +++ b/ext/mbstring/tests/mb_ereg_variation7.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_eregi_replace.phpt b/ext/mbstring/tests/mb_eregi_replace.phpt index 0405d8984c..540905b1a1 100644 --- a/ext/mbstring/tests/mb_eregi_replace.phpt +++ b/ext/mbstring/tests/mb_eregi_replace.phpt @@ -22,7 +22,7 @@ function do_translit($st) { "亊"=>"YA","丼"=>"CH","弌"=>"C",""=>"M",""=>"I","丐"=>"T", "亂"=>"\'",""=>"B","豫"=>"YU", ); - + foreach($replacement as $i=>$u) { $st = mb_eregi_replace($i,$u,$st); } diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt index 6e72c5d590..3a4916d751 100644 --- a/ext/mbstring/tests/mb_http_input.phpt +++ b/ext/mbstring/tests/mb_http_input.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_http_input() +mb_http_input() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt index a6cac3fb35..cb2ea21f77 100644 --- a/ext/mbstring/tests/mb_http_output.phpt +++ b/ext/mbstring/tests/mb_http_output.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_http_output() +mb_http_output() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt index acb3c6fbb6..6ef4be23d9 100644 --- a/ext/mbstring/tests/mb_internal_encoding.phpt +++ b/ext/mbstring/tests/mb_internal_encoding.phpt @@ -4,7 +4,7 @@ mb_internal_encoding() <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- <?php -// TODO: +// TODO: //$debug = true; ini_set('include_path', dirname(__FILE__)); include_once('common.inc'); diff --git a/ext/mbstring/tests/mb_internal_encoding_basic.phpt b/ext/mbstring/tests/mb_internal_encoding_basic.phpt index a289dcf8de..48327304cc 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or Returns - * the current internal encoding as a string + * Description: Sets the current internal encoding or Returns + * the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt index eb8fea2b9b..5bffecce73 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt @@ -13,8 +13,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or Returns - * the current internal encoding as a string + * Description: Sets the current internal encoding or Returns + * the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_error1.phpt b/ext/mbstring/tests/mb_internal_encoding_error1.phpt index ce824e6a2f..c16d5e3bda 100644 --- a/ext/mbstring/tests/mb_internal_encoding_error1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_error1.phpt @@ -4,12 +4,12 @@ Test mb_internal_encoding() function : error conditions - pass incorrect number <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build"); -?> +?> --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or - * Returns the current internal encoding as a string + * Description: Sets the current internal encoding or + * Returns the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_error2.phpt b/ext/mbstring/tests/mb_internal_encoding_error2.phpt index d0a1653ebe..13fa3f59c1 100644 --- a/ext/mbstring/tests/mb_internal_encoding_error2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_error2.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or - * Returns the current internal encoding as a string + * Description: Sets the current internal encoding or + * Returns the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt index 581df06414..954f7aecc2 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or Returns - * the current internal encoding as a string + * Description: Sets the current internal encoding or Returns + * the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt index 914041c914..216c789c54 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or Returns - * the current internal encoding as a string + * Description: Sets the current internal encoding or Returns + * the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_regex_encoding_basic.phpt b/ext/mbstring/tests/mb_regex_encoding_basic.phpt index a0a41e9677..8da42ad7c7 100644 --- a/ext/mbstring/tests/mb_regex_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_basic.phpt @@ -8,8 +8,8 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : proto string mb_regex_encoding([string encoding]) - * Description: Returns the current encoding for regex as a string. - * Source code: ext/mbstring/php_mbregex.c + * Description: Returns the current encoding for regex as a string. + * Source code: ext/mbstring/php_mbregex.c */ /* diff --git a/ext/mbstring/tests/mb_regex_encoding_error1.phpt b/ext/mbstring/tests/mb_regex_encoding_error1.phpt index 4c5456d36c..9609dc22d5 100644 --- a/ext/mbstring/tests/mb_regex_encoding_error1.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : string mb_regex_encoding([string $encoding]) - * Description: Returns the current encoding for regex as a string. + * Description: Returns the current encoding for regex as a string. * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_regex_encoding_error2.phpt b/ext/mbstring/tests/mb_regex_encoding_error2.phpt index c752609daf..eae246dced 100644 --- a/ext/mbstring/tests/mb_regex_encoding_error2.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : string mb_regex_encoding([string $encoding]) - * Description: Returns the current encoding for regex as a string. + * Description: Returns the current encoding for regex as a string. * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt index 09b263d751..c3bb50ce80 100644 --- a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : string mb_regex_encoding([string $encoding]) - * Description: Returns the current encoding for regex as a string. + * Description: Returns the current encoding for regex as a string. * Source code: ext/mbstring/php_mbregex.c */ @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt index fc9c600371..baaab535d4 100644 --- a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : string mb_regex_encoding([string $encoding]) - * Description: Returns the current encoding for regex as a string. + * Description: Returns the current encoding for regex as a string. * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_regex_set_options.phpt b/ext/mbstring/tests/mb_regex_set_options.phpt index 88ee9c9250..26c8a998f8 100644 --- a/ext/mbstring/tests/mb_regex_set_options.phpt +++ b/ext/mbstring/tests/mb_regex_set_options.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_regex_set_options() +mb_regex_set_options() --SKIPIF-- <?php extension_loaded('mbstring') or die("skip mbstring not available\n"); diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt index 45d361c598..a63c8cabbe 100644 --- a/ext/mbstring/tests/mb_split.phpt +++ b/ext/mbstring/tests/mb_split.phpt @@ -21,7 +21,7 @@ mbstring.func_overload=0 print "ok\n"; } else { print count($result1).'-'.count($result2)."\n"; - } + } } var_dump( mb_split( " ", "a b c d e f g" ) diff --git a/ext/mbstring/tests/mb_split_error.phpt b/ext/mbstring/tests/mb_split_error.phpt index b48e21520b..b307e40493 100644 --- a/ext/mbstring/tests/mb_split_error.phpt +++ b/ext/mbstring/tests/mb_split_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_split() function : error conditions +Test mb_split() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui --FILE-- <?php /* Prototype : proto array mb_split(string pattern, string string [, int limit]) - * Description: split multibyte string into array by regular expression + * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_split_variation1.phpt b/ext/mbstring/tests/mb_split_variation1.phpt index b508049969..7d2f952bff 100644 --- a/ext/mbstring/tests/mb_split_variation1.phpt +++ b/ext/mbstring/tests/mb_split_variation1.phpt @@ -8,9 +8,9 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui --FILE-- <?php /* Prototype : proto array mb_split(string pattern, string string [, int limit]) - * Description: split multibyte string into array by regular expression + * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_split() : usage variations ***\n"; @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_split_variation2.phpt b/ext/mbstring/tests/mb_split_variation2.phpt index a6db2cc04f..2ef402f205 100644 --- a/ext/mbstring/tests/mb_split_variation2.phpt +++ b/ext/mbstring/tests/mb_split_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui --FILE-- <?php /* Prototype : proto array mb_split(string pattern, string string [, int limit]) - * Description: split multibyte string into array by regular expression + * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_split_variation3.phpt b/ext/mbstring/tests/mb_split_variation3.phpt index 3ef13513da..6856a92d29 100644 --- a/ext/mbstring/tests/mb_split_variation3.phpt +++ b/ext/mbstring/tests/mb_split_variation3.phpt @@ -9,9 +9,9 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); --FILE-- <?php /* Prototype : proto array mb_split(string pattern, string string [, int limit]) - * Description: split multibyte string into array by regular expression + * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_split() : usage variations ***\n"; @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos.phpt b/ext/mbstring/tests/mb_stripos.phpt index ac84b58242..d1f795ceac 100644 --- a/ext/mbstring/tests/mb_stripos.phpt +++ b/ext/mbstring/tests/mb_stripos.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_stripos() +mb_stripos() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt index e061d8f7cc..b360858e6d 100644 --- a/ext/mbstring/tests/mb_stripos_basic.phpt +++ b/ext/mbstring/tests/mb_stripos_basic.phpt @@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -34,14 +34,14 @@ $ascii_needles = array( 'de', 'De', 'dE', - + //flag a swap between good and bad - '!', - + '!', + // 4 bad ones 'df', 'Df', - 'dF', + 'dF', 'DF' ); @@ -63,11 +63,11 @@ $greek_bmixed2 = base64_decode('zrzOvs6f'); $greek_needles = array( // 4 good ones $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2, - + '!', // used to flag a swap between good and bad - + // 4 bad ones - $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2, + $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2, ); // try the basic options @@ -80,7 +80,7 @@ foreach ($ascii_needles as $needle) { foreach ($ascii_haystacks as $haystack) { var_dump(mb_stripos($haystack, $needle)); } - } + } } echo "\n -- Greek Strings, needle should be found --\n"; @@ -92,7 +92,7 @@ foreach ($greek_needles as $needle) { foreach ($greek_haystacks as $haystack) { var_dump(mb_stripos($haystack, $needle)); } - } + } } echo "Done"; diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt index 76a6cc5066..8c8732493f 100644 --- a/ext/mbstring/tests/mb_stripos_basic2.phpt +++ b/ext/mbstring/tests/mb_stripos_basic2.phpt @@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -56,7 +56,7 @@ $greek_needles = array( echo "\n -- ASCII Strings --\n"; foreach ($ascii_needles as $needle) { foreach ($ascii_haystacks as $haystack) { - var_dump(mb_stripos($haystack, $needle)); + var_dump(mb_stripos($haystack, $needle)); var_dump(mb_stripos($haystack, $needle, 6)); } } @@ -65,7 +65,7 @@ echo "\n -- Greek Strings --\n"; foreach ($greek_needles as $needle) { foreach ($greek_haystacks as $haystack) { var_dump(mb_stripos($haystack, $needle)); - var_dump(mb_stripos($haystack, $needle, 4)); + var_dump(mb_stripos($haystack, $needle, 4)); } } diff --git a/ext/mbstring/tests/mb_stripos_error1.phpt b/ext/mbstring/tests/mb_stripos_error1.phpt index 4187898f01..3f1ab01bc1 100644 --- a/ext/mbstring/tests/mb_stripos_error1.phpt +++ b/ext/mbstring/tests/mb_stripos_error1.phpt @@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_stripos_error2.phpt b/ext/mbstring/tests/mb_stripos_error2.phpt index 82b01b92f3..bbf1fb7a9a 100644 --- a/ext/mbstring/tests/mb_stripos_error2.phpt +++ b/ext/mbstring/tests/mb_stripos_error2.phpt @@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_stripos_variation1.phpt b/ext/mbstring/tests/mb_stripos_variation1.phpt index 39837aa080..7ecbbe9e70 100644 --- a/ext/mbstring/tests/mb_stripos_variation1.phpt +++ b/ext/mbstring/tests/mb_stripos_variation1.phpt @@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt index 32b75467f7..b92aceecdb 100644 --- a/ext/mbstring/tests/mb_stripos_variation2.phpt +++ b/ext/mbstring/tests/mb_stripos_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos_variation3.phpt b/ext/mbstring/tests/mb_stripos_variation3.phpt index 9907356ccd..0107d07e3f 100644 --- a/ext/mbstring/tests/mb_stripos_variation3.phpt +++ b/ext/mbstring/tests/mb_stripos_variation3.phpt @@ -71,7 +71,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -80,7 +80,7 @@ $inputs = array( /*20*/ "string", 'string', $heredoc, - + // object data /*23*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt index dc11b48d38..e762bb4e71 100644 --- a/ext/mbstring/tests/mb_stripos_variation4.phpt +++ b/ext/mbstring/tests/mb_stripos_variation4.phpt @@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt index f2f9555a2b..436ac90811 100644 --- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt @@ -14,7 +14,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* * Test how mb_stripos() behaves when passed different integers as $offset argument - * The character length of $string_ascii and $string_mb is the same, + * The character length of $string_ascii and $string_mb is the same, * and the needle appears at the same positions in both strings */ diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt index 58a03dcb2c..22fc5b1278 100644 --- a/ext/mbstring/tests/mb_stristr_basic.phpt +++ b/ext/mbstring/tests/mb_stristr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_stristr() function : basic functionality +Test mb_stristr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_stristr_error1.phpt b/ext/mbstring/tests/mb_stristr_error1.phpt index c20f13470d..ac54d27172 100644 --- a/ext/mbstring/tests/mb_stristr_error1.phpt +++ b/ext/mbstring/tests/mb_stristr_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_stristr() function : error conditions +Test mb_stristr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt index 74f8bfb4eb..d5abd115de 100644 --- a/ext/mbstring/tests/mb_stristr_error2.phpt +++ b/ext/mbstring/tests/mb_stristr_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_stristr() function : error conditions +Test mb_stristr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt index c8c2ae1f68..8f01425221 100644 --- a/ext/mbstring/tests/mb_stristr_variation1.phpt +++ b/ext/mbstring/tests/mb_stristr_variation1.phpt @@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for haystack diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt index 498bb3b868..5842a8c6fd 100644 --- a/ext/mbstring/tests/mb_stristr_variation2.phpt +++ b/ext/mbstring/tests/mb_stristr_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for needle diff --git a/ext/mbstring/tests/mb_stristr_variation3.phpt b/ext/mbstring/tests/mb_stristr_variation3.phpt index cc0e648320..642b3d9161 100644 --- a/ext/mbstring/tests/mb_stristr_variation3.phpt +++ b/ext/mbstring/tests/mb_stristr_variation3.phpt @@ -8,11 +8,11 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ - + echo "*** Testing mb_stristr() : usage variation ***\n"; // Define error handler @@ -108,9 +108,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for part diff --git a/ext/mbstring/tests/mb_stristr_variation4.phpt b/ext/mbstring/tests/mb_stristr_variation4.phpt index 7da3eeced0..122e92fcc4 100644 --- a/ext/mbstring/tests/mb_stristr_variation4.phpt +++ b/ext/mbstring/tests/mb_stristr_variation4.phpt @@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for encoding diff --git a/ext/mbstring/tests/mb_stristr_variation5.phpt b/ext/mbstring/tests/mb_stristr_variation5.phpt index 54d527ecf5..2fca14ff95 100644 --- a/ext/mbstring/tests/mb_stristr_variation5.phpt +++ b/ext/mbstring/tests/mb_stristr_variation5.phpt @@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt index 97c09a79ae..512d76de04 100644 --- a/ext/mbstring/tests/mb_strlen.phpt +++ b/ext/mbstring/tests/mb_strlen.phpt @@ -43,7 +43,7 @@ echo "== JIS ==\n"; $jis = mb_convert_encoding($euc_jp, 'JIS','EUC-JP'); print mb_strlen($jis,'JIS') . "\n"; mb_internal_encoding('JIS') or print("mb_internal_encoding() failed\n"); -print strlen($jis) . "\n"; +print strlen($jis) . "\n"; // UTF-8 // Note: either convert_encoding or strlen has problem @@ -51,7 +51,7 @@ echo "== UTF-8 ==\n"; $utf8 = mb_convert_encoding($euc_jp, 'UTF-8','EUC-JP'); print mb_strlen($utf8,'UTF-8') . "\n"; mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n"); -print strlen($utf8) . "\n"; +print strlen($utf8) . "\n"; // Wrong Parameters diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt index 6214f3069c..e4a1435e90 100644 --- a/ext/mbstring/tests/mb_strlen_basic.phpt +++ b/ext/mbstring/tests/mb_strlen_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strlen_error1.phpt b/ext/mbstring/tests/mb_strlen_error1.phpt index aff78d60f3..6508d769a8 100644 --- a/ext/mbstring/tests/mb_strlen_error1.phpt +++ b/ext/mbstring/tests/mb_strlen_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strlen_error2.phpt b/ext/mbstring/tests/mb_strlen_error2.phpt index a530a84417..9507fd16c5 100644 --- a/ext/mbstring/tests/mb_strlen_error2.phpt +++ b/ext/mbstring/tests/mb_strlen_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strlen_variation1.phpt b/ext/mbstring/tests/mb_strlen_variation1.phpt index 4af8dc61aa..480ee6909f 100644 --- a/ext/mbstring/tests/mb_strlen_variation1.phpt +++ b/ext/mbstring/tests/mb_strlen_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -75,7 +75,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt index 276731ce92..9311127131 100644 --- a/ext/mbstring/tests/mb_strlen_variation2.phpt +++ b/ext/mbstring/tests/mb_strlen_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt index efa11ad47e..948b464ffd 100644 --- a/ext/mbstring/tests/mb_strlen_variation3.phpt +++ b/ext/mbstring/tests/mb_strlen_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt index e5a74364ff..7e4a64e351 100644 --- a/ext/mbstring/tests/mb_strpos.phpt +++ b/ext/mbstring/tests/mb_strpos.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_strpos() +mb_strpos() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt index 1197fbadd7..f55ec59f6e 100644 --- a/ext/mbstring/tests/mb_strpos_basic.phpt +++ b/ext/mbstring/tests/mb_strpos_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_error1.phpt b/ext/mbstring/tests/mb_strpos_error1.phpt index ef0cbafeff..14ec3b0097 100644 --- a/ext/mbstring/tests/mb_strpos_error1.phpt +++ b/ext/mbstring/tests/mb_strpos_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_error2.phpt b/ext/mbstring/tests/mb_strpos_error2.phpt index f75390f2c5..fc117606c9 100644 --- a/ext/mbstring/tests/mb_strpos_error2.phpt +++ b/ext/mbstring/tests/mb_strpos_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_variation1.phpt b/ext/mbstring/tests/mb_strpos_variation1.phpt index 0684724b5c..696cc1cd89 100644 --- a/ext/mbstring/tests/mb_strpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strpos_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strpos_variation2.phpt b/ext/mbstring/tests/mb_strpos_variation2.phpt index fb2d7227b9..9dc8e2a019 100644 --- a/ext/mbstring/tests/mb_strpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strpos_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt index ce43080dc3..d5205419d1 100644 --- a/ext/mbstring/tests/mb_strpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strpos_variation3.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ @@ -71,7 +71,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -80,7 +80,7 @@ $inputs = array( /*20*/ "string", 'string', $heredoc, - + // object data /*23*/ new classA(), diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt index 31b43bacb7..f9b8d9bcfd 100644 --- a/ext/mbstring/tests/mb_strpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strpos_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt index 1dccce6385..404af22c45 100644 --- a/ext/mbstring/tests/mb_strpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strpos_variation5.phpt @@ -8,13 +8,13 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ /* * Test how mb_strpos() behaves when passed different integers as $offset argument - * The character length of $string_ascii and $string_mb is the same, + * The character length of $string_ascii and $string_mb is the same, * and the needle appears at the same positions in both strings */ diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt index 8c227487f0..2d8b8009c0 100644 --- a/ext/mbstring/tests/mb_strrchr_basic.phpt +++ b/ext/mbstring/tests/mb_strrchr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrchr() function : basic functionality +Test mb_strrchr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strrchr_error1.phpt b/ext/mbstring/tests/mb_strrchr_error1.phpt index 42346afbf0..2878871dd8 100644 --- a/ext/mbstring/tests/mb_strrchr_error1.phpt +++ b/ext/mbstring/tests/mb_strrchr_error1.phpt @@ -4,13 +4,13 @@ Test mb_strrchr() function : error conditions <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build"); -?> +?> --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt index 11abee609b..e81e1befde 100644 --- a/ext/mbstring/tests/mb_strrchr_error2.phpt +++ b/ext/mbstring/tests/mb_strrchr_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrchr() function : error conditions +Test mb_strrchr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strrchr_variation1.phpt b/ext/mbstring/tests/mb_strrchr_variation1.phpt index 7284939a57..da635fb74a 100644 --- a/ext/mbstring/tests/mb_strrchr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation1.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for haystack diff --git a/ext/mbstring/tests/mb_strrchr_variation2.phpt b/ext/mbstring/tests/mb_strrchr_variation2.phpt index 074cdda108..942980e5fd 100644 --- a/ext/mbstring/tests/mb_strrchr_variation2.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for needle diff --git a/ext/mbstring/tests/mb_strrchr_variation3.phpt b/ext/mbstring/tests/mb_strrchr_variation3.phpt index c93895c7a5..d21072de75 100644 --- a/ext/mbstring/tests/mb_strrchr_variation3.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation3.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : usage variation ***\n"; @@ -108,9 +108,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for part @@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) { } else { var_dump(bin2hex($res)); - } + } }; fclose($fp); diff --git a/ext/mbstring/tests/mb_strrchr_variation4.phpt b/ext/mbstring/tests/mb_strrchr_variation4.phpt index a85979c988..5ba8e0563f 100644 --- a/ext/mbstring/tests/mb_strrchr_variation4.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation4.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for encoding diff --git a/ext/mbstring/tests/mb_strrchr_variation5.phpt b/ext/mbstring/tests/mb_strrchr_variation5.phpt index fa37db646c..869fdde76f 100644 --- a/ext/mbstring/tests/mb_strrchr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation5.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt index 2c941c5114..053a1cf726 100644 --- a/ext/mbstring/tests/mb_strrchr_variation6.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_strrichr_basic.phpt b/ext/mbstring/tests/mb_strrichr_basic.phpt index 2670de774c..4f82f22474 100644 --- a/ext/mbstring/tests/mb_strrichr_basic.phpt +++ b/ext/mbstring/tests/mb_strrichr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrichr() function : basic functionality +Test mb_strrichr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strrichr_error1.phpt b/ext/mbstring/tests/mb_strrichr_error1.phpt index 7280c53085..a8c8cd4973 100644 --- a/ext/mbstring/tests/mb_strrichr_error1.phpt +++ b/ext/mbstring/tests/mb_strrichr_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrichr() function : error conditions +Test mb_strrichr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt index b1877db9c1..fec201e99a 100644 --- a/ext/mbstring/tests/mb_strrichr_error2.phpt +++ b/ext/mbstring/tests/mb_strrichr_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrichr() function : error conditions +Test mb_strrichr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strrichr_variation1.phpt b/ext/mbstring/tests/mb_strrichr_variation1.phpt index 06ca5e31c9..afc01e70fb 100644 --- a/ext/mbstring/tests/mb_strrichr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation1.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for haystack diff --git a/ext/mbstring/tests/mb_strrichr_variation2.phpt b/ext/mbstring/tests/mb_strrichr_variation2.phpt index e2c979b428..b389f60721 100644 --- a/ext/mbstring/tests/mb_strrichr_variation2.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for needle diff --git a/ext/mbstring/tests/mb_strrichr_variation3.phpt b/ext/mbstring/tests/mb_strrichr_variation3.phpt index 3949c148d1..79824c8a73 100644 --- a/ext/mbstring/tests/mb_strrichr_variation3.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation3.phpt @@ -8,11 +8,11 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ - + echo "*** Testing mb_strrichr() : usage variation ***\n"; // Define error handler @@ -108,9 +108,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for part @@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) { } else { var_dump(bin2hex($res)); - } + } }; fclose($fp); diff --git a/ext/mbstring/tests/mb_strrichr_variation4.phpt b/ext/mbstring/tests/mb_strrichr_variation4.phpt index f9d9f68037..adcccee209 100644 --- a/ext/mbstring/tests/mb_strrichr_variation4.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation4.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for encoding diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt index 0e5d472fd8..be28a5955c 100644 --- a/ext/mbstring/tests/mb_strrichr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt @@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt index c9e1ff84fc..ce538ec0af 100644 --- a/ext/mbstring/tests/mb_strripos_basic.phpt +++ b/ext/mbstring/tests/mb_strripos_basic.phpt @@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -34,14 +34,14 @@ $ascii_needles = array( 'de', 'De', 'dE', - + //flag a swap between good and bad - '!', - + '!', + // 4 bad ones 'df', 'Df', - 'dF', + 'dF', 'DF' ); @@ -63,11 +63,11 @@ $greek_bmixed2 = base64_decode('zrzOvs6f'); $greek_needles = array( // 4 good ones $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2, - + '!', // used to flag a swap between good and bad - + // 4 bad ones - $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2, + $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2, ); // try the basic options @@ -80,7 +80,7 @@ foreach ($ascii_needles as $needle) { foreach ($ascii_haystacks as $haystack) { var_dump(mb_strripos($haystack, $needle)); } - } + } } echo "\n -- Greek Strings, needle should be found --\n"; @@ -92,7 +92,7 @@ foreach ($greek_needles as $needle) { foreach ($greek_haystacks as $haystack) { var_dump(mb_strripos($haystack, $needle)); } - } + } } echo "Done"; diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt index b330323c7e..c4d7f0d338 100644 --- a/ext/mbstring/tests/mb_strripos_basic2.phpt +++ b/ext/mbstring/tests/mb_strripos_basic2.phpt @@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -56,7 +56,7 @@ $greek_needles = array( echo "\n -- ASCII Strings --\n"; foreach ($ascii_needles as $needle) { foreach ($ascii_haystacks as $haystack) { - var_dump(mb_strripos($haystack, $needle)); + var_dump(mb_strripos($haystack, $needle)); var_dump(mb_strripos($haystack, $needle, 14)); } } @@ -65,7 +65,7 @@ echo "\n -- Greek Strings --\n"; foreach ($greek_needles as $needle) { foreach ($greek_haystacks as $haystack) { var_dump(mb_strripos($haystack, $needle)); - var_dump(mb_strripos($haystack, $needle, 12)); + var_dump(mb_strripos($haystack, $needle, 12)); } } diff --git a/ext/mbstring/tests/mb_strripos_error1.phpt b/ext/mbstring/tests/mb_strripos_error1.phpt index 3e2f6d928d..6c2d31376e 100644 --- a/ext/mbstring/tests/mb_strripos_error1.phpt +++ b/ext/mbstring/tests/mb_strripos_error1.phpt @@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_strripos_error2.phpt b/ext/mbstring/tests/mb_strripos_error2.phpt index d01a774107..ae4ee7d017 100644 --- a/ext/mbstring/tests/mb_strripos_error2.phpt +++ b/ext/mbstring/tests/mb_strripos_error2.phpt @@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_strripos_variation1.phpt b/ext/mbstring/tests/mb_strripos_variation1.phpt index 0a3be0a7da..0ba21a5624 100644 --- a/ext/mbstring/tests/mb_strripos_variation1.phpt +++ b/ext/mbstring/tests/mb_strripos_variation1.phpt @@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strripos_variation2.phpt b/ext/mbstring/tests/mb_strripos_variation2.phpt index eafe7f79e9..6777145e13 100644 --- a/ext/mbstring/tests/mb_strripos_variation2.phpt +++ b/ext/mbstring/tests/mb_strripos_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt index cc3843e102..43e847fef5 100644 --- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt @@ -9,9 +9,9 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strripos_variation4.phpt b/ext/mbstring/tests/mb_strripos_variation4.phpt index 27973e51ea..195060be07 100644 --- a/ext/mbstring/tests/mb_strripos_variation4.phpt +++ b/ext/mbstring/tests/mb_strripos_variation4.phpt @@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt index ce3074abf0..11d289f52d 100644 --- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt @@ -8,14 +8,14 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* * Test how mb_strripos() behaves when passed different integers as $offset argument - * The character length of $string_ascii and $string_mb is the same, + * The character length of $string_ascii and $string_mb is the same, * and the needle appears at the same positions in both strings */ diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt index 9de0388f43..7a49cde621 100644 --- a/ext/mbstring/tests/mb_strrpos_basic.phpt +++ b/ext/mbstring/tests/mb_strrpos_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_error1.phpt b/ext/mbstring/tests/mb_strrpos_error1.phpt index 892599acc2..f8e90d03b3 100644 --- a/ext/mbstring/tests/mb_strrpos_error1.phpt +++ b/ext/mbstring/tests/mb_strrpos_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_error2.phpt b/ext/mbstring/tests/mb_strrpos_error2.phpt index fa3719509c..ed69ce53cd 100644 --- a/ext/mbstring/tests/mb_strrpos_error2.phpt +++ b/ext/mbstring/tests/mb_strrpos_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt index f0e6e47987..cd6c111206 100644 --- a/ext/mbstring/tests/mb_strrpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "hello, world", 'hello, world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt index c2855e0f81..8a23321c02 100644 --- a/ext/mbstring/tests/mb_strrpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "world", 'world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt index da28d6ed7c..99e5962f67 100644 --- a/ext/mbstring/tests/mb_strrpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // object data /*16*/ new classA(), diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt index 287142793b..a7011dd278 100644 --- a/ext/mbstring/tests/mb_strrpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt index cb5089679b..8470aa7c6b 100644 --- a/ext/mbstring/tests/mb_strrpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation5.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strstr.phpt b/ext/mbstring/tests/mb_strstr.phpt index fcf9e85bc2..d224475370 100644 --- a/ext/mbstring/tests/mb_strstr.phpt +++ b/ext/mbstring/tests/mb_strstr.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_strstr() +mb_strstr() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --INI-- diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt index 2b41707a6a..5a9068e606 100644 --- a/ext/mbstring/tests/mb_strstr_basic.phpt +++ b/ext/mbstring/tests/mb_strstr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strstr() function : basic functionality +Test mb_strstr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strstr_error1.phpt b/ext/mbstring/tests/mb_strstr_error1.phpt index cf7c0b1f17..82ae618b5d 100644 --- a/ext/mbstring/tests/mb_strstr_error1.phpt +++ b/ext/mbstring/tests/mb_strstr_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strstr() function : error conditions +Test mb_strstr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt index 8df700080e..81daccb432 100644 --- a/ext/mbstring/tests/mb_strstr_error2.phpt +++ b/ext/mbstring/tests/mb_strstr_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strstr() function : error conditions +Test mb_strstr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strstr_variation1.phpt b/ext/mbstring/tests/mb_strstr_variation1.phpt index a9406f1cad..5dfeaee8a1 100644 --- a/ext/mbstring/tests/mb_strstr_variation1.phpt +++ b/ext/mbstring/tests/mb_strstr_variation1.phpt @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for haystack diff --git a/ext/mbstring/tests/mb_strstr_variation2.phpt b/ext/mbstring/tests/mb_strstr_variation2.phpt index 8c059cb6b2..b14da94fab 100644 --- a/ext/mbstring/tests/mb_strstr_variation2.phpt +++ b/ext/mbstring/tests/mb_strstr_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for needle diff --git a/ext/mbstring/tests/mb_strstr_variation3.phpt b/ext/mbstring/tests/mb_strstr_variation3.phpt index 6bb1c88729..18d96e5ad0 100644 --- a/ext/mbstring/tests/mb_strstr_variation3.phpt +++ b/ext/mbstring/tests/mb_strstr_variation3.phpt @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : usage variation ***\n"; @@ -108,9 +108,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for part @@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) { } else { var_dump(bin2hex($res)); - } + } }; fclose($fp); diff --git a/ext/mbstring/tests/mb_strstr_variation4.phpt b/ext/mbstring/tests/mb_strstr_variation4.phpt index 8a0efcba8e..088f4dac0d 100644 --- a/ext/mbstring/tests/mb_strstr_variation4.phpt +++ b/ext/mbstring/tests/mb_strstr_variation4.phpt @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : usage variation ***\n"; @@ -102,9 +102,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for encoding diff --git a/ext/mbstring/tests/mb_strstr_variation5.phpt b/ext/mbstring/tests/mb_strstr_variation5.phpt index ab6315be44..2b6fd238b8 100644 --- a/ext/mbstring/tests/mb_strstr_variation5.phpt +++ b/ext/mbstring/tests/mb_strstr_variation5.phpt @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_strstr_variation6.phpt b/ext/mbstring/tests/mb_strstr_variation6.phpt index d00f15cfa3..c2438b771e 100644 --- a/ext/mbstring/tests/mb_strstr_variation6.phpt +++ b/ext/mbstring/tests/mb_strstr_variation6.phpt @@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_strtolower_variation1.phpt b/ext/mbstring/tests/mb_strtolower_variation1.phpt index 3b151b96c7..057fc299ce 100644 --- a/ext/mbstring/tests/mb_strtolower_variation1.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation1.phpt @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*18*/ "String", 'String', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt index 43d0f53728..b5195cb995 100644 --- a/ext/mbstring/tests/mb_strtolower_variation2.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt index f08b508798..e8792c0d96 100644 --- a/ext/mbstring/tests/mb_strtolower_variation4.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt @@ -18,7 +18,7 @@ function_exists('mb_strtolower') or die("skip mb_strtolower() is not available i echo "*** Testing mb_strtolower() : usage variations ***\n"; -$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', +$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='), 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw==')); $lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz', diff --git a/ext/mbstring/tests/mb_strtoupper_variation1.phpt b/ext/mbstring/tests/mb_strtoupper_variation1.phpt index efe8845638..6331db27ba 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation1.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation1.phpt @@ -13,7 +13,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i */ /* - * + * * Pass different data types as $sourcestring argument to mb_strtoupper to test behaviour */ @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -75,7 +75,7 @@ $inputs = array( /*18*/ "String", 'String', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt index 52beb3d741..ec90324a10 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt index 8f5abe7269..733ed8a1b5 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt @@ -19,7 +19,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i echo "*** Testing mb_strtoupper() : usage variations ***\n"; -$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', +$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='), 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw==')); $lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz', diff --git a/ext/mbstring/tests/mb_substitute_character.phpt b/ext/mbstring/tests/mb_substitute_character.phpt index db1198822f..502a4136dd 100644 --- a/ext/mbstring/tests/mb_substitute_character.phpt +++ b/ext/mbstring/tests/mb_substitute_character.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_substitute_character() +mb_substitute_character() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_substitute_character_basic.phpt b/ext/mbstring/tests/mb_substitute_character_basic.phpt index 036203f416..9fa3a5b1ac 100644 --- a/ext/mbstring/tests/mb_substitute_character_basic.phpt +++ b/ext/mbstring/tests/mb_substitute_character_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substitute_character() function : basic functionality +Test mb_substitute_character() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( --FILE-- <?php /* Prototype : mixed mb_substitute_character([mixed substchar]) - * Description: Sets the current substitute_character or returns the current substitute_character + * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_substitute_character() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_substitute_character_error.phpt b/ext/mbstring/tests/mb_substitute_character_error.phpt index 2a816b8b2f..4fe13683ea 100644 --- a/ext/mbstring/tests/mb_substitute_character_error.phpt +++ b/ext/mbstring/tests/mb_substitute_character_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substitute_character() function : error conditions +Test mb_substitute_character() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( --FILE-- <?php /* Prototype : mixed mb_substitute_character([mixed substchar]) - * Description: Sets the current substitute_character or returns the current substitute_character + * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_substitute_character() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt index fa786a1e5c..10df85ea27 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substitute_character() function : usage variation +Test mb_substitute_character() function : usage variation --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,9 +8,9 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( --FILE-- <?php /* Prototype : mixed mb_substitute_character([mixed substchar]) - * Description: Sets the current substitute_character or returns the current substitute_character + * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_substitute_character() : usage variation ***\n"; diff --git a/ext/mbstring/tests/mb_substitute_character_variation2.phpt b/ext/mbstring/tests/mb_substitute_character_variation2.phpt index 6248174aa6..d447dc87d7 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation2.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation2.phpt @@ -8,9 +8,9 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( --FILE-- <?php /* Prototype : mixed mb_substitute_character([mixed substchar]) - * Description: Sets the current substitute_character or returns the current substitute_character + * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_substitute_character() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt index d6d6b75d23..dc09fe381f 100644 --- a/ext/mbstring/tests/mb_substr_basic.phpt +++ b/ext/mbstring/tests/mb_substr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substr() function : basic functionality +Test mb_substr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -10,7 +10,7 @@ mbstring.internal_encoding=ISO-8859-1 --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt index c4d1d7830a..31e3620f1c 100644 --- a/ext/mbstring/tests/mb_substr_count_basic.phpt +++ b/ext/mbstring/tests/mb_substr_count_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_error1.phpt b/ext/mbstring/tests/mb_substr_count_error1.phpt index 881ca0c22e..50c6765541 100644 --- a/ext/mbstring/tests/mb_substr_count_error1.phpt +++ b/ext/mbstring/tests/mb_substr_count_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_error2.phpt b/ext/mbstring/tests/mb_substr_count_error2.phpt index aefb2c05c8..e715e30ad9 100644 --- a/ext/mbstring/tests/mb_substr_count_error2.phpt +++ b/ext/mbstring/tests/mb_substr_count_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_variation1.phpt b/ext/mbstring/tests/mb_substr_count_variation1.phpt index cc55135ab2..86efcadad9 100644 --- a/ext/mbstring/tests/mb_substr_count_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype :int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "hello, world", 'hello, world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_count_variation2.phpt b/ext/mbstring/tests/mb_substr_count_variation2.phpt index 87b5eed189..48dd675fda 100644 --- a/ext/mbstring/tests/mb_substr_count_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substr_count() function : usage variations - pass different data types as $needle arg +Test mb_substr_count() function : usage variations - pass different data types as $needle arg --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -75,7 +75,7 @@ $inputs = array( /*18*/ "world", 'world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt index d2e7a60566..3b1e442724 100644 --- a/ext/mbstring/tests/mb_substr_count_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt index 21c9f956fb..cef5fdd9aa 100644 --- a/ext/mbstring/tests/mb_substr_count_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_error1.phpt b/ext/mbstring/tests/mb_substr_error1.phpt index e48b3193b3..e8dfe29ad4 100644 --- a/ext/mbstring/tests/mb_substr_error1.phpt +++ b/ext/mbstring/tests/mb_substr_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_error2.phpt b/ext/mbstring/tests/mb_substr_error2.phpt index 72be974ed0..85bea20e10 100644 --- a/ext/mbstring/tests/mb_substr_error2.phpt +++ b/ext/mbstring/tests/mb_substr_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt index b02daa3450..6e5ec9ef2b 100644 --- a/ext/mbstring/tests/mb_substr_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt index 7c763f3616..5a72406b6b 100644 --- a/ext/mbstring/tests/mb_substr_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt index ce4df53005..f4a4643421 100644 --- a/ext/mbstring/tests/mb_substr_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ @@ -44,7 +44,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { echo "Difference in length of ASCII string and multibyte string\n"; } - + } echo "Done"; diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt index 1ec92be993..a9be0686fa 100644 --- a/ext/mbstring/tests/mb_substr_variation5.phpt +++ b/ext/mbstring/tests/mb_substr_variation5.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ @@ -45,7 +45,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { echo "Difference in length of ASCII string and multibyte string\n"; } - + } echo "Done"; diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt index aa75c70c00..b1783c839f 100644 --- a/ext/mbstring/tests/mb_substr_variation6.phpt +++ b/ext/mbstring/tests/mb_substr_variation6.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ @@ -41,7 +41,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { var_dump($a); - } + } echo "--Multibyte String --\n"; $b = mb_substr($string_mb, $i, 4, 'UTF-8'); if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length @@ -49,7 +49,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { echo "Difference in length of ASCII string and multibyte string\n"; } - + } echo "Done"; diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt index 22b5fa2fe3..da00d4b80a 100644 --- a/ext/mbstring/tests/mb_substr_variation7.phpt +++ b/ext/mbstring/tests/mb_substr_variation7.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ @@ -42,7 +42,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { var_dump($a); - } + } echo "--Multibyte String --\n"; $b = mb_substr($string_mb, 1, $i, 'UTF-8'); if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length @@ -50,7 +50,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { echo "Difference in length of ASCII string and multibyte string\n"; } - + } echo "Done"; diff --git a/ext/mbstring/tests/overload01.phpt b/ext/mbstring/tests/overload01.phpt index 7efc65da82..0657394d2e 100644 --- a/ext/mbstring/tests/overload01.phpt +++ b/ext/mbstring/tests/overload01.phpt @@ -1,8 +1,8 @@ --TEST-- Function overloading test 1 --SKIPIF-- -<?php - extension_loaded('mbstring') or die('skip mbstring not available'); +<?php + extension_loaded('mbstring') or die('skip mbstring not available'); if (!function_exists("mail")) { die('skip mail() function is not available.'); } diff --git a/ext/mbstring/tests/overload02.phpt b/ext/mbstring/tests/overload02.phpt index 48705b782b..b237a6254e 100644 --- a/ext/mbstring/tests/overload02.phpt +++ b/ext/mbstring/tests/overload02.phpt @@ -1,8 +1,8 @@ --TEST-- -Function overloading test 2 +Function overloading test 2 --SKIPIF-- -<?php - extension_loaded('mbstring') or die('skip mbstring not available'); +<?php + extension_loaded('mbstring') or die('skip mbstring not available'); if (!function_exists("mail")) { die('skip mail() function is not available.'); } diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt index f9599d995f..fff136d692 100644 --- a/ext/mbstring/tests/php_gr_jp_10830.phpt +++ b/ext/mbstring/tests/php_gr_jp_10830.phpt @@ -1,5 +1,5 @@ --TEST-- -php-users@php.gr.jp #10830 +php-users@php.gr.jp #10830 --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); diff --git a/ext/mbstring/tests/simpletest.phpt b/ext/mbstring/tests/simpletest.phpt index 80b2f72596..b07b6f52bc 100644 --- a/ext/mbstring/tests/simpletest.phpt +++ b/ext/mbstring/tests/simpletest.phpt @@ -18,7 +18,7 @@ $s2 = "この文字が連結されているはず。"; echo "echo: ".$s1.$s2."\n"; print("print: ".$s1.$s2."\n"); printf("printf: %s%s\n",$s1, $s2); -echo sprintf("sprintf: %s%s\n",$s1, $s2); +echo sprintf("sprintf: %s%s\n",$s1, $s2); // Assign to var $s3 = $s1.$s2."\n"; |