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 --- tests/output/bug60768.phpt | 1 - tests/output/bug65593.phpt | 1 - tests/output/ob_end_clean_basic_001.phpt | 2 -- tests/output/ob_end_clean_error_001.phpt | 1 - tests/output/ob_get_clean_error_001.phpt | 1 - tests/output/ob_get_length_error_001.phpt | 1 - tests/output/ob_start_basic_004.phpt | 1 - 7 files changed, 8 deletions(-) (limited to 'tests/output') diff --git a/tests/output/bug60768.phpt b/tests/output/bug60768.phpt index 2527e8e84a..4de7fbd69f 100644 --- a/tests/output/bug60768.phpt +++ b/tests/output/bug60768.phpt @@ -22,4 +22,3 @@ DONE --EXPECT-- Output size: 120, expected 120 DONE - diff --git a/tests/output/bug65593.phpt b/tests/output/bug65593.phpt index 2e40afa076..d20c3b0c24 100644 --- a/tests/output/bug65593.phpt +++ b/tests/output/bug65593.phpt @@ -10,4 +10,3 @@ ob_start(function(){ob_start();}); Test Fatal error: ob_start(): Cannot use output buffering in output buffering display handlers in %sbug65593.php on line %d - diff --git a/tests/output/ob_end_clean_basic_001.phpt b/tests/output/ob_end_clean_basic_001.phpt index 87942c2f6d..6824857675 100644 --- a/tests/output/ob_end_clean_basic_001.phpt +++ b/tests/output/ob_end_clean_basic_001.phpt @@ -20,7 +20,6 @@ var_dump(ob_end_clean()); ?> --EXPECTF-- - Notice: ob_end_clean(): failed to delete buffer. No buffer to delete in %s on line 7 bool(false) bool(true) @@ -28,4 +27,3 @@ bool(true) Notice: ob_end_clean(): failed to delete buffer. No buffer to delete in %s on line 16 bool(false) - diff --git a/tests/output/ob_end_clean_error_001.phpt b/tests/output/ob_end_clean_error_001.phpt index 09bacaa081..821831ee50 100644 --- a/tests/output/ob_end_clean_error_001.phpt +++ b/tests/output/ob_end_clean_error_001.phpt @@ -15,7 +15,6 @@ var_dump(ob_end_clean($extra_arg)); ?> --EXPECTF-- - Too many arguments Warning: ob_end_clean() expects exactly 0 parameters, 1 given in %s on line 10 diff --git a/tests/output/ob_get_clean_error_001.phpt b/tests/output/ob_get_clean_error_001.phpt index 563e62c35a..cbedc03297 100644 --- a/tests/output/ob_get_clean_error_001.phpt +++ b/tests/output/ob_get_clean_error_001.phpt @@ -15,7 +15,6 @@ var_dump(ob_get_clean($extra_arg)); ?> --EXPECTF-- - Too many arguments Warning: ob_get_clean() expects exactly 0 parameters, 1 given in %s on line 10 diff --git a/tests/output/ob_get_length_error_001.phpt b/tests/output/ob_get_length_error_001.phpt index 8e4318122b..f7fcfd2c96 100644 --- a/tests/output/ob_get_length_error_001.phpt +++ b/tests/output/ob_get_length_error_001.phpt @@ -15,7 +15,6 @@ var_dump(ob_get_length($extra_arg)); ?> --EXPECTF-- - Too many arguments Warning: ob_get_length() expects exactly 0 parameters, 1 given in %s on line 10 diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt index 5ce68bdc35..c942768432 100644 --- a/tests/output/ob_start_basic_004.phpt +++ b/tests/output/ob_start_basic_004.phpt @@ -34,7 +34,6 @@ for ($cs=-1; $cs<10; $cs++) { ?> --EXPECTF-- - ----( chunk_size: -1, output append size: 1 )---- f[call:1; len:8]12345678 -- cgit v1.2.1