From f1d7e3ca0b70f910fcecef0278de9c15440ca3c0 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 15 Oct 2018 04:31:31 +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/pgsql/tests/10pg_convert.phpt | 2 +- ext/pgsql/tests/10pg_convert_9.phpt | 2 +- ext/pgsql/tests/12pg_insert.phpt | 2 +- ext/pgsql/tests/12pg_insert_9.phpt | 2 +- ext/pgsql/tests/13pg_select_9.phpt | 2 +- ext/pgsql/tests/14pg_update_9.phpt | 2 +- ext/pgsql/tests/31nb_async_query_prepared.phpt | 1 - ext/pgsql/tests/32nb_async_query.phpt | 1 - ext/pgsql/tests/bug47199.phpt | 2 +- ext/pgsql/tests/bug64609.phpt | 2 +- ext/pgsql/tests/bug72197.phpt | 1 - ext/pgsql/tests/pg_insert_001.phpt | 1 - ext/pgsql/tests/pg_insert_002.phpt | 3 +-- 13 files changed, 9 insertions(+), 14 deletions(-) (limited to 'ext/pgsql') diff --git a/ext/pgsql/tests/10pg_convert.phpt b/ext/pgsql/tests/10pg_convert.phpt index adc2756e25..f00cab7664 100644 --- a/ext/pgsql/tests/10pg_convert.phpt +++ b/ext/pgsql/tests/10pg_convert.phpt @@ -26,4 +26,4 @@ array(3) { string(6) "E'AAA'" [""bin""]=> string(6) "E'BBB'" -} \ No newline at end of file +} diff --git a/ext/pgsql/tests/10pg_convert_9.phpt b/ext/pgsql/tests/10pg_convert_9.phpt index 827c96250d..a8395315c6 100644 --- a/ext/pgsql/tests/10pg_convert_9.phpt +++ b/ext/pgsql/tests/10pg_convert_9.phpt @@ -27,4 +27,4 @@ array(3) { string(6) "E'AAA'" [""bin""]=> string(12) "E'\\x424242'" -} \ No newline at end of file +} diff --git a/ext/pgsql/tests/12pg_insert.phpt b/ext/pgsql/tests/12pg_insert.phpt index 9fd0dd1e3b..c03060a87e 100644 --- a/ext/pgsql/tests/12pg_insert.phpt +++ b/ext/pgsql/tests/12pg_insert.phpt @@ -21,4 +21,4 @@ echo "Ok\n"; ?> --EXPECT-- INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES (1234,E'AAA',E'BBB'); -Ok \ No newline at end of file +Ok diff --git a/ext/pgsql/tests/12pg_insert_9.phpt b/ext/pgsql/tests/12pg_insert_9.phpt index b84e25b8d3..275afc55e1 100644 --- a/ext/pgsql/tests/12pg_insert_9.phpt +++ b/ext/pgsql/tests/12pg_insert_9.phpt @@ -27,4 +27,4 @@ echo "Ok\n"; INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES (1234,E'AAA',E'\\x424242'); INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES ('1234','AAA','BBB'); resource(%d) of type (pgsql result) -Ok \ No newline at end of file +Ok diff --git a/ext/pgsql/tests/13pg_select_9.phpt b/ext/pgsql/tests/13pg_select_9.phpt index 3b3ccb7462..d5e661e5e0 100644 --- a/ext/pgsql/tests/13pg_select_9.phpt +++ b/ext/pgsql/tests/13pg_select_9.phpt @@ -47,4 +47,4 @@ array(2) { } SELECT * FROM "php_pgsql_test" WHERE "num"=1234; SELECT * FROM "php_pgsql_test" WHERE "num"='1234'; -Ok \ No newline at end of file +Ok diff --git a/ext/pgsql/tests/14pg_update_9.phpt b/ext/pgsql/tests/14pg_update_9.phpt index 9f1b516b9d..e3e802b7a2 100644 --- a/ext/pgsql/tests/14pg_update_9.phpt +++ b/ext/pgsql/tests/14pg_update_9.phpt @@ -26,4 +26,4 @@ echo "Ok\n"; --EXPECT-- UPDATE "php_pgsql_test" SET "num"=1234,"str"=E'ABC',"bin"=E'\\x58595a' WHERE "num"=1234; UPDATE "php_pgsql_test" SET "num"='1234',"str"='ABC',"bin"='XYZ' WHERE "num"='1234'; -Ok \ No newline at end of file +Ok diff --git a/ext/pgsql/tests/31nb_async_query_prepared.phpt b/ext/pgsql/tests/31nb_async_query_prepared.phpt index d82ae798e8..f485e596f9 100755 --- a/ext/pgsql/tests/31nb_async_query_prepared.phpt +++ b/ext/pgsql/tests/31nb_async_query_prepared.phpt @@ -109,4 +109,3 @@ echo "OK"; ?> --EXPECT-- OK - diff --git a/ext/pgsql/tests/32nb_async_query.phpt b/ext/pgsql/tests/32nb_async_query.phpt index 7858a60eea..8ef1591db5 100644 --- a/ext/pgsql/tests/32nb_async_query.phpt +++ b/ext/pgsql/tests/32nb_async_query.phpt @@ -81,4 +81,3 @@ echo "OK"; ?> --EXPECT-- OK - diff --git a/ext/pgsql/tests/bug47199.phpt b/ext/pgsql/tests/bug47199.phpt index faa787fd54..651e6999d5 100644 --- a/ext/pgsql/tests/bug47199.phpt +++ b/ext/pgsql/tests/bug47199.phpt @@ -64,4 +64,4 @@ array(1) { } } -Done \ No newline at end of file +Done diff --git a/ext/pgsql/tests/bug64609.phpt b/ext/pgsql/tests/bug64609.phpt index 72fac7648e..e31ec8e019 100644 --- a/ext/pgsql/tests/bug64609.phpt +++ b/ext/pgsql/tests/bug64609.phpt @@ -27,4 +27,4 @@ var_dump($converted); array(1) { [""a""]=> string(5) "E'ok'" -} \ No newline at end of file +} diff --git a/ext/pgsql/tests/bug72197.phpt b/ext/pgsql/tests/bug72197.phpt index 6b6cc3ec67..bf9c16978b 100644 --- a/ext/pgsql/tests/bug72197.phpt +++ b/ext/pgsql/tests/bug72197.phpt @@ -32,4 +32,3 @@ Warning: pg_lo_create(): supplied resource is not a valid PostgreSQL link resour int(%d) int(%d) ==DONE== - diff --git a/ext/pgsql/tests/pg_insert_001.phpt b/ext/pgsql/tests/pg_insert_001.phpt index 626d4d0f82..ecb13c4ee9 100644 --- a/ext/pgsql/tests/pg_insert_001.phpt +++ b/ext/pgsql/tests/pg_insert_001.phpt @@ -26,7 +26,6 @@ pg_query('DROP SCHEMA phptests'); ?> --EXPECTF-- - Warning: pg_insert(): Table 'foo' doesn't exists in %s on line %d string(55) "INSERT INTO "phptests"."foo" ("id","id2") VALUES (1,2);" array(1) { diff --git a/ext/pgsql/tests/pg_insert_002.phpt b/ext/pgsql/tests/pg_insert_002.phpt index 329f525b27..0dcee55b8f 100644 --- a/ext/pgsql/tests/pg_insert_002.phpt +++ b/ext/pgsql/tests/pg_insert_002.phpt @@ -15,7 +15,6 @@ foreach (array('', '.', '..') as $table) { ?> Done --EXPECTF-- - Warning: pg_insert(): The table name must be specified in %s on line %d bool(false) @@ -24,4 +23,4 @@ bool(false) Warning: pg_insert(): The table name must be specified in %s on line %d bool(false) -Done \ No newline at end of file +Done -- cgit v1.2.1