summaryrefslogtreecommitdiff
path: root/ext/standard/tests/strings
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/tests/strings')
-rw-r--r--ext/standard/tests/strings/add-and-stripcslashes.phpt3
-rw-r--r--ext/standard/tests/strings/basename_invalid_path.phpt1
-rw-r--r--ext/standard/tests/strings/basename_invalid_path_win.phpt1
-rw-r--r--ext/standard/tests/strings/basename_variation.phpt1
-rw-r--r--ext/standard/tests/strings/bin2hex_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/bug20261.phpt1
-rw-r--r--ext/standard/tests/strings/bug23650.phpt1
-rw-r--r--ext/standard/tests/strings/bug25671.phpt1
-rw-r--r--ext/standard/tests/strings/bug37244.phpt1
-rw-r--r--ext/standard/tests/strings/bug45166.phpt2
-rw-r--r--ext/standard/tests/strings/bug61038.phpt1
-rw-r--r--ext/standard/tests/strings/bug61116.phpt3
-rw-r--r--ext/standard/tests/strings/bug65230.phpt1
-rw-r--r--ext/standard/tests/strings/bug67252.phpt1
-rw-r--r--ext/standard/tests/strings/bug68996.phpt1
-rw-r--r--ext/standard/tests/strings/bug73058.phpt1
-rw-r--r--ext/standard/tests/strings/chop_variation4.phptbin1835 -> 1836 bytes
-rw-r--r--ext/standard/tests/strings/chunk_split_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/chunk_split_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/convert_cyr_string_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/crc32_variation1.phpt3
-rw-r--r--ext/standard/tests/strings/crypt_sha256.phpt1
-rw-r--r--ext/standard/tests/strings/crypt_sha512.phpt1
-rw-r--r--ext/standard/tests/strings/dirname_basic.phpt1
-rw-r--r--ext/standard/tests/strings/dirname_variation.phpt2
-rw-r--r--ext/standard/tests/strings/explode_error.phpt2
-rw-r--r--ext/standard/tests/strings/explode_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/explode_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/explode_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/get_html_translation_table_basic7.phpt2
-rw-r--r--ext/standard/tests/strings/get_html_translation_table_basic9.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode1.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode2.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_cp866.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_koi8-r.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_macroman.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_win1251.phpt2
-rw-r--r--ext/standard/tests/strings/html_entity_decode_win1252.phpt2
-rw-r--r--ext/standard/tests/strings/htmlentities24.phpt2
-rw-r--r--ext/standard/tests/strings/htmlentities_html5.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars.phpt1
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_basic.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/http_build_query_error.phpt2
-rw-r--r--ext/standard/tests/strings/join_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/ltrim_error.phpt2
-rw-r--r--ext/standard/tests/strings/ltrim_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/ltrim_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/md5_basic2.phpt2
-rw-r--r--ext/standard/tests/strings/md5_error.phpt2
-rw-r--r--ext/standard/tests/strings/md5_file.phptbin2847 -> 2846 bytes
-rw-r--r--ext/standard/tests/strings/money_format_basic1.phpt1
-rw-r--r--ext/standard/tests/strings/nl_langinfo_basic.phpt2
-rw-r--r--ext/standard/tests/strings/pack_A.phpt1
-rw-r--r--ext/standard/tests/strings/parse_str_error1.phpt2
-rw-r--r--ext/standard/tests/strings/print_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/printf_basic3.phpt2
-rw-r--r--ext/standard/tests/strings/printf_basic5.phpt2
-rw-r--r--ext/standard/tests/strings/printf_basic9.phpt2
-rw-r--r--ext/standard/tests/strings/printf_error.phpt2
-rw-r--r--ext/standard/tests/strings/quotemeta_basic.phpt2
-rw-r--r--ext/standard/tests/strings/quotemeta_error.phpt2
-rw-r--r--ext/standard/tests/strings/rtrim_basic.phpt2
-rw-r--r--ext/standard/tests/strings/sha1_basic.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation12.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation13.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation14.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation15.phptbin7411 -> 7412 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation18.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation20.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation22.phptbin2512 -> 2513 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation24.phptbin3457 -> 3458 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation25.phptbin4650 -> 4651 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation26.phptbin1692 -> 1693 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation27.phptbin2686 -> 2687 bytes
-rw-r--r--ext/standard/tests/strings/sprintf_variation31.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation32.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation33.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation37.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation38.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation39.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation43.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation45.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation47.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation49.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation50.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation51.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation53.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation9.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_basic4.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_basic8.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_error.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/sscanf_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/str_replace_array_refs2.phpt1
-rw-r--r--ext/standard/tests/strings/str_replace_error.phpt2
-rw-r--r--ext/standard/tests/strings/str_replace_variation2.phptbin12674 -> 12675 bytes
-rw-r--r--ext/standard/tests/strings/str_rot13_basic.phpt2
-rw-r--r--ext/standard/tests/strings/str_rot13_error.phpt2
-rw-r--r--ext/standard/tests/strings/str_shuffle.phpt2
-rw-r--r--ext/standard/tests/strings/str_shuffle_basic.phpt2
-rw-r--r--ext/standard/tests/strings/str_shuffle_error.phpt2
-rw-r--r--ext/standard/tests/strings/str_shuffle_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/str_split_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation10.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation12.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/strcspn_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/strip_tags_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strip_tags_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strip_tags_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/stripcslashes_basic.phpt1
-rw-r--r--ext/standard/tests/strings/stripslashes_basic.phptbin2032 -> 2033 bytes
-rw-r--r--ext/standard/tests/strings/strnatcasecmp_error.phpt2
-rw-r--r--ext/standard/tests/strings/strnatcmp_basic.phpt2
-rw-r--r--ext/standard/tests/strings/strnatcmp_leftalign.phpt1
-rw-r--r--ext/standard/tests/strings/strrchr_variation1.phptbin4853 -> 4854 bytes
-rw-r--r--ext/standard/tests/strings/strrchr_variation10.phpt2
-rw-r--r--ext/standard/tests/strings/strrchr_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/strrchr_variation12.phptbin1764 -> 1765 bytes
-rw-r--r--ext/standard/tests/strings/strrchr_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strrchr_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/strripos.phpt1
-rw-r--r--ext/standard/tests/strings/strripos_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strripos_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation10.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation4.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_basic.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation10.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation12.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation4.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation5.phptbin2413 -> 2414 bytes
-rw-r--r--ext/standard/tests/strings/strspn_variation7.phpt2
-rw-r--r--ext/standard/tests/strings/strspn_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/strstr.phptbin11492 -> 11493 bytes
-rw-r--r--ext/standard/tests/strings/strtr.phpt2
-rw-r--r--ext/standard/tests/strings/strtr_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/strval_basic.phpt2
-rw-r--r--ext/standard/tests/strings/strval_error.phpt2
-rw-r--r--ext/standard/tests/strings/strval_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/strval_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/substr_replace.phpt1
-rw-r--r--ext/standard/tests/strings/trim.phpt1
-rw-r--r--ext/standard/tests/strings/trim1.phptbin2046 -> 2045 bytes
-rw-r--r--ext/standard/tests/strings/trim_error.phpt2
-rw-r--r--ext/standard/tests/strings/trim_variation1.phpt2
-rw-r--r--ext/standard/tests/strings/trim_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/unpack.phpt2
-rw-r--r--ext/standard/tests/strings/unpack_bug68225.phpt1
-rw-r--r--ext/standard/tests/strings/unpack_offset.phpt1
-rw-r--r--ext/standard/tests/strings/url_t.phpt1
-rw-r--r--ext/standard/tests/strings/utf8_decode_error.phpt1
-rw-r--r--ext/standard/tests/strings/utf8_decode_variation1.phpt1
-rw-r--r--ext/standard/tests/strings/utf8_encode_error.phpt1
-rw-r--r--ext/standard/tests/strings/utf8_encode_variation1.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_basic2.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic3.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_basic4.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_basic5.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic6.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_basic7.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation16.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation21.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_variation3.phpt1
-rw-r--r--ext/standard/tests/strings/vfprintf_variation4.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation5.phpt1
-rw-r--r--ext/standard/tests/strings/vprintf_basic1.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation10.phptbin2771 -> 2772 bytes
-rw-r--r--ext/standard/tests/strings/vsprintf_variation11.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation11_64bit.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation13.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation13_64bit.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/vsprintf_variation3.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation5.phpt1
-rw-r--r--ext/standard/tests/strings/vsprintf_variation7.phptbin2234 -> 2233 bytes
-rw-r--r--ext/standard/tests/strings/vsprintf_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/vsprintf_variation9.phptbin1702 -> 1701 bytes
-rw-r--r--ext/standard/tests/strings/wordwrap.phpt1
-rw-r--r--ext/standard/tests/strings/wordwrap_variation1.phpt2
205 files changed, 129 insertions, 203 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 9211f1f7c2..573f8f014a 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";
-
--EXPECT--
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 1da6c18113..0bcb18e6ac 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";
-
--EXPECT--
*** 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Ý\œÈÝ]ÚYHH˜\Ù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 87f9ed4459..4363462934 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 f769616f56..3cd908b24a 100644
--- a/ext/standard/tests/strings/bug73058.phpt
+++ b/ext/standard/tests/strings/bug73058.phpt
@@ -20,4 +20,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
index 2d67ed06e1..628c87cbce 100644
--- a/ext/standard/tests/strings/chop_variation4.phpt
+++ b/ext/standard/tests/strings/chop_variation4.phpt
Binary files differ
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 c3456a70c4..f7fcfb60f3 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_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 5374197e20..c361dc48cb 100644
--- a/ext/standard/tests/strings/crypt_sha256.phpt
+++ b/ext/standard/tests/strings/crypt_sha256.phpt
@@ -55,4 +55,3 @@ Got <$res>\n";
echo "Passes.";?>
--EXPECT--
Passes.
-
diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt
index ffbc5747de..408a5a00c7 100644
--- a/ext/standard/tests/strings/crypt_sha512.phpt
+++ b/ext/standard/tests/strings/crypt_sha512.phpt
@@ -56,4 +56,3 @@ echo "Passes.";
?>
--EXPECT--
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 2addd0436d..34c1cdffc3 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) "&lt;"
}
-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) "&lt;"
}
-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: &#x25A0; => fe
NO-BREAK SPACE: &#xA0; => ff
&#xFF; => &#xFF;
-
-
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: &#xFE; => fe
LATIN SMALL LETTER Y WITH DIAERESIS: &#xFF; => ff
&#xFF; => 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: &#x45E; => 2623783435453b
CYRILLIC SMALL LETTER DZHE: &#x45F; => 2623783435463b
&#xFF; => &#xFF;
-
-
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: &#x427; => fe
CYRILLIC CAPITAL LETTER HARD SIGN: &#x42A; => ff
&#xFF; => &#xFF;
-
-
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: &#x2DB; => fe
CARON: &#x2C7; => ff
&#xFF; => 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: &#x44E; => fe
CYRILLIC SMALL LETTER YA: &#x44F; => ff
&#xFF; => &#xFF;
-
-
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: &#x17E; => 9e
LATIN CAPITAL LETTER Y WITH DIAERESIS: &#x178; => 9f
&#x9F; => &#x9F;
-
-
diff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt
index 51271bdddf..5a023df701 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) "&bdquo;&lsquo;"
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) {
&nsupseteqq; U+02AC6 U+00338
&vsubnE; U+02ACB U+0FE00
&varsupsetneqq; U+02ACC U+0FE00
-&parsl;︀ U+02AFD U+0FE00 \ No newline at end of file
+&parsl;︀ U+02AFD U+0FE00
diff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt
index 2c886b9af7..8506c73e72 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) "&lt;br&gt;"
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 &lt; 400"
Try with double decode TRUE
Test 28: &amp;quot;&amp;amp;xyz&amp;gt;abc&amp;quot;
Test 29: &amp;quot;&amp;amp;123&amp;lt;456&amp;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 96a32351b4..de96c04db4 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 &#039;single quoted&#039; /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 8aa9479e5c..b07f21acf6 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/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt
index 1755df9edd..e298fec6ae 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 73bcc33bec..e72fd40077 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
index 8e91776781..3e996eccd3 100644
--- a/ext/standard/tests/strings/md5_file.phpt
+++ b/ext/standard/tests/strings/md5_file.phpt
Binary files differ
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 82fd6c0f95..c940479065 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_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 101d567749..19a28678f2 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 2fd6050da2..711327cd6d 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 3cdcc1abf4..e7bebd6df7 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 cff579de03..cb9513d975 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 37081b3cf1..d2694db6b6 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 b0fc221a0b..6657ff9cca 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 de40856c36..10900c1438 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 7ee6f4a66e..49f4d5f12a 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
index 308bb7ebcc..d908d40632 100644
--- a/ext/standard/tests/strings/sprintf_variation15.phpt
+++ b/ext/standard/tests/strings/sprintf_variation15.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt
index 009b45ef31..2bf9322c83 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 016e6c5bf1..a110311127 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
index 0280a6a0e8..e12da7f75f 100644
--- a/ext/standard/tests/strings/sprintf_variation22.phpt
+++ b/ext/standard/tests/strings/sprintf_variation22.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt
index b4e8f51e91..e3324ce417 100644
--- a/ext/standard/tests/strings/sprintf_variation24.phpt
+++ b/ext/standard/tests/strings/sprintf_variation24.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt
index 1e81c7137a..195ec29ea1 100644
--- a/ext/standard/tests/strings/sprintf_variation25.phpt
+++ b/ext/standard/tests/strings/sprintf_variation25.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt
index 0b1170142b..b6e52fe948 100644
--- a/ext/standard/tests/strings/sprintf_variation26.phpt
+++ b/ext/standard/tests/strings/sprintf_variation26.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt
index b660334741..0dc39db05d 100644
--- a/ext/standard/tests/strings/sprintf_variation27.phpt
+++ b/ext/standard/tests/strings/sprintf_variation27.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt
index af285dab23..a9a43bd15f 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 03caa63493..2d4352e75b 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 b629dbabfe..54b2403f14 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 d474ee0e1a..a76f7efd5c 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 5a34280b95..a48a77a6d5 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 f9d9dbe222..0d842af057 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 ea34bc8813..0c86b468f5 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 5cdf9da998..d6bf31c56b 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 72212b6244..56ab7c5fc8 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 31177ef521..f3ab223a06 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 d4f55d47e1..ccd8bf1bd4 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 0ee0c52c65..ab056b3f2f 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 2993dd00f1..b3a034c5a7 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 1bf35df284..1480e45a0f 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 a37280df13..e910bfb687 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 73efcc0583..c20cfcc588 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 f2564abd53..d0f9632c98 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 2050711493..e12681e079 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"));
-
--EXPECT--
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
index 5cf7f7c014..cbb2e0e5ed 100644
--- a/ext/standard/tests/strings/str_replace_variation2.phpt
+++ b/ext/standard/tests/strings/str_replace_variation2.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt
index 109fdc51cc..7f5fc1405c 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 367a25af0a..d5681392b5 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 2f3f5a2f46..81247bc0ab 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/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 7f572283db..1ad369f5dd 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 96926564b0..9acefd074c 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 55b6b6e2e2..4495e7c26d 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 a330c1111a..745fe88b4c 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 int, 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 ada8681914..1f53e20d6f 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 6881b07e50..10c42731e7 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 de8f3aa962..e6b19540e3 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
index 3286765b3a..3e0fb6f2ab 100644
--- a/ext/standard/tests/strings/stripslashes_basic.phpt
+++ b/ext/standard/tests/strings/stripslashes_basic.phpt
Binary files differ
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/strnatcmp_leftalign.phpt b/ext/standard/tests/strings/strnatcmp_leftalign.phpt
index fde2f164b9..d00b3b83f0 100644
--- a/ext/standard/tests/strings/strnatcmp_leftalign.phpt
+++ b/ext/standard/tests/strings/strnatcmp_leftalign.phpt
@@ -20,7 +20,6 @@ $str1 = " 0";
$str2 = " 00";
var_dump( strnatcmp( $str1, $str2) );
?>
-
--EXPECT--
-- Testing strnatcmp() function whitespace, left-align, digit --
-- Leading whitespace, digits, string 1 longer --
diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt
index 6b46273836..5043128945 100644
--- a/ext/standard/tests/strings/strrchr_variation1.phpt
+++ b/ext/standard/tests/strings/strrchr_variation1.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/strrchr_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt
index 7b106a1c2a..3b06b20be1 100644
--- a/ext/standard/tests/strings/strrchr_variation10.phpt
+++ b/ext/standard/tests/strings/strrchr_variation10.phpt
@@ -233,4 +233,4 @@ bool(false)
Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d
bool(false)
-*** Done *** \ No newline at end of file
+*** Done ***
diff --git a/ext/standard/tests/strings/strrchr_variation11.phpt b/ext/standard/tests/strings/strrchr_variation11.phpt
index 67939daba5..108ba2e0f2 100644
--- a/ext/standard/tests/strings/strrchr_variation11.phpt
+++ b/ext/standard/tests/strings/strrchr_variation11.phpt
@@ -192,4 +192,4 @@ bool(false)
Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d
bool(false)
-*** Done *** \ No newline at end of file
+*** Done ***
diff --git a/ext/standard/tests/strings/strrchr_variation12.phpt b/ext/standard/tests/strings/strrchr_variation12.phpt
index 7ec5b830ba..730811ea47 100644
--- a/ext/standard/tests/strings/strrchr_variation12.phpt
+++ b/ext/standard/tests/strings/strrchr_variation12.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt
index 4e42818938..ddce2c2ccb 100644
--- a/ext/standard/tests/strings/strrchr_variation2.phpt
+++ b/ext/standard/tests/strings/strrchr_variation2.phpt
@@ -227,4 +227,4 @@ string(37) "*+-./:;<=>?@hello123456he \x234 \101 "
-- Iteration 45 --
string(63) "Hello,\t\n\0\n $&!#%\o,()*+-./:;<=>?@hello123456he \x234 \101 "
-*** Done *** \ No newline at end of file
+*** Done ***
diff --git a/ext/standard/tests/strings/strrchr_variation8.phpt b/ext/standard/tests/strings/strrchr_variation8.phpt
index b1a2e8b33e..6b49b698f4 100644
--- a/ext/standard/tests/strings/strrchr_variation8.phpt
+++ b/ext/standard/tests/strings/strrchr_variation8.phpt
@@ -42,4 +42,4 @@ Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s o
bool(false)
bool(false)
bool(false)
-*** 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/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt
index 5a8f7332bb..59d7a64686 100644
--- a/ext/standard/tests/strings/strripos_variation1.phpt
+++ b/ext/standard/tests/strings/strripos_variation1.phpt
@@ -283,4 +283,4 @@ int(0)
bool(false)
bool(false)
int(0)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt
index 866a75dfc2..7b47b787be 100644
--- a/ext/standard/tests/strings/strripos_variation2.phpt
+++ b/ext/standard/tests/strings/strripos_variation2.phpt
@@ -297,4 +297,4 @@ int(0)
bool(false)
bool(false)
int(0)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt
index 4d23db75da..fd236d04d4 100644
--- a/ext/standard/tests/strings/strrpos_variation1.phpt
+++ b/ext/standard/tests/strings/strrpos_variation1.phpt
@@ -195,4 +195,4 @@ bool(false)
-- Iteration 35 --
int(0)
bool(false)
-*** Done *** \ No newline at end of file
+*** Done ***
diff --git a/ext/standard/tests/strings/strrpos_variation10.phpt b/ext/standard/tests/strings/strrpos_variation10.phpt
index 32980450b2..b9b24b9cb1 100644
--- a/ext/standard/tests/strings/strrpos_variation10.phpt
+++ b/ext/standard/tests/strings/strrpos_variation10.phpt
@@ -195,4 +195,4 @@ bool(false)
Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d
bool(false)
-*** Done *** \ No newline at end of file
+*** Done ***
diff --git a/ext/standard/tests/strings/strrpos_variation11.phpt b/ext/standard/tests/strings/strrpos_variation11.phpt
index 7822b759e2..94c1b9d96d 100644
--- a/ext/standard/tests/strings/strrpos_variation11.phpt
+++ b/ext/standard/tests/strings/strrpos_variation11.phpt
@@ -268,4 +268,4 @@ bool(false)
Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d
bool(false)
-*** Done *** \ No newline at end of file
+*** Done ***
diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt
index 2ab0aa76b9..9c0a320785 100644
--- a/ext/standard/tests/strings/strrpos_variation2.phpt
+++ b/ext/standard/tests/strings/strrpos_variation2.phpt
@@ -203,4 +203,4 @@ bool(false)
-- Iteration 36 --
int(0)
bool(false)
-*** Done *** \ No newline at end of file
+*** Done ***
diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt
index 6599c7167c..460f18cca5 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 1e07fd9b5b..1d9184d787 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 46a727516f..6a7f37beeb 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 cc961f75b0..46f754dbc8 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 8481191e7a..54db4b372e 100644
--- a/ext/standard/tests/strings/strrpos_variation7.phpt
+++ b/ext/standard/tests/strings/strrpos_variation7.phpt
@@ -33,4 +33,4 @@ bool(false)
Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d
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 fe4706ca24..caf4928e24 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 44eddff3cb..cab4349677 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 63071e3320..d8eb52aa6f 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 bc21ce6523..ecbe6a4967 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 8086c53f66..1c404c1914 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 11a37c6f94..76f11acc26 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 int, 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 82da538057..858a4fb608 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 int, 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
index eccf5dff34..229fc1fbb6 100644
--- a/ext/standard/tests/strings/strspn_variation5.phpt
+++ b/ext/standard/tests/strings/strspn_variation5.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/strspn_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt
index 5b229dad3c..bbfe5d4868 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 57e0f80ed6..0ff0000132 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/strstr.phpt b/ext/standard/tests/strings/strstr.phpt
index 3cff71936e..2908de7a27 100644
--- a/ext/standard/tests/strings/strstr.phpt
+++ b/ext/standard/tests/strings/strstr.phpt
Binary files differ
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 9feb237645..5bec076e7e 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 8140c1cdb1..65f1c98366 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 947d47f20f..3fa99f7718 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
index 2096b61f22..d0e4070d80 100644
--- a/ext/standard/tests/strings/trim1.phpt
+++ b/ext/standard/tests/strings/trim1.phpt
Binary files differ
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 8d96369691..b02b0383bf 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/utf8_decode_error.phpt b/ext/standard/tests/strings/utf8_decode_error.phpt
index 49e9c19562..de2ca2b80e 100644
--- a/ext/standard/tests/strings/utf8_decode_error.phpt
+++ b/ext/standard/tests/strings/utf8_decode_error.phpt
@@ -35,4 +35,3 @@ NULL
Warning: utf8_decode() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/standard/tests/strings/utf8_decode_variation1.phpt b/ext/standard/tests/strings/utf8_decode_variation1.phpt
index 63ccf7d7d1..10d4f31ca4 100644
--- a/ext/standard/tests/strings/utf8_decode_variation1.phpt
+++ b/ext/standard/tests/strings/utf8_decode_variation1.phpt
@@ -167,4 +167,3 @@ string(0) ""
Arg value
string(0) ""
Done
-
diff --git a/ext/standard/tests/strings/utf8_encode_error.phpt b/ext/standard/tests/strings/utf8_encode_error.phpt
index e247c38fbb..bcc9335c58 100644
--- a/ext/standard/tests/strings/utf8_encode_error.phpt
+++ b/ext/standard/tests/strings/utf8_encode_error.phpt
@@ -35,4 +35,3 @@ NULL
Warning: utf8_encode() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Done
-
diff --git a/ext/standard/tests/strings/utf8_encode_variation1.phpt b/ext/standard/tests/strings/utf8_encode_variation1.phpt
index a06b8d869e..a0212ea45e 100644
--- a/ext/standard/tests/strings/utf8_encode_variation1.phpt
+++ b/ext/standard/tests/strings/utf8_encode_variation1.phpt
@@ -167,4 +167,3 @@ string(0) ""
Arg value
string(0) ""
Done
-
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
index d81d6c6a87..205be0ac45 100644
--- a/ext/standard/tests/strings/vsprintf_variation10.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation10.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt
index 286c3d0b01..defcd593e0 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";
?>
-
--EXPECT--
*** 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 50e3e86ab7..127d3f594d 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";
?>
-
--EXPECT--
*** 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 6cb751f2a0..6899766b0a 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";
?>
-
--EXPECT--
*** 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 fe43c7faec..3828414360 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";
?>
-
--EXPECT--
*** 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 86924cd438..4fa51c92de 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";
?>
-
--EXPECT--
*** 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 723cd2236c..8c7046021b 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";
?>
-
--EXPECT--
*** 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
index 8f5b8862c2..57ac54fda9 100644
--- a/ext/standard/tests/strings/vsprintf_variation7.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation7.phpt
Binary files differ
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
index f1ed093218..fc9b16dbee 100644
--- a/ext/standard/tests/strings/vsprintf_variation9.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation9.phpt
Binary files differ
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