From b746e6988743b46ccb0542d5d568eef0608ee296 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 15 Oct 2018 04:32:30 +0200 Subject: 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-' ' characters plus a terminating '' 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 --- ext/imap/tests/bug31142_2.phpt | 2 +- ext/imap/tests/bug40854.phpt | 2 +- ext/imap/tests/imap_append_basic.phpt | 1 - ext/imap/tests/imap_body.phpt | 2 +- ext/imap/tests/imap_fetchheader_variation4.phpt | 2 +- ext/imap/tests/imap_getsubscribed_basic.phpt | 2 +- ext/imap/tests/imap_headerinfo_basic.phpt | 2 +- ext/imap/tests/imap_headers.phpt | 1 - ext/imap/tests/imap_list_basic.phpt | 2 +- ext/imap/tests/imap_lsub_basic.phpt | 2 +- ext/imap/tests/imap_mail_copy.phpt | 2 +- ext/imap/tests/imap_mail_copy_basic.phpt | 2 +- ext/imap/tests/imap_mail_move.phpt | 2 +- ext/imap/tests/imap_mail_move_basic.phpt | 2 +- ext/imap/tests/imap_num_msg_error.phpt | 1 - ext/imap/tests/imap_rfc822_parse_headers_basic.phpt | 2 +- ext/imap/tests/imap_savebody_basic.phpt | 1 - ext/imap/tests/imap_undelete_basic.phpt | 2 +- 18 files changed, 14 insertions(+), 18 deletions(-) (limited to 'ext/imap') diff --git a/ext/imap/tests/bug31142_2.phpt b/ext/imap/tests/bug31142_2.phpt index c9eed598b3..004c054963 100644 --- a/ext/imap/tests/bug31142_2.phpt +++ b/ext/imap/tests/bug31142_2.phpt @@ -27,4 +27,4 @@ MIME-Version: 1.0 Content-Type: TEXT/plain; CHARSET=iso-8859-2 Content-Transfer-Encoding: QUOTED-PRINTABLE -asn =C5=99kl \ No newline at end of file +asn =C5=99kl diff --git a/ext/imap/tests/bug40854.phpt b/ext/imap/tests/bug40854.phpt index 970542cf95..f71fff9896 100644 --- a/ext/imap/tests/bug40854.phpt +++ b/ext/imap/tests/bug40854.phpt @@ -54,4 +54,4 @@ contents.data3 ---%s-- \ No newline at end of file +--%s-- diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt index e46268533d..06b0c1d4a4 100644 --- a/ext/imap/tests/imap_append_basic.phpt +++ b/ext/imap/tests/imap_append_basic.phpt @@ -69,4 +69,3 @@ array(2) { string(%d) "%w%s 2)%s webmaster@something. Another test (%d chars)" } ===Done=== - diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt index 1c75a94426..77747c8d8a 100644 --- a/ext/imap/tests/imap_body.phpt +++ b/ext/imap/tests/imap_body.phpt @@ -45,4 +45,4 @@ Warning: imap_body(): Bad message number in %s on line %d Warning: imap_body(): invalid value for the options parameter in %s on line %d Warning: imap_body(): Bad message number in %s on line %d -bool(false) \ No newline at end of file +bool(false) diff --git a/ext/imap/tests/imap_fetchheader_variation4.phpt b/ext/imap/tests/imap_fetchheader_variation4.phpt index ad45f4d39d..67c63077f4 100644 --- a/ext/imap/tests/imap_fetchheader_variation4.phpt +++ b/ext/imap/tests/imap_fetchheader_variation4.phpt @@ -42,4 +42,4 @@ resource(%d) of type (stream) Warning: imap_fetchheader(): supplied resource is not a valid imap resource in %s on line %d bool(false) -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/imap/tests/imap_getsubscribed_basic.phpt b/ext/imap/tests/imap_getsubscribed_basic.phpt index 63617686b1..cfe526844b 100644 --- a/ext/imap/tests/imap_getsubscribed_basic.phpt +++ b/ext/imap/tests/imap_getsubscribed_basic.phpt @@ -65,4 +65,4 @@ object(stdClass)#%d (%d) { int(%d) [%sdelimiter"]=> string(%d) "%s" -} \ No newline at end of file +} diff --git a/ext/imap/tests/imap_headerinfo_basic.phpt b/ext/imap/tests/imap_headerinfo_basic.phpt index afee066f4a..4334b62e8e 100644 --- a/ext/imap/tests/imap_headerinfo_basic.phpt +++ b/ext/imap/tests/imap_headerinfo_basic.phpt @@ -126,4 +126,4 @@ Deleted: OK Draft: OK string(%d) "%s" string(%d) "%d" -int(%d) \ No newline at end of file +int(%d) diff --git a/ext/imap/tests/imap_headers.phpt b/ext/imap/tests/imap_headers.phpt index 4a1136c07b..60c04d406e 100644 --- a/ext/imap/tests/imap_headers.phpt +++ b/ext/imap/tests/imap_headers.phpt @@ -25,4 +25,3 @@ Checking with incorrect parameter type Warning: imap_headers() expects parameter 1 to be resource, string given in %s on line %d Warning: imap_headers() expects parameter 1 to be resource, bool given in %s on line %d - diff --git a/ext/imap/tests/imap_list_basic.phpt b/ext/imap/tests/imap_list_basic.phpt index 436cd5c3a3..edd899c921 100644 --- a/ext/imap/tests/imap_list_basic.phpt +++ b/ext/imap/tests/imap_list_basic.phpt @@ -44,4 +44,4 @@ Warning: imap_list() expects exactly 3 parameters, 1 given in %s on line %d Warning: imap_list() expects exactly 3 parameters, 2 given in %s on line %d bool(true) -string(%s) "{%s}%s" \ No newline at end of file +string(%s) "{%s}%s" diff --git a/ext/imap/tests/imap_lsub_basic.phpt b/ext/imap/tests/imap_lsub_basic.phpt index 7775ec0c3e..0f7149917e 100644 --- a/ext/imap/tests/imap_lsub_basic.phpt +++ b/ext/imap/tests/imap_lsub_basic.phpt @@ -58,4 +58,4 @@ Warning: imap_lsub() expects exactly 3 parameters, 2 given in %s on line %d bool(false) Checking OK bool(true) -string(%s) "{%s}%s" \ No newline at end of file +string(%s) "{%s}%s" diff --git a/ext/imap/tests/imap_mail_copy.phpt b/ext/imap/tests/imap_mail_copy.phpt index fc6d7e56a2..c2aae5b176 100644 --- a/ext/imap/tests/imap_mail_copy.phpt +++ b/ext/imap/tests/imap_mail_copy.phpt @@ -51,4 +51,4 @@ NULL Warning: imap_mail_copy() expects at least 3 parameters, 2 given in %s on line %d NULL -===Done=== \ No newline at end of file +===Done=== diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt index 05cb128a61..2171403cd1 100644 --- a/ext/imap/tests/imap_mail_copy_basic.phpt +++ b/ext/imap/tests/imap_mail_copy_basic.phpt @@ -43,4 +43,4 @@ Create a temporary mailbox and add 1 msgs .. mailbox '%s' created Msg Count in new mailbox: 1 bool(true) -===Done=== \ No newline at end of file +===Done=== diff --git a/ext/imap/tests/imap_mail_move.phpt b/ext/imap/tests/imap_mail_move.phpt index 0456e23c08..7d8e489557 100644 --- a/ext/imap/tests/imap_mail_move.phpt +++ b/ext/imap/tests/imap_mail_move.phpt @@ -51,4 +51,4 @@ NULL Warning: imap_mail_move() expects at least 3 parameters, 2 given in %s on line %d NULL -===Done=== \ No newline at end of file +===Done=== diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt index bd04308a44..f33f4963fa 100644 --- a/ext/imap/tests/imap_mail_move_basic.phpt +++ b/ext/imap/tests/imap_mail_move_basic.phpt @@ -43,4 +43,4 @@ Create a temporary mailbox and add 1 msgs .. mailbox '%s' created Msg Count in new mailbox: 1 bool(true) -===Done=== \ No newline at end of file +===Done=== diff --git a/ext/imap/tests/imap_num_msg_error.phpt b/ext/imap/tests/imap_num_msg_error.phpt index 2ca498dc9a..69fb23f55b 100644 --- a/ext/imap/tests/imap_num_msg_error.phpt +++ b/ext/imap/tests/imap_num_msg_error.phpt @@ -25,4 +25,3 @@ Checking with incorrect parameter type Warning: imap_num_msg() expects parameter 1 to be resource, string given in %s on line %d Warning: imap_num_msg() expects parameter 1 to be resource, bool given in %s on line %d - diff --git a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt index 07eb69bf68..ee17fb39b9 100644 --- a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt +++ b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt @@ -119,4 +119,4 @@ Deleted: OK Draft: OK string(%d) "%s" string(%d) "%d" -int(%d) \ No newline at end of file +int(%d) diff --git a/ext/imap/tests/imap_savebody_basic.phpt b/ext/imap/tests/imap_savebody_basic.phpt index 23c3573996..0c03d0033d 100644 --- a/ext/imap/tests/imap_savebody_basic.phpt +++ b/ext/imap/tests/imap_savebody_basic.phpt @@ -58,4 +58,3 @@ bool(true) Size: %d bool(true) Size: %d - diff --git a/ext/imap/tests/imap_undelete_basic.phpt b/ext/imap/tests/imap_undelete_basic.phpt index 60e30ae21b..1ec02600d7 100644 --- a/ext/imap/tests/imap_undelete_basic.phpt +++ b/ext/imap/tests/imap_undelete_basic.phpt @@ -26,4 +26,4 @@ require_once('clean.inc'); --EXPECTF-- Create a temporary mailbox and add 1 msgs .. mailbox '{%s}%s' created -bool(true) \ No newline at end of file +bool(true) -- cgit v1.2.1