diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:29:24 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:29:24 +0200 |
commit | 113213f0277562a4ca6d020cb28ba98321d3c62a (patch) | |
tree | bbe57fa40e644a1e1861af1d362a3e40e345b620 /ext/iconv/tests | |
parent | 7af945e271d042a4991c9510f78b6ff7ac43ac34 (diff) | |
download | php-git-113213f0277562a4ca6d020cb28ba98321d3c62a.tar.gz |
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'ext/iconv/tests')
35 files changed, 17 insertions, 40 deletions
diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt index 9318c60de2..19cb0f736a 100644 --- a/ext/iconv/tests/eucjp2iso2022jp.phpt +++ b/ext/iconv/tests/eucjp2iso2022jp.phpt @@ -24,4 +24,3 @@ echo hexdump(iconv("EUC-JP", "ISO-2022-JP", $str)); ?> --EXPECT-- 1b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c2546252d2539254824481b284220456e676c69736820746578741b2442467c4b5c386c1b2842 - diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt index a995125815..1323ac1b30 100644 --- a/ext/iconv/tests/eucjp2sjis.phpt +++ b/ext/iconv/tests/eucjp2sjis.phpt @@ -55,4 +55,3 @@ echo $str."\n"; ?> --EXPECT-- CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0Cg== - diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt index 38cfdd37b8..d859122ef1 100644 --- a/ext/iconv/tests/eucjp2utf8.phpt +++ b/ext/iconv/tests/eucjp2utf8.phpt @@ -55,4 +55,3 @@ echo $str."\n"; ?> --EXPECT-- CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0Cg== - diff --git a/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt index 03b3574d6e..b05bd560d7 100644 --- a/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt +++ b/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt @@ -9,7 +9,6 @@ var_dump(iconv($a, "b", "test")); var_dump(iconv("x", $a, "test")); ?> --EXPECTF-- - Warning: iconv(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt index e0cd69534b..367113ba04 100644 --- a/ext/iconv/tests/iconv_basic.phpt +++ b/ext/iconv/tests/iconv_basic.phpt @@ -69,4 +69,4 @@ string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323 Converted Strings: string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082" string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082" -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_get_encoding_error.phpt b/ext/iconv/tests/iconv_get_encoding_error.phpt index 0526fce2a5..c146051440 100644 --- a/ext/iconv/tests/iconv_get_encoding_error.phpt +++ b/ext/iconv/tests/iconv_get_encoding_error.phpt @@ -174,4 +174,4 @@ bool(false) Warning: iconv_get_encoding() 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/iconv/tests/iconv_ini_encoding.phpt b/ext/iconv/tests/iconv_ini_encoding.phpt index 2d02b1c55a..5d2a2090fe 100644 --- a/ext/iconv/tests/iconv_ini_encoding.phpt +++ b/ext/iconv/tests/iconv_ini_encoding.phpt @@ -41,7 +41,6 @@ var_dump(ini_get('output_encoding')); var_dump(ini_get('iconv.internal_encoding')); var_dump(ini_get('iconv.input_encoding')); var_dump(ini_get('iconv.output_encoding')); - --EXPECT-- Getting INI string(10) "ISO-8859-1" diff --git a/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt index d4ed01d956..d2e7f5713f 100644 --- a/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt +++ b/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt @@ -8,6 +8,5 @@ $a = str_repeat("/", 9000000); var_dump(iconv_mime_decode("a", null, $a)); ?> --EXPECTF-- - Warning: iconv_mime_decode(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_mime_decode.phpt b/ext/iconv/tests/iconv_mime_decode.phpt index 24d1794f3f..c5b76f3ce9 100644 --- a/ext/iconv/tests/iconv_mime_decode.phpt +++ b/ext/iconv/tests/iconv_mime_decode.phpt @@ -87,4 +87,3 @@ do_regression_test(); (100) "Subject: =?ISO-8859-1?Q?Pr=FCfung?==?ISO-8859-1*de_DE?Q?Pr=FCfung?==?ISO-8859-2?Q?k=F9=D4=F1=D3let?=" (84) "Subject: Prüfung=?ISO-8859-1*de_DE?Q?Pr=FCfung?? =?ISO-8859-2?X?k=F9=D4=F1=D3let?=" (27) "From: サンプル文字列サンプル文字列日本語テキスト" - diff --git a/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt index 48d664d600..f08d17754b 100644 --- a/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt +++ b/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt @@ -8,6 +8,5 @@ $a = str_repeat("/", 9000000); var_dump(iconv_mime_decode_headers("a", null, $a)); ?> --EXPECTF-- - Warning: iconv_mime_decode_headers(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_mime_decode_headers.phpt b/ext/iconv/tests/iconv_mime_decode_headers.phpt index 71431f7bce..6a16009ca3 100644 --- a/ext/iconv/tests/iconv_mime_decode_headers.phpt +++ b/ext/iconv/tests/iconv_mime_decode_headers.phpt @@ -86,4 +86,3 @@ array(17) { ["X-UIDL"]=> string(20) "@eH!!h2:!!EOS!!A_c"!" } - diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt index 5973ca0640..ae10b0dc9e 100644 --- a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt +++ b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt @@ -215,4 +215,4 @@ array(0) { Warning: iconv_mime_decode_headers() expects parameter 1 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_mime_decode_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_variation1.phpt index 157c59e7ad..423d49d331 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation1.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation1.phpt @@ -180,4 +180,4 @@ string(0) "" Warning: iconv_mime_decode() expects parameter 1 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_mime_decode_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_variation3.phpt index d8656d1ba7..37cbf1dfbe 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation3.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation3.phpt @@ -219,4 +219,4 @@ string(44) "5375626a6563743a20412053616d706c652054657374" Warning: iconv_mime_decode() expects parameter 3 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt index e6abca5df1..40c87001e4 100644 --- a/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt +++ b/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt @@ -10,7 +10,6 @@ var_dump(iconv_set_encoding("output_encoding", $a)); var_dump(iconv_set_encoding("internal_encoding", $a)); ?> --EXPECTF-- - Warning: iconv_set_encoding(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_set_encoding_error.phpt b/ext/iconv/tests/iconv_set_encoding_error.phpt index 4176bf9165..1a3179afea 100644 --- a/ext/iconv/tests/iconv_set_encoding_error.phpt +++ b/ext/iconv/tests/iconv_set_encoding_error.phpt @@ -174,4 +174,4 @@ bool(false) Warning: iconv_set_encoding() 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/iconv/tests/iconv_set_encoding_variation.phpt b/ext/iconv/tests/iconv_set_encoding_variation.phpt index 906f46bc31..62020063d8 100644 --- a/ext/iconv/tests/iconv_set_encoding_variation.phpt +++ b/ext/iconv/tests/iconv_set_encoding_variation.phpt @@ -306,4 +306,4 @@ NULL string(5) "UTF-8" string(5) "UTF-8" string(5) "UTF-8" -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt index 348cfb1265..23f0b6f2ea 100644 --- a/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt +++ b/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt @@ -8,6 +8,5 @@ $a = str_repeat("/", 9791999); var_dump(iconv_strlen(1, $a)); ?> --EXPECTF-- - Warning: iconv_strlen(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_strlen_variation2.phpt b/ext/iconv/tests/iconv_strlen_variation2.phpt index be5afdc93b..c8a736cfc0 100644 --- a/ext/iconv/tests/iconv_strlen_variation2.phpt +++ b/ext/iconv/tests/iconv_strlen_variation2.phpt @@ -102,7 +102,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing iconv_strlen() : usage variations *** @@ -201,4 +200,4 @@ int(12) Warning: iconv_strlen() expects parameter 2 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt index 4cb858f0db..0b378cb503 100644 --- a/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt +++ b/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt @@ -8,6 +8,5 @@ $a = str_repeat("/", 9000000); var_dump(iconv_strpos("a", "b", 0, $a)); ?> --EXPECTF-- - Warning: iconv_strpos(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt index 664385ca1b..a86b05aaf5 100644 --- a/ext/iconv/tests/iconv_strpos_basic.phpt +++ b/ext/iconv/tests/iconv_strpos_basic.phpt @@ -56,4 +56,4 @@ int(0) -- Multibyte string 2 -- bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strpos_variation1.phpt b/ext/iconv/tests/iconv_strpos_variation1.phpt index 1eb8f7b21b..0d395adcaa 100644 --- a/ext/iconv/tests/iconv_strpos_variation1.phpt +++ b/ext/iconv/tests/iconv_strpos_variation1.phpt @@ -179,4 +179,4 @@ bool(false) Warning: iconv_strpos() expects parameter 1 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strpos_variation2.phpt b/ext/iconv/tests/iconv_strpos_variation2.phpt index 798fe7f85c..de7f52d22a 100644 --- a/ext/iconv/tests/iconv_strpos_variation2.phpt +++ b/ext/iconv/tests/iconv_strpos_variation2.phpt @@ -179,4 +179,4 @@ bool(false) Warning: iconv_strpos() expects parameter 2 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt index 144b1bcde7..c7a0a99dfa 100644 --- a/ext/iconv/tests/iconv_strpos_variation4.phpt +++ b/ext/iconv/tests/iconv_strpos_variation4.phpt @@ -105,7 +105,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing iconv_strpos() : usage variations *** diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt index 06e45c61f9..bdb1069ddc 100644 --- a/ext/iconv/tests/iconv_strpos_variation5.phpt +++ b/ext/iconv/tests/iconv_strpos_variation5.phpt @@ -44,7 +44,6 @@ for ($i = -30; $i <= 60; $i += 10) { echo "Done"; ?> - --EXPECTF-- *** Testing iconv_strpos() : usage variations *** @@ -111,4 +110,4 @@ bool(false) bool(false) --Multibyte String -- bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt index 948cc67c77..f149279800 100644 --- a/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt +++ b/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt @@ -8,6 +8,5 @@ $a = str_repeat("/", 9000000); var_dump(iconv_strrpos("a", "b", $a)); ?> --EXPECTF-- - Warning: iconv_strrpos(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt index f91156b19f..d4dfe58f7a 100644 --- a/ext/iconv/tests/iconv_strrpos_basic.phpt +++ b/ext/iconv/tests/iconv_strrpos_basic.phpt @@ -57,4 +57,3 @@ int(20) -- Multibyte string 2 -- bool(false) Done - diff --git a/ext/iconv/tests/iconv_strrpos_error1.phpt b/ext/iconv/tests/iconv_strrpos_error1.phpt index b9a1820933..7068f0fffe 100644 --- a/ext/iconv/tests/iconv_strrpos_error1.phpt +++ b/ext/iconv/tests/iconv_strrpos_error1.phpt @@ -46,4 +46,4 @@ bool(false) Warning: iconv_strrpos() expects at least 2 parameters, 1 given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strrpos_error2.phpt b/ext/iconv/tests/iconv_strrpos_error2.phpt index 16b7a9def8..1ec096c163 100644 --- a/ext/iconv/tests/iconv_strrpos_error2.phpt +++ b/ext/iconv/tests/iconv_strrpos_error2.phpt @@ -32,4 +32,4 @@ echo "Done"; Notice: iconv_strrpos(): Wrong charset, conversion from `unknown-encoding' to `UCS-4LE' is not allowed in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strrpos_variation1.phpt b/ext/iconv/tests/iconv_strrpos_variation1.phpt index 573c2ea517..51d99ddca6 100644 --- a/ext/iconv/tests/iconv_strrpos_variation1.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation1.phpt @@ -100,7 +100,6 @@ foreach($inputs as $input) { echo "Done"; ?> - --EXPECTF-- *** Testing iconv_strrpos() : usage variations *** @@ -177,4 +176,4 @@ bool(false) Warning: iconv_strrpos() expects parameter 1 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strrpos_variation2.phpt b/ext/iconv/tests/iconv_strrpos_variation2.phpt index 297a7589d3..59e26a4a18 100644 --- a/ext/iconv/tests/iconv_strrpos_variation2.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation2.phpt @@ -102,7 +102,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing iconv_strrpos() : usage variations *** @@ -179,4 +178,4 @@ bool(false) Warning: iconv_strrpos() expects parameter 2 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt index f799fa04f9..0abf49337a 100644 --- a/ext/iconv/tests/iconv_strrpos_variation3.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt @@ -103,7 +103,6 @@ fclose($fp); echo "Done"; ?> - --EXPECTF-- *** Testing iconv_strrpos() : usage variations *** @@ -202,4 +201,4 @@ int(7) Warning: iconv_strrpos() expects parameter 3 to be string, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt b/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt index c27e60d1dd..135c636718 100644 --- a/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt +++ b/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt @@ -9,6 +9,5 @@ $b = str_repeat('/', 2798349); var_dump(iconv_substr($a, 0, 1, $b)); ?> --EXPECTF-- - Warning: iconv_substr(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_substr_error1.phpt b/ext/iconv/tests/iconv_substr_error1.phpt index 61c01dc0d0..e0c277b59c 100644 --- a/ext/iconv/tests/iconv_substr_error1.phpt +++ b/ext/iconv/tests/iconv_substr_error1.phpt @@ -47,4 +47,3 @@ bool(false) Warning: iconv_substr() expects at least 2 parameters, 1 given in %s on line %d bool(false) Done - diff --git a/ext/iconv/tests/iconv_substr_error2.phpt b/ext/iconv/tests/iconv_substr_error2.phpt index 0bc0661026..6214aa298a 100644 --- a/ext/iconv/tests/iconv_substr_error2.phpt +++ b/ext/iconv/tests/iconv_substr_error2.phpt @@ -33,4 +33,3 @@ echo "Done"; Notice: iconv_substr(): Wrong charset, conversion from `unknown-encoding' to `UCS-4LE' is not allowed in %s on line %d bool(false) Done - |