diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:29:24 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:29:24 +0200 |
| commit | 113213f0277562a4ca6d020cb28ba98321d3c62a (patch) | |
| tree | bbe57fa40e644a1e1861af1d362a3e40e345b620 /ext/standard/tests/strings | |
| parent | 7af945e271d042a4991c9510f78b6ff7ac43ac34 (diff) | |
| download | php-git-113213f0277562a4ca6d020cb28ba98321d3c62a.tar.gz | |
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'ext/standard/tests/strings')
195 files changed, 123 insertions, 197 deletions
diff --git a/ext/standard/tests/strings/add-and-stripcslashes.phpt b/ext/standard/tests/strings/add-and-stripcslashes.phpt index 7c7e36edc5..79923f42db 100644 --- a/ext/standard/tests/strings/add-and-stripcslashes.phpt +++ b/ext/standard/tests/strings/add-and-stripcslashes.phpt @@ -14,8 +14,6 @@ echo stripcslashes('\065\x64')."\n"; echo stripcslashes('')."\n"; ?> --EXPECT-- - - kaboemkara! foo\b\a\r\b\az \f\o\o\[ \] @@ -23,4 +21,3 @@ foo\b\a\r\b\az \abcd\e\f\g\h\i\j\k\l\m\n\o\pqrstuvwxy\z 1 5d - diff --git a/ext/standard/tests/strings/basename_invalid_path.phpt b/ext/standard/tests/strings/basename_invalid_path.phpt index db0130c2a2..f6e68cec75 100644 --- a/ext/standard/tests/strings/basename_invalid_path.phpt +++ b/ext/standard/tests/strings/basename_invalid_path.phpt @@ -16,7 +16,6 @@ if((substr(PHP_OS, 0, 3) == "WIN")) var_dump(basename(chr(-1))); echo "Done\n"; - --EXPECTF-- string(0) "" Done diff --git a/ext/standard/tests/strings/basename_invalid_path_win.phpt b/ext/standard/tests/strings/basename_invalid_path_win.phpt index 3cb74c21ed..bd6435a4b0 100644 --- a/ext/standard/tests/strings/basename_invalid_path_win.phpt +++ b/ext/standard/tests/strings/basename_invalid_path_win.phpt @@ -16,7 +16,6 @@ if((substr(PHP_OS, 0, 3) != "WIN")) var_dump(basename("\377")); echo "Done\n"; - --EXPECTF-- string(1) "%c" Done diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt index 2be0aad5ee..f574b76998 100644 --- a/ext/standard/tests/strings/basename_variation.phpt +++ b/ext/standard/tests/strings/basename_variation.phpt @@ -85,7 +85,6 @@ echo "*** Testing possible variations in path and suffix ***\n"; check_basename( $file_path_variations ); echo "Done\n"; - --EXPECTF-- *** Testing possible variations in path and suffix *** diff --git a/ext/standard/tests/strings/bin2hex_variation1.phpt b/ext/standard/tests/strings/bin2hex_variation1.phpt index 2b8513879c..d7bf15f4f4 100644 --- a/ext/standard/tests/strings/bin2hex_variation1.phpt +++ b/ext/standard/tests/strings/bin2hex_variation1.phpt @@ -125,4 +125,4 @@ NULL string(0) "" -- Iteration 19 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/bug20261.phpt b/ext/standard/tests/strings/bug20261.phpt index 163e905a4a..3c03afb43d 100644 --- a/ext/standard/tests/strings/bug20261.phpt +++ b/ext/standard/tests/strings/bug20261.phpt @@ -23,4 +23,3 @@ Bug #20261 (str_rot13() changes too much) 1: boo 2: boo 3: obb - diff --git a/ext/standard/tests/strings/bug23650.phpt b/ext/standard/tests/strings/bug23650.phpt index 01dc88843d..7950231462 100644 --- a/ext/standard/tests/strings/bug23650.phpt +++ b/ext/standard/tests/strings/bug23650.phpt @@ -28,4 +28,3 @@ echo strip_tags($str, '<abc>'); 4:<abc - def> 5:abc - def 6:</abc> - diff --git a/ext/standard/tests/strings/bug25671.phpt b/ext/standard/tests/strings/bug25671.phpt index ac64790704..ab26ddf772 100644 --- a/ext/standard/tests/strings/bug25671.phpt +++ b/ext/standard/tests/strings/bug25671.phpt @@ -20,4 +20,3 @@ a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0; a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:22:"This is a last strung.";} a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";} a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";} - diff --git a/ext/standard/tests/strings/bug37244.phpt b/ext/standard/tests/strings/bug37244.phpt index 0718c8a4d3..bd9628e877 100644 --- a/ext/standard/tests/strings/bug37244.phpt +++ b/ext/standard/tests/strings/bug37244.phpt @@ -15,4 +15,3 @@ foreach($strings as $string) { string(93) "Implementations MUST reject the encoding if it contains characters outside the base alphabet." bool(false) string(92) "Implemem][ÛœÈUTÕ ™Z™XÝ H[˜ÛÙ[™ÈYˆ]ÛÛZ[œÈÚ\˜XÝ\œÈÝ] ÚYH H˜\ÙH[ X™] " - diff --git a/ext/standard/tests/strings/bug45166.phpt b/ext/standard/tests/strings/bug45166.phpt index eb32e739e0..7140f762ca 100644 --- a/ext/standard/tests/strings/bug45166.phpt +++ b/ext/standard/tests/strings/bug45166.phpt @@ -7,4 +7,4 @@ Bug #45166 (substr() ) ===DONE=== --EXPECT-- cd -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/bug61038.phpt b/ext/standard/tests/strings/bug61038.phpt index 7130804fa4..3c0831a0cb 100644 --- a/ext/standard/tests/strings/bug61038.phpt +++ b/ext/standard/tests/strings/bug61038.phpt @@ -23,4 +23,3 @@ array(1) { [1]=> string(5) "str%c%c" } - diff --git a/ext/standard/tests/strings/bug61116.phpt b/ext/standard/tests/strings/bug61116.phpt index 2bd9f2537f..24dd0e2750 100644 --- a/ext/standard/tests/strings/bug61116.phpt +++ b/ext/standard/tests/strings/bug61116.phpt @@ -24,6 +24,3 @@ Function [ <internal:standard> function get_html_translation_table ] { Parameter #2 [ <optional> $encoding ] } } - - - diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt index 9ae18c0890..55c81c703d 100644 --- a/ext/standard/tests/strings/bug65230.phpt +++ b/ext/standard/tests/strings/bug65230.phpt @@ -57,4 +57,3 @@ German_Germany.1252 %f: 3,410000 %F: 3.410000 date: 05.12.2014 - diff --git a/ext/standard/tests/strings/bug67252.phpt b/ext/standard/tests/strings/bug67252.phpt index 576524f1d2..eab2112afa 100644 --- a/ext/standard/tests/strings/bug67252.phpt +++ b/ext/standard/tests/strings/bug67252.phpt @@ -8,6 +8,5 @@ var_dump(convert_uudecode($a)); ?> --EXPECTF-- - Warning: convert_uudecode(): The given parameter is not a valid uuencoded string in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/bug68996.phpt b/ext/standard/tests/strings/bug68996.phpt index ce11b3ee47..fea1371a32 100644 --- a/ext/standard/tests/strings/bug68996.phpt +++ b/ext/standard/tests/strings/bug68996.phpt @@ -14,4 +14,3 @@ fopen("\xfc\x63", "r"); --EXPECTF-- <br /> <b>Warning</b>: : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> - diff --git a/ext/standard/tests/strings/bug73058.phpt b/ext/standard/tests/strings/bug73058.phpt index 1d1e5a15f5..35ab932dd9 100644 --- a/ext/standard/tests/strings/bug73058.phpt +++ b/ext/standard/tests/strings/bug73058.phpt @@ -26,4 +26,3 @@ string(60) "$2y$07$usesomesillystringforex.u2VJUMLRWaJNuw0Hu2FvCEimdeYVO" string(60) "$2y$07$usesomesillystringforex.u2VJUMLRWaJNuw0Hu2FvCEimdeYVO" string(60) "$2y$07$usesomesillystringforuw2Gm1ef7lMsvtzSK2p/14F0q1e8uOCO" ==OK== - diff --git a/ext/standard/tests/strings/chop_variation4.phpt b/ext/standard/tests/strings/chop_variation4.phpt Binary files differindex cd269dfa58..9b44daf3d2 100644 --- a/ext/standard/tests/strings/chop_variation4.phpt +++ b/ext/standard/tests/strings/chop_variation4.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation3.phpt b/ext/standard/tests/strings/chunk_split_variation3.phpt index 408d8c8afb..791535371f 100644 --- a/ext/standard/tests/strings/chunk_split_variation3.phpt +++ b/ext/standard/tests/strings/chunk_split_variation3.phpt @@ -157,4 +157,4 @@ string(22) "This is simple string." Warning: chunk_split() expects parameter 3 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index 4242a81a9b..675fcac036 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -73,4 +73,4 @@ string(59) " Te):(sting w):(ith ):(multipl):(e space):(s ):(" string(55) "Testing):( invali):(d \k an):(d \m es):(cape ch):(ar):(" -- Iteration 12 -- string(46) "This is):( to che):(ck with):( \n and):( \t):(" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt index 47174defef..89cb6ccc4b 100644 --- a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt @@ -136,4 +136,4 @@ NULL string(0) "" -- Iteration 22 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/crc32_basic.phpt b/ext/standard/tests/strings/crc32_basic.phpt index 9c3ea44594..03c9c79b80 100644 --- a/ext/standard/tests/strings/crc32_basic.phpt +++ b/ext/standard/tests/strings/crc32_basic.phpt @@ -5,7 +5,6 @@ Test crc32() function : basic functionality if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> - --FILE-- <?php /* Prototype : string crc32(string $str) diff --git a/ext/standard/tests/strings/crc32_error.phpt b/ext/standard/tests/strings/crc32_error.phpt index e8b708d97f..0db522947f 100644 --- a/ext/standard/tests/strings/crc32_error.phpt +++ b/ext/standard/tests/strings/crc32_error.phpt @@ -5,7 +5,6 @@ Test crc32() function : error conditions if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> - --FILE-- <?php /* Prototype : string crc32(string $str) diff --git a/ext/standard/tests/strings/crc32_variation1.phpt b/ext/standard/tests/strings/crc32_variation1.phpt index 1d6f33ec2e..21d3fbe0dc 100644 --- a/ext/standard/tests/strings/crc32_variation1.phpt +++ b/ext/standard/tests/strings/crc32_variation1.phpt @@ -5,7 +5,6 @@ Test crc32() function : usage variations - unexpected values if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> - --FILE-- <?php /* Prototype : string crc32(string $str) @@ -194,4 +193,4 @@ int(0) Warning: crc32() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt index 1a97492591..d4ba940dcd 100644 --- a/ext/standard/tests/strings/crypt_sha256.phpt +++ b/ext/standard/tests/strings/crypt_sha256.phpt @@ -61,4 +61,3 @@ Got <$res>\n"; echo "Passes.";?> --EXPECTF-- Passes. - diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt index cd0345f61f..625909486b 100644 --- a/ext/standard/tests/strings/crypt_sha512.phpt +++ b/ext/standard/tests/strings/crypt_sha512.phpt @@ -62,4 +62,3 @@ echo "Passes."; ?> --EXPECTF-- Passes. - diff --git a/ext/standard/tests/strings/dirname_basic.phpt b/ext/standard/tests/strings/dirname_basic.phpt index 9006b27619..1fafffde3f 100644 --- a/ext/standard/tests/strings/dirname_basic.phpt +++ b/ext/standard/tests/strings/dirname_basic.phpt @@ -60,7 +60,6 @@ check_dirname( $file_paths ); echo "Done\n"; ?> - --EXPECTREGEX-- \*\*\* Testing basic operations \*\*\* diff --git a/ext/standard/tests/strings/dirname_variation.phpt b/ext/standard/tests/strings/dirname_variation.phpt index 71a2e4db2e..314fd3e742 100644 --- a/ext/standard/tests/strings/dirname_variation.phpt +++ b/ext/standard/tests/strings/dirname_variation.phpt @@ -140,4 +140,4 @@ string\(0\) "" --Iteration 24 -- string\(0\) "" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/explode_error.phpt b/ext/standard/tests/strings/explode_error.phpt index e88b1b0c6b..d86e1edb1f 100644 --- a/ext/standard/tests/strings/explode_error.phpt +++ b/ext/standard/tests/strings/explode_error.phpt @@ -34,4 +34,4 @@ NULL Warning: explode() expects at most 3 parameters, 4 given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt index d60d26bec6..ee072ef066 100644 --- a/ext/standard/tests/strings/explode_variation3.phpt +++ b/ext/standard/tests/strings/explode_variation3.phpt @@ -235,4 +235,4 @@ array(1) { [0]=> string(41) "piece1 piece2 piece3 piece4 piece5 piece6" } -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/strings/explode_variation5.phpt b/ext/standard/tests/strings/explode_variation5.phpt index 754e55222a..e5e6dd75d9 100644 --- a/ext/standard/tests/strings/explode_variation5.phpt +++ b/ext/standard/tests/strings/explode_variation5.phpt @@ -45,4 +45,4 @@ array(3) { -- negative limit (since PHP 5.1) with null string -- array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/explode_variation6.phpt b/ext/standard/tests/strings/explode_variation6.phpt index 14b6d401a2..730e69ba13 100644 --- a/ext/standard/tests/strings/explode_variation6.phpt +++ b/ext/standard/tests/strings/explode_variation6.phpt @@ -67,4 +67,4 @@ string(6) "6f6e65" string(6) "74776f" string(10) "7468726565" string(8) "666f7572" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt index 4e5c5afc14..0f7a896e9f 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt @@ -339,4 +339,4 @@ array(3) { ["<"]=> string(4) "<" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt index 6e144c0c51..595d8fd944 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt @@ -92,4 +92,4 @@ array(3) { ["<"]=> string(4) "<" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/html_entity_decode1.phpt b/ext/standard/tests/strings/html_entity_decode1.phpt index 5eabfc35a5..8d7a07784e 100644 --- a/ext/standard/tests/strings/html_entity_decode1.phpt +++ b/ext/standard/tests/strings/html_entity_decode1.phpt @@ -64,4 +64,4 @@ echo "Done.\n"; &aa;$ &;& &;$ -Done.
\ No newline at end of file +Done. diff --git a/ext/standard/tests/strings/html_entity_decode2.phpt b/ext/standard/tests/strings/html_entity_decode2.phpt index b8a6e49eb3..1eb643bd0e 100644 --- a/ext/standard/tests/strings/html_entity_decode2.phpt +++ b/ext/standard/tests/strings/html_entity_decode2.phpt @@ -30,4 +30,4 @@ echo "Done.\n"; ' *** XML 1.0 *** ' -Done.
\ No newline at end of file +Done. diff --git a/ext/standard/tests/strings/html_entity_decode_cp866.phpt b/ext/standard/tests/strings/html_entity_decode_cp866.phpt index 18f6f3c90b..685e0f66a6 100644 --- a/ext/standard/tests/strings/html_entity_decode_cp866.phpt +++ b/ext/standard/tests/strings/html_entity_decode_cp866.phpt @@ -529,5 +529,3 @@ BLACK SQUARE: ■ => fe NO-BREAK SPACE:   => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt index 09fd5df02b..f41a5e16f5 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt @@ -401,5 +401,3 @@ LATIN SMALL LETTER THORN: þ => fe LATIN SMALL LETTER Y WITH DIAERESIS: ÿ => ff ÿ => ff - - diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt index 070ed536f4..eb13827cee 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt @@ -401,5 +401,3 @@ CYRILLIC SMALL LETTER SHORT U: ў => 2623783435453b CYRILLIC SMALL LETTER DZHE: џ => 2623783435463b ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt index e8523f6a09..adaa8563bd 100644 --- a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt +++ b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt @@ -529,5 +529,3 @@ CYRILLIC CAPITAL LETTER CHE: Ч => fe CYRILLIC CAPITAL LETTER HARD SIGN: Ъ => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_macroman.phpt b/ext/standard/tests/strings/html_entity_decode_macroman.phpt index 4f500dc4e7..c4c9dd493b 100644 --- a/ext/standard/tests/strings/html_entity_decode_macroman.phpt +++ b/ext/standard/tests/strings/html_entity_decode_macroman.phpt @@ -536,5 +536,3 @@ OGONEK: ˛ => fe CARON: ˇ => ff ÿ => d8 - - diff --git a/ext/standard/tests/strings/html_entity_decode_win1251.phpt b/ext/standard/tests/strings/html_entity_decode_win1251.phpt index e60d7074bf..4b96f01774 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1251.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1251.phpt @@ -533,5 +533,3 @@ CYRILLIC SMALL LETTER YU: ю => fe CYRILLIC SMALL LETTER YA: я => ff ÿ => ÿ - - diff --git a/ext/standard/tests/strings/html_entity_decode_win1252.phpt b/ext/standard/tests/strings/html_entity_decode_win1252.phpt index 6163ef24ae..436b0d464a 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1252.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1252.phpt @@ -165,5 +165,3 @@ LATIN SMALL LETTER Z WITH CARON: ž => 9e LATIN CAPITAL LETTER Y WITH DIAERESIS: Ÿ => 9f Ÿ => Ÿ - - diff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt index 3ffdd65a5f..218e325730 100644 --- a/ext/standard/tests/strings/htmlentities24.phpt +++ b/ext/standard/tests/strings/htmlentities24.phpt @@ -43,7 +43,6 @@ var_dump( htmlentities("\x84\x91",ENT_QUOTES, 'cp1252', "test1") ); echo "Done\n"; ?> - --EXPECTF-- *** Retrieving htmlentities for 256 characters *** string(12) "636872283029" @@ -328,4 +327,3 @@ Warning: htmlentities() expects at least 1 parameter, 0 given in %s on line %d NULL string(14) "„‘" Done - diff --git a/ext/standard/tests/strings/htmlentities_html5.phpt b/ext/standard/tests/strings/htmlentities_html5.phpt index 427ba0bc35..4a91012bd7 100644 --- a/ext/standard/tests/strings/htmlentities_html5.phpt +++ b/ext/standard/tests/strings/htmlentities_html5.phpt @@ -1621,4 +1621,4 @@ foreach ($mpcent as $i) { ⫆̸ U+02AC6 U+00338 ⫋︀ U+02ACB U+0FE00 ⫌︀ U+02ACC U+0FE00 -⫽︀ U+02AFD U+0FE00
\ No newline at end of file +⫽︀ U+02AFD U+0FE00 diff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt index 5d741e5ecb..48e37781f0 100644 --- a/ext/standard/tests/strings/htmlspecialchars.phpt +++ b/ext/standard/tests/strings/htmlspecialchars.phpt @@ -328,4 +328,3 @@ Warning: htmlspecialchars() expects at least 1 parameter, 0 given in %s on line NULL string(10) "<br>" Done - diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt index 44396b0e2b..4ac7733702 100644 --- a/ext/standard/tests/strings/htmlspecialchars_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt @@ -94,4 +94,4 @@ Test 27: "300 < 400" Try with double decode TRUE Test 28: &quot;&amp;xyz&gt;abc&quot; Test 29: &quot;&amp;123&lt;456&quot; -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt index 4b4af9c63f..35719186e4 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt @@ -158,4 +158,4 @@ string(0) "" Warning: htmlspecialchars_decode() expects parameter 1 to be string, resource given in %s on line %d NULL ===DONE=== -
\ No newline at end of file + diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index 451a326001..28bc6068fa 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -96,4 +96,4 @@ string(153) "<html>< This's a string with quotes: "strings in double quote" & 'strings in single quote' " this\line is 'single quoted' /with\slashes </html>" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index a57abd21c4..d8fb8333ea 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -73,4 +73,4 @@ string(30) " 1 3 & gt; 11 but 11 & lt; 12" string(30) " 1 3 & gt; 11 but 11 & lt; 12" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/http_build_query_error.phpt b/ext/standard/tests/strings/http_build_query_error.phpt index 30155e62a3..f451310642 100644 --- a/ext/standard/tests/strings/http_build_query_error.phpt +++ b/ext/standard/tests/strings/http_build_query_error.phpt @@ -10,4 +10,4 @@ $result = http_build_query(null); ?> --EXPECTF-- -Warning: http_build_query(): Parameter 1 expected to be Array or Object. %s value given in %s on line %d
\ No newline at end of file +Warning: http_build_query(): Parameter 1 expected to be Array or Object. %s value given in %s on line %d diff --git a/ext/standard/tests/strings/implode.phpt b/ext/standard/tests/strings/implode.phpt index 36be0f395c..e86be61058 100644 --- a/ext/standard/tests/strings/implode.phpt +++ b/ext/standard/tests/strings/implode.phpt @@ -15,8 +15,6 @@ echo implode(':', array('foo', array('bar', 'baz'), 'burp'))."\n"; echo $php_errormsg."\n"; ?> --EXPECTF-- - - foobarbaz foo:bar:baz foo:Array:burp diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 8c830c8d07..41f2e32d77 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -164,4 +164,4 @@ string(%d) "element1Resource id #%delement2" string(16) "element1element2" -- Iteration 26 -- string(16) "element1element2" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/ltrim_error.phpt b/ext/standard/tests/strings/ltrim_error.phpt index 4d6e413672..694d9fea18 100644 --- a/ext/standard/tests/strings/ltrim_error.phpt +++ b/ext/standard/tests/strings/ltrim_error.phpt @@ -58,4 +58,4 @@ string(14) " Hello World Warning: ltrim(): Invalid '..'-range in %s on line %d string(14) " Hello World " -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/ltrim_variation1.phpt b/ext/standard/tests/strings/ltrim_variation1.phpt index 48b76e9be7..f476b9b793 100644 --- a/ext/standard/tests/strings/ltrim_variation1.phpt +++ b/ext/standard/tests/strings/ltrim_variation1.phpt @@ -135,4 +135,4 @@ NULL string(0) "" -- Iteration 22 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/ltrim_variation2.phpt b/ext/standard/tests/strings/ltrim_variation2.phpt index 40254843a1..5dc260e8a1 100644 --- a/ext/standard/tests/strings/ltrim_variation2.phpt +++ b/ext/standard/tests/strings/ltrim_variation2.phpt @@ -135,4 +135,4 @@ NULL string(19) "!---Hello World---!" -- Iteration 22 -- string(19) "!---Hello World---!" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt index 5db1056159..2c0bcfba05 100644 --- a/ext/standard/tests/strings/md5_basic2.phpt +++ b/ext/standard/tests/strings/md5_basic2.phpt @@ -27,4 +27,4 @@ if (strcmp(bin2hex($md5_raw), $md5) == 0 ) { *** Testing md5() : basic functionality - with raw output*** string(32) "b10a8db164e0754105b7a99be72e3fe5" TEST PASSED -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/md5_error.phpt b/ext/standard/tests/strings/md5_error.phpt index dbdbdcb2a5..138df1b8bd 100644 --- a/ext/standard/tests/strings/md5_error.phpt +++ b/ext/standard/tests/strings/md5_error.phpt @@ -32,4 +32,4 @@ NULL Warning: md5() expects at most 2 parameters, 3 given in %s on line %d NULL -===DONE==
\ No newline at end of file +===DONE== diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt Binary files differindex 8e91776781..3e996eccd3 100644 --- a/ext/standard/tests/strings/md5_file.phpt +++ b/ext/standard/tests/strings/md5_file.phpt diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index 61fd816dae..dc9b167ebf 100644 --- a/ext/standard/tests/strings/money_format_basic1.phpt +++ b/ext/standard/tests/strings/money_format_basic1.phpt @@ -77,4 +77,3 @@ Format again suppress currency symbol string string ===DONE=== - diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index 25c52cb7ab..a03f734d52 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -34,4 +34,4 @@ string(9) "Wednesday" string(3) "Jul" string(5) "April" string(1) "." -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/pack_A.phpt b/ext/standard/tests/strings/pack_A.phpt index 59fc22e122..b5a7b97fc3 100644 --- a/ext/standard/tests/strings/pack_A.phpt +++ b/ext/standard/tests/strings/pack_A.phpt @@ -22,4 +22,3 @@ array(1) { [1]=> string(3) "foo" } - diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt index f88814fa67..26fcaadec4 100644 --- a/ext/standard/tests/strings/parse_str_basic1.phpt +++ b/ext/standard/tests/strings/parse_str_basic1.phpt @@ -73,4 +73,4 @@ array(3) { ["third"]=> string(4) "val3" } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/parse_str_basic2.phpt b/ext/standard/tests/strings/parse_str_basic2.phpt index 57dba7d76c..43c069ee9b 100644 --- a/ext/standard/tests/strings/parse_str_basic2.phpt +++ b/ext/standard/tests/strings/parse_str_basic2.phpt @@ -23,4 +23,4 @@ NULL string(4) "val1" string(4) "val2" string(4) "val3" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/parse_str_basic4.phpt b/ext/standard/tests/strings/parse_str_basic4.phpt index 894dbf0c2d..8359ef9b20 100644 --- a/ext/standard/tests/strings/parse_str_basic4.phpt +++ b/ext/standard/tests/strings/parse_str_basic4.phpt @@ -84,4 +84,4 @@ array(1) { } } } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/parse_str_error1.phpt b/ext/standard/tests/strings/parse_str_error1.phpt index dcc3888e7e..9683a7d901 100644 --- a/ext/standard/tests/strings/parse_str_error1.phpt +++ b/ext/standard/tests/strings/parse_str_error1.phpt @@ -29,4 +29,4 @@ Warning: parse_str() expects at least 1 parameter, 0 given in %s on line %d -- Testing htmlentities() function with more than expected no. of arguments -- Warning: parse_str() expects at most 2 parameters, 3 given in %s on line %d -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 8e552e1855..077b8270b5 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -153,4 +153,4 @@ int(1) -- Iteration 21 -- int(1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/printf_basic3.phpt b/ext/standard/tests/strings/printf_basic3.phpt index 1e51d41fc5..6e4c3125ec 100644 --- a/ext/standard/tests/strings/printf_basic3.phpt +++ b/ext/standard/tests/strings/printf_basic3.phpt @@ -79,4 +79,4 @@ int(19) int(29) 11.110000 22.220000 33.330000 int(29) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/printf_basic5.phpt b/ext/standard/tests/strings/printf_basic5.phpt index 57b17d4945..b1e55e2776 100644 --- a/ext/standard/tests/strings/printf_basic5.phpt +++ b/ext/standard/tests/strings/printf_basic5.phpt @@ -58,4 +58,4 @@ int(3) -- Calling printf() with three arguments -- A B C int(5) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt index e5b8abd726..f382f2ed28 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -80,4 +80,4 @@ b 84 b1 int(7) B 84 B1 int(7) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt index bce0c4d0d7..a88390bc04 100644 --- a/ext/standard/tests/strings/printf_error.phpt +++ b/ext/standard/tests/strings/printf_error.phpt @@ -67,4 +67,4 @@ bool(false) Warning: printf(): Too few arguments in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index 00572add56..da9fe3499c 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -20,4 +20,4 @@ var_dump(quotemeta("\+*?[^]($)")); string(20) "Hello how are you \?" string(19) "\(100 \+ 50\) \* 10" string(20) "\\\+\*\?\[\^\]\(\$\)" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/quotemeta_error.phpt b/ext/standard/tests/strings/quotemeta_error.phpt index 76efe085ca..a4284eca55 100644 --- a/ext/standard/tests/strings/quotemeta_error.phpt +++ b/ext/standard/tests/strings/quotemeta_error.phpt @@ -31,4 +31,4 @@ NULL Warning: quotemeta() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/rtrim_basic.phpt b/ext/standard/tests/strings/rtrim_basic.phpt index dbbd6c6154..9946f90c6e 100644 --- a/ext/standard/tests/strings/rtrim_basic.phpt +++ b/ext/standard/tests/strings/rtrim_basic.phpt @@ -51,4 +51,4 @@ string(10) "0123456789" -- Trim the ASCII control characters at the beginning of a string -- string(14) "Example string" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sha1_basic.phpt b/ext/standard/tests/strings/sha1_basic.phpt index 00b764f416..0761fe4cfd 100644 --- a/ext/standard/tests/strings/sha1_basic.phpt +++ b/ext/standard/tests/strings/sha1_basic.phpt @@ -67,4 +67,4 @@ string(40) "c12252ceda8be8994d5fa0290a47231c1d16aae3" string(40) "32d10c7b8cf96570ca04ce37f2a19d84240d3a89" string(40) "761c457bf73b14d27e9e9265c46f4b4dda11f940" string(40) "50abf5706a150990a08b2c5ea40fa0e585554732" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index f7bb9dec00..bf77e3bc06 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -267,4 +267,4 @@ string(0) "" string(%d) "Resource id #%d" string(%d) "Resource id #%d" string(%d) "Resource id #%d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt index 8614ea4d0a..be0c32f587 100644 --- a/ext/standard/tests/strings/sprintf_variation12.phpt +++ b/ext/standard/tests/strings/sprintf_variation12.phpt @@ -260,4 +260,4 @@ string(8) "1.000000" string(30) " 1.000000" string(4) "0-9]" string(1) "f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation13.phpt b/ext/standard/tests/strings/sprintf_variation13.phpt index 45d6c5fa25..6a2ba35626 100644 --- a/ext/standard/tests/strings/sprintf_variation13.phpt +++ b/ext/standard/tests/strings/sprintf_variation13.phpt @@ -355,4 +355,4 @@ string(10) "123.456000" string(30) " 123.456000" string(4) "0-9]" string(1) "f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation14.phpt b/ext/standard/tests/strings/sprintf_variation14.phpt index 92bb8dfd08..16c819bdb6 100644 --- a/ext/standard/tests/strings/sprintf_variation14.phpt +++ b/ext/standard/tests/strings/sprintf_variation14.phpt @@ -99,4 +99,4 @@ string(8) "0.000000" string(30) " 0.000000" string(4) "0-9]" string(1) "f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt Binary files differindex 1559cea83b..2ee867683e 100644 --- a/ext/standard/tests/strings/sprintf_variation15.phpt +++ b/ext/standard/tests/strings/sprintf_variation15.phpt diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 645d3e96ea..a0b6cad4c8 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -229,4 +229,4 @@ string(5) "Array" string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt index 967949a09c..1bab5dc862 100644 --- a/ext/standard/tests/strings/sprintf_variation2.phpt +++ b/ext/standard/tests/strings/sprintf_variation2.phpt @@ -218,4 +218,4 @@ string(0) "" -- Iteration 28 -- string(%d) "Resource id #%d" string(%d) "Resource id #%d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt index 9283e76b8b..1b7b9d234a 100644 --- a/ext/standard/tests/strings/sprintf_variation20.phpt +++ b/ext/standard/tests/strings/sprintf_variation20.phpt @@ -99,4 +99,4 @@ string(4) " " string(30) " " string(10) "a-zA-Z0-9]" string(1) "s" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation22.phpt b/ext/standard/tests/strings/sprintf_variation22.phpt Binary files differindex db6599c10c..b4e2e28d0c 100644 --- a/ext/standard/tests/strings/sprintf_variation22.phpt +++ b/ext/standard/tests/strings/sprintf_variation22.phpt diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt Binary files differindex 772b94381b..19d46c3935 100644 --- a/ext/standard/tests/strings/sprintf_variation24.phpt +++ b/ext/standard/tests/strings/sprintf_variation24.phpt diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt Binary files differindex 027dd7c9db..17e8af5f4c 100644 --- a/ext/standard/tests/strings/sprintf_variation25.phpt +++ b/ext/standard/tests/strings/sprintf_variation25.phpt diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt Binary files differindex 88c8bd42a4..d0b9adfa12 100644 --- a/ext/standard/tests/strings/sprintf_variation26.phpt +++ b/ext/standard/tests/strings/sprintf_variation26.phpt diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt Binary files differindex 43974cecc3..617b036bcf 100644 --- a/ext/standard/tests/strings/sprintf_variation27.phpt +++ b/ext/standard/tests/strings/sprintf_variation27.phpt diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index c5064127e1..e9c08dbe80 100644 --- a/ext/standard/tests/strings/sprintf_variation31.phpt +++ b/ext/standard/tests/strings/sprintf_variation31.phpt @@ -243,4 +243,4 @@ string(4) " 1" string(30) " 1" string(4) "0-7]" string(1) "o" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation32.phpt b/ext/standard/tests/strings/sprintf_variation32.phpt index d61c6b7c67..81f5dbf451 100644 --- a/ext/standard/tests/strings/sprintf_variation32.phpt +++ b/ext/standard/tests/strings/sprintf_variation32.phpt @@ -339,4 +339,4 @@ string(4) " 0" string(30) " 0" string(4) "0-7]" string(1) "o" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation33.phpt b/ext/standard/tests/strings/sprintf_variation33.phpt index aa2c96f012..d0234ee469 100644 --- a/ext/standard/tests/strings/sprintf_variation33.phpt +++ b/ext/standard/tests/strings/sprintf_variation33.phpt @@ -99,4 +99,4 @@ string(4) " 0" string(30) " 0" string(4) "0-7]" string(1) "o" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt index f8abfb75fe..7e34ddb797 100644 --- a/ext/standard/tests/strings/sprintf_variation37.phpt +++ b/ext/standard/tests/strings/sprintf_variation37.phpt @@ -227,4 +227,4 @@ string(4) " 1" string(30) " 1" string(10) "0-9A-Fa-f]" string(1) "x" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation38.phpt b/ext/standard/tests/strings/sprintf_variation38.phpt index 160b56b2c9..ee2aa25796 100644 --- a/ext/standard/tests/strings/sprintf_variation38.phpt +++ b/ext/standard/tests/strings/sprintf_variation38.phpt @@ -323,4 +323,4 @@ string(4) " 0" string(30) " 0" string(10) "0-9A-Fa-f]" string(1) "x" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation39.phpt b/ext/standard/tests/strings/sprintf_variation39.phpt index 0180dd55d8..f03e58074e 100644 --- a/ext/standard/tests/strings/sprintf_variation39.phpt +++ b/ext/standard/tests/strings/sprintf_variation39.phpt @@ -99,4 +99,4 @@ string(4) " 0" string(30) " 0" string(10) "0-9A-Fa-f]" string(1) "x" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt index 1166d5ed34..bf1a8a56a4 100644 --- a/ext/standard/tests/strings/sprintf_variation43.phpt +++ b/ext/standard/tests/strings/sprintf_variation43.phpt @@ -259,4 +259,4 @@ string(4) " 1" string(30) " 1" string(4) "0-9]" string(1) "u" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation45.phpt b/ext/standard/tests/strings/sprintf_variation45.phpt index 46eb67dd9c..f7100e50c8 100644 --- a/ext/standard/tests/strings/sprintf_variation45.phpt +++ b/ext/standard/tests/strings/sprintf_variation45.phpt @@ -99,4 +99,4 @@ string(4) " 0" string(30) " 0" string(4) "0-9]" string(1) "u" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation47.phpt b/ext/standard/tests/strings/sprintf_variation47.phpt index fe11efb401..3236a2b59b 100644 --- a/ext/standard/tests/strings/sprintf_variation47.phpt +++ b/ext/standard/tests/strings/sprintf_variation47.phpt @@ -340,4 +340,4 @@ string(11) "1.050000e+6" string(30) " 1.050000e+6" string(4) "0-1]" string(1) "e" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt index 36b2407b2c..eb8d710585 100644 --- a/ext/standard/tests/strings/sprintf_variation49.phpt +++ b/ext/standard/tests/strings/sprintf_variation49.phpt @@ -275,4 +275,4 @@ string(11) "1.000000e+0" string(30) " 1.000000e+0" string(4) "0-1]" string(1) "e" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt index cce7cdbadb..dd41d964d0 100644 --- a/ext/standard/tests/strings/sprintf_variation50.phpt +++ b/ext/standard/tests/strings/sprintf_variation50.phpt @@ -340,4 +340,4 @@ string(12) "3.333333e+29" string(30) " 3.333333e+29" string(4) "0-1]" string(1) "e" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation51.phpt b/ext/standard/tests/strings/sprintf_variation51.phpt index 70e70b0887..29064c5dec 100644 --- a/ext/standard/tests/strings/sprintf_variation51.phpt +++ b/ext/standard/tests/strings/sprintf_variation51.phpt @@ -99,4 +99,4 @@ string(11) "0.000000e+0" string(30) " 0.000000e+0" string(4) "0-1]" string(1) "e" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation53.phpt b/ext/standard/tests/strings/sprintf_variation53.phpt index 199a957979..fa511c91df 100644 --- a/ext/standard/tests/strings/sprintf_variation53.phpt +++ b/ext/standard/tests/strings/sprintf_variation53.phpt @@ -67,4 +67,4 @@ string(3) "4D2" string(11) "1.234000E+3" string(11) "1.234000E+3" string(11) "1.234000E+3" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation6.phpt b/ext/standard/tests/strings/sprintf_variation6.phpt index f21005dcde..93d5424366 100644 --- a/ext/standard/tests/strings/sprintf_variation6.phpt +++ b/ext/standard/tests/strings/sprintf_variation6.phpt @@ -275,4 +275,4 @@ string(4) " 1" string(30) " 1" string(4) "0-9]" string(1) "d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation7.phpt b/ext/standard/tests/strings/sprintf_variation7.phpt index 3b858ca7e4..f50770857f 100644 --- a/ext/standard/tests/strings/sprintf_variation7.phpt +++ b/ext/standard/tests/strings/sprintf_variation7.phpt @@ -99,4 +99,4 @@ string(4) " 0" string(30) " 0" string(4) "0-9]" string(1) "d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation8.phpt b/ext/standard/tests/strings/sprintf_variation8.phpt index 731933a846..01427b941e 100644 --- a/ext/standard/tests/strings/sprintf_variation8.phpt +++ b/ext/standard/tests/strings/sprintf_variation8.phpt @@ -371,4 +371,4 @@ string(4) " 0" string(30) " 0" string(4) "0-9]" string(1) "d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation9.phpt b/ext/standard/tests/strings/sprintf_variation9.phpt index b189422572..7103b7fed1 100644 --- a/ext/standard/tests/strings/sprintf_variation9.phpt +++ b/ext/standard/tests/strings/sprintf_variation9.phpt @@ -516,4 +516,4 @@ string(9) "-0.000000" string(30) " -0.000000" string(4) "0-9]" string(1) "f" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sscanf_basic4.phpt b/ext/standard/tests/strings/sscanf_basic4.phpt index 8ed760afde..726bc08a10 100644 --- a/ext/standard/tests/strings/sscanf_basic4.phpt +++ b/ext/standard/tests/strings/sscanf_basic4.phpt @@ -40,4 +40,4 @@ string(1) "X" string(1) "A" string(1) "B" string(1) "C" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic8.phpt b/ext/standard/tests/strings/sscanf_basic8.phpt index bcec81eab4..f4f237fec4 100644 --- a/ext/standard/tests/strings/sscanf_basic8.phpt +++ b/ext/standard/tests/strings/sscanf_basic8.phpt @@ -62,4 +62,4 @@ int(4667) int(-4667) int(6844) int(1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt index f2a3dcbfec..ca967758ab 100644 --- a/ext/standard/tests/strings/sscanf_error.phpt +++ b/ext/standard/tests/strings/sscanf_error.phpt @@ -41,4 +41,4 @@ NULL Warning: sscanf(): Variable is not assigned by any conversion specifiers in %s on line %d int(-1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sscanf_variation1.phpt b/ext/standard/tests/strings/sscanf_variation1.phpt index f5c4664526..cb5cdc754a 100644 --- a/ext/standard/tests/strings/sscanf_variation1.phpt +++ b/ext/standard/tests/strings/sscanf_variation1.phpt @@ -166,4 +166,4 @@ NULL NULL -- Iteration 21 -- NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sscanf_variation2.phpt b/ext/standard/tests/strings/sscanf_variation2.phpt index 9d2904ff72..dede6e8d98 100644 --- a/ext/standard/tests/strings/sscanf_variation2.phpt +++ b/ext/standard/tests/strings/sscanf_variation2.phpt @@ -150,4 +150,4 @@ array(0) { -- Iteration 21 -- array(0) { } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_replace_array_refs2.phpt b/ext/standard/tests/strings/str_replace_array_refs2.phpt index 788c738344..2c12c0155b 100644 --- a/ext/standard/tests/strings/str_replace_array_refs2.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs2.phpt @@ -21,7 +21,6 @@ var_dump(str_replace(array_keys($obj->prop), $obj->prop, "x property")); $array = ['x' => 'property']; $array = $closure($array, ['x'], 'a'); var_dump(str_replace(array_keys($array), $array, "x property")); - --EXPECTF-- string(10) "a property" string(10) "a property" diff --git a/ext/standard/tests/strings/str_replace_error.phpt b/ext/standard/tests/strings/str_replace_error.phpt index b66fd8c9ec..c2d1d4fe2b 100644 --- a/ext/standard/tests/strings/str_replace_error.phpt +++ b/ext/standard/tests/strings/str_replace_error.phpt @@ -38,4 +38,4 @@ NULL Warning: str_replace() expects at most 4 parameters, 5 given in %sstr_replace_error.php on line 16 NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt Binary files differindex 5cf7f7c014..cbb2e0e5ed 100644 --- a/ext/standard/tests/strings/str_replace_variation2.phpt +++ b/ext/standard/tests/strings/str_replace_variation2.phpt diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index c43e6f289f..f5cdf15273 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -52,4 +52,4 @@ Strings unequal : TEST FAILED Ensure strings round trip Strings equal : TEST PASSED -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_rot13_error.phpt b/ext/standard/tests/strings/str_rot13_error.phpt index 2361c0abb5..ee0ea4165e 100644 --- a/ext/standard/tests/strings/str_rot13_error.phpt +++ b/ext/standard/tests/strings/str_rot13_error.phpt @@ -29,4 +29,4 @@ NULL Warning: str_rot13() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle.phpt b/ext/standard/tests/strings/str_shuffle.phpt index 32f387287b..878cb283dd 100644 --- a/ext/standard/tests/strings/str_shuffle.phpt +++ b/ext/standard/tests/strings/str_shuffle.phpt @@ -9,4 +9,4 @@ var_dump($s); ?> --EXPECTF-- string(3) %s -string(3) "123"
\ No newline at end of file +string(3) "123" diff --git a/ext/standard/tests/strings/str_shuffle_basic.phpt b/ext/standard/tests/strings/str_shuffle_basic.phpt index 348f1bb731..350600891b 100644 --- a/ext/standard/tests/strings/str_shuffle_basic.phpt +++ b/ext/standard/tests/strings/str_shuffle_basic.phpt @@ -56,4 +56,4 @@ if ($combinations != 24) { *** Testing str_shuffle() : basic functionality *** string(47) "%s" TEST PASSED -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle_error.phpt b/ext/standard/tests/strings/str_shuffle_error.phpt index 8b83b5e2d0..46911407f0 100644 --- a/ext/standard/tests/strings/str_shuffle_error.phpt +++ b/ext/standard/tests/strings/str_shuffle_error.phpt @@ -30,4 +30,4 @@ NULL Warning: str_shuffle() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle_variation1.phpt b/ext/standard/tests/strings/str_shuffle_variation1.phpt index b4e9f3f135..67529f49ae 100644 --- a/ext/standard/tests/strings/str_shuffle_variation1.phpt +++ b/ext/standard/tests/strings/str_shuffle_variation1.phpt @@ -132,4 +132,4 @@ NULL string(0) "" -- Iteration 21 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index d7def41e34..71b0c875b4 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -173,4 +173,4 @@ whic" [7]=> string(7) "e slash" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcoll.phpt b/ext/standard/tests/strings/strcoll.phpt index 6fbfa04a1c..37fe251b66 100644 --- a/ext/standard/tests/strings/strcoll.phpt +++ b/ext/standard/tests/strings/strcoll.phpt @@ -18,4 +18,3 @@ if($result > 0) { ?> --EXPECT-- Pass - diff --git a/ext/standard/tests/strings/strcoll_error.phpt b/ext/standard/tests/strings/strcoll_error.phpt index 8c17e65fc9..20daf38ffb 100644 --- a/ext/standard/tests/strings/strcoll_error.phpt +++ b/ext/standard/tests/strings/strcoll_error.phpt @@ -41,4 +41,4 @@ NULL Warning: strcoll() expects exactly 2 parameters, 3 given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/strings/strcspn_variation1.phpt b/ext/standard/tests/strings/strcspn_variation1.phpt index 81bd018a8a..89a4e5cc72 100644 --- a/ext/standard/tests/strings/strcspn_variation1.phpt +++ b/ext/standard/tests/strings/strcspn_variation1.phpt @@ -270,4 +270,4 @@ NULL Warning: strcspn() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt index 218a02f16f..201b19d7ae 100644 --- a/ext/standard/tests/strings/strcspn_variation10.phpt +++ b/ext/standard/tests/strings/strcspn_variation10.phpt @@ -269,4 +269,4 @@ int(5) int(5) int(21) int(5) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation11.phpt b/ext/standard/tests/strings/strcspn_variation11.phpt index 277ccaa1ce..fe08df0c16 100644 --- a/ext/standard/tests/strings/strcspn_variation11.phpt +++ b/ext/standard/tests/strings/strcspn_variation11.phpt @@ -1303,4 +1303,4 @@ int(1) int(2) bool(false) int(5) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation12.phpt b/ext/standard/tests/strings/strcspn_variation12.phpt index 44723f1381..92f7a0aca0 100644 --- a/ext/standard/tests/strings/strcspn_variation12.phpt +++ b/ext/standard/tests/strings/strcspn_variation12.phpt @@ -2479,4 +2479,4 @@ int(2) int(6) int(6) int(0) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation2.phpt b/ext/standard/tests/strings/strcspn_variation2.phpt index 4935cf4b30..d7d25f2ec0 100644 --- a/ext/standard/tests/strings/strcspn_variation2.phpt +++ b/ext/standard/tests/strings/strcspn_variation2.phpt @@ -269,4 +269,4 @@ NULL Warning: strcspn() expects parameter 2 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation3.phpt b/ext/standard/tests/strings/strcspn_variation3.phpt index 49d7daa2cc..cb79f3bc7c 100644 --- a/ext/standard/tests/strings/strcspn_variation3.phpt +++ b/ext/standard/tests/strings/strcspn_variation3.phpt @@ -240,4 +240,4 @@ NULL Warning: strcspn() expects parameter 3 to be integer, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation7.phpt b/ext/standard/tests/strings/strcspn_variation7.phpt index 1fc1a2cea4..d9f11297a8 100644 --- a/ext/standard/tests/strings/strcspn_variation7.phpt +++ b/ext/standard/tests/strings/strcspn_variation7.phpt @@ -609,4 +609,4 @@ int(1) int(2) bool(false) int(6) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strcspn_variation8.phpt b/ext/standard/tests/strings/strcspn_variation8.phpt index 0d861c0012..11cbb15c50 100644 --- a/ext/standard/tests/strings/strcspn_variation8.phpt +++ b/ext/standard/tests/strings/strcspn_variation8.phpt @@ -1889,4 +1889,4 @@ int(2) int(6) int(6) int(0) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strip_tags_variation1.phpt b/ext/standard/tests/strings/strip_tags_variation1.phpt index 5c7fd642ad..cca444c0e0 100644 --- a/ext/standard/tests/strings/strip_tags_variation1.phpt +++ b/ext/standard/tests/strings/strip_tags_variation1.phpt @@ -156,4 +156,4 @@ string(0) "" Warning: strip_tags() expects parameter 1 to be string, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strip_tags_variation3.phpt b/ext/standard/tests/strings/strip_tags_variation3.phpt index 2117c1306c..d6dc34a080 100644 --- a/ext/standard/tests/strings/strip_tags_variation3.phpt +++ b/ext/standard/tests/strings/strip_tags_variation3.phpt @@ -156,4 +156,4 @@ string(0) "" Warning: strip_tags() expects parameter 1 to be string, resource given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index 20b5693905..7f8481926d 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -101,4 +101,4 @@ string(150) "<html>This's a string with quotes:</html> "strings in double quote"; 'strings in single quote'; <html>this\line is single quoted /with\slashes </html>" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/stripcslashes_basic.phpt b/ext/standard/tests/strings/stripcslashes_basic.phpt index 24a23810d5..493e669131 100644 --- a/ext/standard/tests/strings/stripcslashes_basic.phpt +++ b/ext/standard/tests/strings/stripcslashes_basic.phpt @@ -37,4 +37,3 @@ string(2) "0c" string(2) "09" string(2) "0b" ===DONE=== - diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt Binary files differindex df49a5116c..1e9a371f89 100644 --- a/ext/standard/tests/strings/stripslashes_basic.phpt +++ b/ext/standard/tests/strings/stripslashes_basic.phpt diff --git a/ext/standard/tests/strings/strnatcasecmp_error.phpt b/ext/standard/tests/strings/strnatcasecmp_error.phpt index 2105904aac..6a0fca76e9 100644 --- a/ext/standard/tests/strings/strnatcasecmp_error.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_error.phpt @@ -30,4 +30,4 @@ NULL Warning: strnatcasecmp() expects exactly 2 parameters, 3 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strnatcmp_basic.phpt b/ext/standard/tests/strings/strnatcmp_basic.phpt index c80a8e062e..734e5f57da 100644 --- a/ext/standard/tests/strings/strnatcmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcmp_basic.phpt @@ -77,4 +77,4 @@ int(1) int(1) int(1) int(1) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strripos.phpt b/ext/standard/tests/strings/strripos.phpt index 924505f6c9..291ff78cd7 100644 --- a/ext/standard/tests/strings/strripos.phpt +++ b/ext/standard/tests/strings/strripos.phpt @@ -34,4 +34,3 @@ bool(false) bool(false) int(1) bool(false) - diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt index d37342e464..b8cb6ce136 100644 --- a/ext/standard/tests/strings/strrpos_variation3.phpt +++ b/ext/standard/tests/strings/strrpos_variation3.phpt @@ -34,4 +34,4 @@ int(44) int(44) bool(false) int(55) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt index ed032f264e..ae2e2ffcc8 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -38,4 +38,4 @@ int(39) int(55) int(55) int(57) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation5.phpt b/ext/standard/tests/strings/strrpos_variation5.phpt index b322e97e61..26b31b033a 100644 --- a/ext/standard/tests/strings/strrpos_variation5.phpt +++ b/ext/standard/tests/strings/strrpos_variation5.phpt @@ -31,4 +31,4 @@ int(13) int(19) int(13) int(19) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation6.phpt b/ext/standard/tests/strings/strrpos_variation6.phpt index f361e8c5ea..ec5dcbf566 100644 --- a/ext/standard/tests/strings/strrpos_variation6.phpt +++ b/ext/standard/tests/strings/strrpos_variation6.phpt @@ -32,4 +32,4 @@ int(88) int(59) int(59) int(59) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation7.phpt b/ext/standard/tests/strings/strrpos_variation7.phpt index cf70befdbd..52037532d1 100644 --- a/ext/standard/tests/strings/strrpos_variation7.phpt +++ b/ext/standard/tests/strings/strrpos_variation7.phpt @@ -29,4 +29,4 @@ bool(false) bool(false) bool(false) bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt index b5ee760867..de6bce2f33 100644 --- a/ext/standard/tests/strings/strrpos_variation8.phpt +++ b/ext/standard/tests/strings/strrpos_variation8.phpt @@ -56,4 +56,4 @@ bool(false) bool(false) -- Iteration 15 -- bool(false) -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt index 8ca2824393..74e858ab5d 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -38,4 +38,4 @@ echo "Done" int(11) int(11) int(2) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation1.phpt b/ext/standard/tests/strings/strspn_variation1.phpt index 6b73b212ea..db6e8f9a15 100644 --- a/ext/standard/tests/strings/strspn_variation1.phpt +++ b/ext/standard/tests/strings/strspn_variation1.phpt @@ -270,4 +270,4 @@ NULL Warning: strspn() expects parameter 1 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation10.phpt b/ext/standard/tests/strings/strspn_variation10.phpt index 39911aa8b0..f0f60a6336 100644 --- a/ext/standard/tests/strings/strspn_variation10.phpt +++ b/ext/standard/tests/strings/strspn_variation10.phpt @@ -271,4 +271,4 @@ int(4) int(4) int(0) int(4) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation11.phpt b/ext/standard/tests/strings/strspn_variation11.phpt index 80b3c8e310..a76771eb4b 100644 --- a/ext/standard/tests/strings/strspn_variation11.phpt +++ b/ext/standard/tests/strings/strspn_variation11.phpt @@ -1303,4 +1303,4 @@ int(0) int(1) bool(false) int(4) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation12.phpt b/ext/standard/tests/strings/strspn_variation12.phpt index ebb0013720..37cf74f05f 100644 --- a/ext/standard/tests/strings/strspn_variation12.phpt +++ b/ext/standard/tests/strings/strspn_variation12.phpt @@ -2875,4 +2875,4 @@ int(2) int(4) int(4) int(0) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation2.phpt b/ext/standard/tests/strings/strspn_variation2.phpt index b968ce1436..1d31a1c802 100644 --- a/ext/standard/tests/strings/strspn_variation2.phpt +++ b/ext/standard/tests/strings/strspn_variation2.phpt @@ -269,4 +269,4 @@ NULL Warning: strspn() expects parameter 2 to be string, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation3.phpt b/ext/standard/tests/strings/strspn_variation3.phpt index 7cc06d10be..d12a2f8b19 100644 --- a/ext/standard/tests/strings/strspn_variation3.phpt +++ b/ext/standard/tests/strings/strspn_variation3.phpt @@ -240,4 +240,4 @@ NULL Warning: strspn() expects parameter 3 to be integer, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation4.phpt b/ext/standard/tests/strings/strspn_variation4.phpt index f81dbae64e..f0c597441a 100644 --- a/ext/standard/tests/strings/strspn_variation4.phpt +++ b/ext/standard/tests/strings/strspn_variation4.phpt @@ -193,4 +193,4 @@ int(0) Warning: strspn() expects parameter 4 to be integer, resource given in %s on line %d NULL -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt Binary files differindex 5b4bf7e108..3338169ac3 100644 --- a/ext/standard/tests/strings/strspn_variation5.phpt +++ b/ext/standard/tests/strings/strspn_variation5.phpt diff --git a/ext/standard/tests/strings/strspn_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt index 3191376a0b..691a6c1b5f 100644 --- a/ext/standard/tests/strings/strspn_variation7.phpt +++ b/ext/standard/tests/strings/strspn_variation7.phpt @@ -609,4 +609,4 @@ int(0) int(0) bool(false) int(2) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strspn_variation8.phpt b/ext/standard/tests/strings/strspn_variation8.phpt index 2e6a6cc3d9..21f774ad7a 100644 --- a/ext/standard/tests/strings/strspn_variation8.phpt +++ b/ext/standard/tests/strings/strspn_variation8.phpt @@ -1891,4 +1891,4 @@ int(2) int(4) int(4) int(0) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/strtr.phpt b/ext/standard/tests/strings/strtr.phpt index 80ed722b8e..77666ced8c 100644 --- a/ext/standard/tests/strings/strtr.phpt +++ b/ext/standard/tests/strings/strtr.phpt @@ -7,4 +7,4 @@ $trans = array("hello"=>"hi", "hi"=>"hello", "a"=>"A", "world"=>"planet"); var_dump(strtr("# hi all, I said hello world! #", $trans)); ?> --EXPECT-- -string(32) "# hello All, I sAid hi planet! #"
\ No newline at end of file +string(32) "# hello All, I sAid hi planet! #" diff --git a/ext/standard/tests/strings/strtr_variation3.phpt b/ext/standard/tests/strings/strtr_variation3.phpt index fe546dc8ce..5baed1490e 100644 --- a/ext/standard/tests/strings/strtr_variation3.phpt +++ b/ext/standard/tests/strings/strtr_variation3.phpt @@ -100,4 +100,4 @@ string(8) "\"quotes" -- Iteration 11 -- string(54) "SesSTsttETTtestTTstrtrTTtestETstrtrT$variableTT"quotes" string(52) " es \sttT\test\\strtrtttestTstrtrt$variablet\"quotes" -*** Done ***
\ No newline at end of file +*** Done *** diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index f727ebdf93..cbf6c0b93c 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -74,4 +74,4 @@ string(5) "0xABC" -- Iteration 7 -- string(21) "Simple HEREDOC string" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt index 94ed70263a..37ecfd14d5 100644 --- a/ext/standard/tests/strings/strval_error.phpt +++ b/ext/standard/tests/strings/strval_error.phpt @@ -48,4 +48,4 @@ NULL -- Testing strval() function with object which has not toString() method -- -Recoverable fatal error: Object of class MyClass could not be converted to string in %s on line %d
\ No newline at end of file +Recoverable fatal error: Object of class MyClass could not be converted to string in %s on line %d diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt index 2eb665631e..5918c286e2 100644 --- a/ext/standard/tests/strings/strval_variation1.phpt +++ b/ext/standard/tests/strings/strval_variation1.phpt @@ -187,4 +187,4 @@ string(0) "" -- Iteration 31 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index 009a190280..5e7fd528aa 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -79,4 +79,4 @@ c0c1c2c3c4c5c6c7c8c9cacbcccdcecf d0d1d2d3d4d5d6d7d8d9dadbdcdddedf e0e1e2e3e4e5e6e7e8e9eaebecedeeef f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/substr_replace.phpt b/ext/standard/tests/strings/substr_replace.phpt index 27620de964..852c014b50 100644 --- a/ext/standard/tests/strings/substr_replace.phpt +++ b/ext/standard/tests/strings/substr_replace.phpt @@ -807,4 +807,3 @@ array(2) { [1]=> string(10) "trbala his" } - diff --git a/ext/standard/tests/strings/trim.phpt b/ext/standard/tests/strings/trim.phpt index a69f17c6d7..44276284e1 100644 --- a/ext/standard/tests/strings/trim.phpt +++ b/ext/standard/tests/strings/trim.phpt @@ -22,6 +22,5 @@ $tests = <<<TESTS TESTS; include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); - --EXPECT-- OK diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt Binary files differindex 330bd01553..07e9e52040 100644 --- a/ext/standard/tests/strings/trim1.phpt +++ b/ext/standard/tests/strings/trim1.phpt diff --git a/ext/standard/tests/strings/trim_error.phpt b/ext/standard/tests/strings/trim_error.phpt index e34cd144cd..b845cee1ac 100644 --- a/ext/standard/tests/strings/trim_error.phpt +++ b/ext/standard/tests/strings/trim_error.phpt @@ -58,4 +58,4 @@ string(14) " Hello World Warning: trim(): Invalid '..'-range in %s on line %d string(14) " Hello World " -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/trim_variation1.phpt b/ext/standard/tests/strings/trim_variation1.phpt index cbbd5b9e4c..56578fb75c 100644 --- a/ext/standard/tests/strings/trim_variation1.phpt +++ b/ext/standard/tests/strings/trim_variation1.phpt @@ -135,4 +135,4 @@ NULL string(0) "" -- Iteration 22 -- string(0) "" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/trim_variation2.phpt b/ext/standard/tests/strings/trim_variation2.phpt index b4c0352404..d38f898862 100644 --- a/ext/standard/tests/strings/trim_variation2.phpt +++ b/ext/standard/tests/strings/trim_variation2.phpt @@ -135,4 +135,4 @@ NULL string(19) "!---Hello World---!" -- Iteration 22 -- string(19) "!---Hello World---!" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/unpack.phpt b/ext/standard/tests/strings/unpack.phpt index 26f3f2eaf9..3a6068be71 100644 --- a/ext/standard/tests/strings/unpack.phpt +++ b/ext/standard/tests/strings/unpack.phpt @@ -8,4 +8,4 @@ Invalid format type validation --EXPECTF-- Warning: unpack(): Invalid format type - in %sunpack.php on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/unpack_bug68225.phpt b/ext/standard/tests/strings/unpack_bug68225.phpt index 7f8cdd4701..80c76b99d2 100644 --- a/ext/standard/tests/strings/unpack_bug68225.phpt +++ b/ext/standard/tests/strings/unpack_bug68225.phpt @@ -36,4 +36,3 @@ array(4) { int(2) } ===DONE=== - diff --git a/ext/standard/tests/strings/unpack_offset.phpt b/ext/standard/tests/strings/unpack_offset.phpt index c8c08e74f2..64cb089bc3 100644 --- a/ext/standard/tests/strings/unpack_offset.phpt +++ b/ext/standard/tests/strings/unpack_offset.phpt @@ -14,4 +14,3 @@ printf("0x%08x 0x%08x\n", --EXPECT-- 0x01020304 0x05060708 0x01020304 0x05060708 - diff --git a/ext/standard/tests/strings/url_t.phpt b/ext/standard/tests/strings/url_t.phpt index e172061ec2..79ff3bc4a8 100644 --- a/ext/standard/tests/strings/url_t.phpt +++ b/ext/standard/tests/strings/url_t.phpt @@ -783,4 +783,3 @@ string(7) "hideout" string(10) "/index.php" string(31) "test=1&test2=char&test3=mixesCI" string(16) "some_page_ref123" - diff --git a/ext/standard/tests/strings/vfprintf_basic2.phpt b/ext/standard/tests/strings/vfprintf_basic2.phpt index db28f5fb70..970640f071 100644 --- a/ext/standard/tests/strings/vfprintf_basic2.phpt +++ b/ext/standard/tests/strings/vfprintf_basic2.phpt @@ -49,5 +49,3 @@ unlink($data_file); 111 222 111 222 333 ===DONE=== - - diff --git a/ext/standard/tests/strings/vfprintf_basic3.phpt b/ext/standard/tests/strings/vfprintf_basic3.phpt index bd9efaa2e0..a940ccffe8 100644 --- a/ext/standard/tests/strings/vfprintf_basic3.phpt +++ b/ext/standard/tests/strings/vfprintf_basic3.phpt @@ -61,4 +61,3 @@ unlink($data_file); 11.110000 22.220000 33.330000 11.110000 22.220000 33.330000 ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_basic4.phpt b/ext/standard/tests/strings/vfprintf_basic4.phpt index e653f63306..c8a170c670 100644 --- a/ext/standard/tests/strings/vfprintf_basic4.phpt +++ b/ext/standard/tests/strings/vfprintf_basic4.phpt @@ -44,4 +44,3 @@ unlink($data_file); 1 0 1 0 1 ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_basic5.phpt b/ext/standard/tests/strings/vfprintf_basic5.phpt index a7a7697dc2..f89ab53f5c 100644 --- a/ext/standard/tests/strings/vfprintf_basic5.phpt +++ b/ext/standard/tests/strings/vfprintf_basic5.phpt @@ -44,5 +44,3 @@ A A B A B C ===DONE=== - - diff --git a/ext/standard/tests/strings/vfprintf_basic6.phpt b/ext/standard/tests/strings/vfprintf_basic6.phpt index 332370b5de..9e888939d2 100644 --- a/ext/standard/tests/strings/vfprintf_basic6.phpt +++ b/ext/standard/tests/strings/vfprintf_basic6.phpt @@ -46,4 +46,3 @@ unlink($data_file); 1.000000e+3 2.000000e+3 1.000000e+3 2.000000e+3 3.000000e+3 ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_basic7.phpt b/ext/standard/tests/strings/vfprintf_basic7.phpt index f235c1cd6f..a9f286f5a8 100644 --- a/ext/standard/tests/strings/vfprintf_basic7.phpt +++ b/ext/standard/tests/strings/vfprintf_basic7.phpt @@ -49,5 +49,3 @@ unlink($data_file); 4294966185 4293732729 4294966185 4293732729 4292621864 ===DONE=== - - diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt index 254bd8c2c1..010028c387 100644 --- a/ext/standard/tests/strings/vfprintf_variation16.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16.phpt @@ -109,4 +109,4 @@ unlink($data_file); 1 1 0 #0 1 $1 _0 0 1 1 1 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt index 5d8c63e207..874b279763 100644 --- a/ext/standard/tests/strings/vfprintf_variation21.phpt +++ b/ext/standard/tests/strings/vfprintf_variation21.phpt @@ -165,4 +165,3 @@ string -- Iteration 23 -- Resource id #%d ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_variation3.phpt b/ext/standard/tests/strings/vfprintf_variation3.phpt index 99db0bf00b..e3e7b9636a 100644 --- a/ext/standard/tests/strings/vfprintf_variation3.phpt +++ b/ext/standard/tests/strings/vfprintf_variation3.phpt @@ -84,4 +84,3 @@ unlink($data_file); -- Iteration 8 -- 1 2 3 4 ===DONE=== - diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt index 55bfd465bb..9dad0eff58 100644 --- a/ext/standard/tests/strings/vfprintf_variation4.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4.phpt @@ -110,4 +110,4 @@ unlink($data_file); 1 0 1 0000 #0 1 $1 _0 0 1 1 1 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation5.phpt b/ext/standard/tests/strings/vfprintf_variation5.phpt index 9845a3ff2c..ffe6c347bc 100644 --- a/ext/standard/tests/strings/vfprintf_variation5.phpt +++ b/ext/standard/tests/strings/vfprintf_variation5.phpt @@ -83,4 +83,3 @@ unlink($data_file); -- Iteration 8 -- 1.110000 2.220000 3.330000 4.440000 ===DONE=== - diff --git a/ext/standard/tests/strings/vprintf_basic1.phpt b/ext/standard/tests/strings/vprintf_basic1.phpt index e550ea1c8d..280649f70d 100644 --- a/ext/standard/tests/strings/vprintf_basic1.phpt +++ b/ext/standard/tests/strings/vprintf_basic1.phpt @@ -40,4 +40,3 @@ int(7) one two three int(13) ===DONE=== - diff --git a/ext/standard/tests/strings/vsprintf_variation10.phpt b/ext/standard/tests/strings/vsprintf_variation10.phpt Binary files differindex 1720164f76..21b875cdb5 100644 --- a/ext/standard/tests/strings/vsprintf_variation10.phpt +++ b/ext/standard/tests/strings/vsprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt index 11cba07506..51cb054d15 100644 --- a/ext/standard/tests/strings/vsprintf_variation11.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11.phpt @@ -55,7 +55,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECTF-- *** Testing vsprintf() : octal formats with octal values *** diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt index 43446e4ede..d525ad15bb 100644 --- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt @@ -55,7 +55,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECTF-- *** Testing vsprintf() : octal formats with octal values *** diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt index 9417ab1319..881a74c1c9 100644 --- a/ext/standard/tests/strings/vsprintf_variation13.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13.phpt @@ -55,7 +55,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECTF-- *** Testing vsprintf() : hexa formats with hexa values *** diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt index f81476baea..7c6ca39534 100644 --- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt @@ -55,7 +55,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECTF-- *** Testing vsprintf() : hexa formats with hexa values *** diff --git a/ext/standard/tests/strings/vsprintf_variation2.phpt b/ext/standard/tests/strings/vsprintf_variation2.phpt index 9061c092fe..838093cdb1 100644 --- a/ext/standard/tests/strings/vsprintf_variation2.phpt +++ b/ext/standard/tests/strings/vsprintf_variation2.phpt @@ -174,4 +174,4 @@ bool(false) -- Iteration 23 -- string(%d) "Resource id #%d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt index 777c911c8b..eb1bf36856 100644 --- a/ext/standard/tests/strings/vsprintf_variation3.phpt +++ b/ext/standard/tests/strings/vsprintf_variation3.phpt @@ -52,7 +52,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECTF-- *** Testing vsprintf() : int formats with int values *** diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt index cf172899d2..6355106123 100644 --- a/ext/standard/tests/strings/vsprintf_variation5.phpt +++ b/ext/standard/tests/strings/vsprintf_variation5.phpt @@ -52,7 +52,6 @@ foreach($formats as $format) { echo "Done"; ?> - --EXPECTF-- *** Testing vsprintf() : int formats with float values *** diff --git a/ext/standard/tests/strings/vsprintf_variation7.phpt b/ext/standard/tests/strings/vsprintf_variation7.phpt Binary files differindex 8f5b8862c2..57ac54fda9 100644 --- a/ext/standard/tests/strings/vsprintf_variation7.phpt +++ b/ext/standard/tests/strings/vsprintf_variation7.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index 109d8b626e..0efd8bb008 100644 --- a/ext/standard/tests/strings/vsprintf_variation8.phpt +++ b/ext/standard/tests/strings/vsprintf_variation8.phpt @@ -100,4 +100,4 @@ string(79) "1 1 1 0001 0000 #0 1 $1 _0 1 1 1" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt Binary files differindex 14180654d0..ea92bc12f1 100644 --- a/ext/standard/tests/strings/vsprintf_variation9.phpt +++ b/ext/standard/tests/strings/vsprintf_variation9.phpt diff --git a/ext/standard/tests/strings/wordwrap.phpt b/ext/standard/tests/strings/wordwrap.phpt index c1f3b05bda..50531b5e93 100644 --- a/ext/standard/tests/strings/wordwrap.phpt +++ b/ext/standard/tests/strings/wordwrap.phpt @@ -32,6 +32,5 @@ FALSE === @wordwrap(chr(0), 0, "") TESTS; include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); - --EXPECT-- OK diff --git a/ext/standard/tests/strings/wordwrap_variation1.phpt b/ext/standard/tests/strings/wordwrap_variation1.phpt index 59462448c8..86f6fac482 100644 --- a/ext/standard/tests/strings/wordwrap_variation1.phpt +++ b/ext/standard/tests/strings/wordwrap_variation1.phpt @@ -332,4 +332,4 @@ string(0) "" string(0) "" string(0) "" string(0) "" -Done
\ No newline at end of file +Done |