summaryrefslogtreecommitdiff
path: root/ext/standard/tests/streams
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-15 04:31:31 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-15 04:31:31 +0200
commitf1d7e3ca0b70f910fcecef0278de9c15440ca3c0 (patch)
tree70af7290bf6c0b06f223254537b502013ade302e /ext/standard/tests/streams
parentf98c916845571deeab189fb2ab52a17aef49edb8 (diff)
downloadphp-git-f1d7e3ca0b70f910fcecef0278de9c15440ca3c0.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/standard/tests/streams')
-rw-r--r--ext/standard/tests/streams/bug44712.phpt1
-rw-r--r--ext/standard/tests/streams/bug53903.phpt1
-rw-r--r--ext/standard/tests/streams/bug54946.phpt1
-rw-r--r--ext/standard/tests/streams/bug60455_03.phpt2
-rw-r--r--ext/standard/tests/streams/bug60817.phpt1
-rw-r--r--ext/standard/tests/streams/bug64433.phpt2
-rw-r--r--ext/standard/tests/streams/bug67626.phpt2
-rw-r--r--ext/standard/tests/streams/bug68948.phpt1
-rw-r--r--ext/standard/tests/streams/bug70198.phpt1
-rw-r--r--ext/standard/tests/streams/bug72075.phpt1
-rw-r--r--ext/standard/tests/streams/bug72534.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug51800.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug51800_right.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug51800_right2.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug60120.phpt1
-rw-r--r--ext/standard/tests/streams/proc_open_bug64438.phpt1
-rw-r--r--ext/standard/tests/streams/stream_resolve_include_path.phpt1
-rw-r--r--ext/standard/tests/streams/stream_set_chunk_size.phpt1
-rw-r--r--ext/standard/tests/streams/user-stream-error.phpt1
-rw-r--r--ext/standard/tests/streams/user_streams_consumed_bug.phpt1
20 files changed, 1 insertions, 22 deletions
diff --git a/ext/standard/tests/streams/bug44712.phpt b/ext/standard/tests/streams/bug44712.phpt
index 9dfb26001b..25e7f725d1 100644
--- a/ext/standard/tests/streams/bug44712.phpt
+++ b/ext/standard/tests/streams/bug44712.phpt
@@ -7,4 +7,3 @@ stream_context_set_params($ctx, array("options" => 1));
?>
--EXPECTF--
Warning: stream_context_set_params(): Invalid stream/context parameter in %sbug44712.php on line %s
-
diff --git a/ext/standard/tests/streams/bug53903.phpt b/ext/standard/tests/streams/bug53903.phpt
index 3b61635d78..fd0b770f6b 100644
--- a/ext/standard/tests/streams/bug53903.phpt
+++ b/ext/standard/tests/streams/bug53903.phpt
@@ -29,4 +29,3 @@ Array
(
[0] => 1
)
-
diff --git a/ext/standard/tests/streams/bug54946.phpt b/ext/standard/tests/streams/bug54946.phpt
index b51d593a93..f220e9afba 100644
--- a/ext/standard/tests/streams/bug54946.phpt
+++ b/ext/standard/tests/streams/bug54946.phpt
@@ -36,4 +36,3 @@ string(0) ""
string(0) ""
string(0) ""
===DONE===
-
diff --git a/ext/standard/tests/streams/bug60455_03.phpt b/ext/standard/tests/streams/bug60455_03.phpt
index 131da852b7..4cfc373408 100644
--- a/ext/standard/tests/streams/bug60455_03.phpt
+++ b/ext/standard/tests/streams/bug60455_03.phpt
@@ -42,8 +42,6 @@ while (!feof($f)) {
$line = stream_get_line($f, 99, "\n");
var_dump($line);
}
-
-
--EXPECT--
string(1) "a"
string(1) "b"
diff --git a/ext/standard/tests/streams/bug60817.phpt b/ext/standard/tests/streams/bug60817.phpt
index 2d4cf2682b..1d5993e377 100644
--- a/ext/standard/tests/streams/bug60817.phpt
+++ b/ext/standard/tests/streams/bug60817.phpt
@@ -27,7 +27,6 @@ while (!feof($f)) {
$line = stream_get_line($f, 99, "\n");
var_dump($line);
}
-
--EXPECT--
Read done
string(1) "a"
diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt
index 67c66d61bc..a7e4cf4931 100644
--- a/ext/standard/tests/streams/bug64433.phpt
+++ b/ext/standard/tests/streams/bug64433.phpt
@@ -82,5 +82,3 @@ follow=1
307: REDIRECTED
404: REDIRECTED
500: REDIRECTED
-
-
diff --git a/ext/standard/tests/streams/bug67626.phpt b/ext/standard/tests/streams/bug67626.phpt
index ffdfb3553b..0ab69fd877 100644
--- a/ext/standard/tests/streams/bug67626.phpt
+++ b/ext/standard/tests/streams/bug67626.phpt
@@ -42,4 +42,4 @@ try {
?>
--EXPECTF--
stream_read_exception
-stream_write_exception \ No newline at end of file
+stream_write_exception
diff --git a/ext/standard/tests/streams/bug68948.phpt b/ext/standard/tests/streams/bug68948.phpt
index 7ce9d7ad03..b745ec2a73 100644
--- a/ext/standard/tests/streams/bug68948.phpt
+++ b/ext/standard/tests/streams/bug68948.phpt
@@ -27,4 +27,3 @@ bool(false)
string(10) "0123456789"
int(10)
bool(true)
-
diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt
index cc3f328d3f..514ef79812 100644
--- a/ext/standard/tests/streams/bug70198.phpt
+++ b/ext/standard/tests/streams/bug70198.phpt
@@ -58,4 +58,3 @@ unlink($srv_fl);
--EXPECTF--
int(0)
==DONE==
-
diff --git a/ext/standard/tests/streams/bug72075.phpt b/ext/standard/tests/streams/bug72075.phpt
index 93dce60350..1a57fdd693 100644
--- a/ext/standard/tests/streams/bug72075.phpt
+++ b/ext/standard/tests/streams/bug72075.phpt
@@ -10,6 +10,5 @@ $e = NULL;
$dummy =& $r[0];
print stream_select($r, $w, $e, 0.5);
-
--EXPECT--
0
diff --git a/ext/standard/tests/streams/bug72534.phpt b/ext/standard/tests/streams/bug72534.phpt
index 38e1208a37..5ffc90b6bd 100644
--- a/ext/standard/tests/streams/bug72534.phpt
+++ b/ext/standard/tests/streams/bug72534.phpt
@@ -16,4 +16,3 @@ unlink($fname);
--EXPECT--
bool(false)
bool(false)
-
diff --git a/ext/standard/tests/streams/proc_open_bug51800.phpt b/ext/standard/tests/streams/proc_open_bug51800.phpt
index 53cafd8555..a107875e3e 100644
--- a/ext/standard/tests/streams/proc_open_bug51800.phpt
+++ b/ext/standard/tests/streams/proc_open_bug51800.phpt
@@ -92,4 +92,3 @@ array(3) {
int(10000)
int(10000)
===DONE===
-
diff --git a/ext/standard/tests/streams/proc_open_bug51800_right.phpt b/ext/standard/tests/streams/proc_open_bug51800_right.phpt
index efff8e7110..2753570fb1 100644
--- a/ext/standard/tests/streams/proc_open_bug51800_right.phpt
+++ b/ext/standard/tests/streams/proc_open_bug51800_right.phpt
@@ -75,4 +75,3 @@ array(3) {
int(10000)
int(10000)
===DONE===
-
diff --git a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt
index 8e7c7df2c9..045d3f70db 100644
--- a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt
+++ b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt
@@ -81,4 +81,3 @@ array(3) {
int(1000000)
int(1000000)
===DONE===
-
diff --git a/ext/standard/tests/streams/proc_open_bug60120.phpt b/ext/standard/tests/streams/proc_open_bug60120.phpt
index 4587f0718e..544df47ad9 100644
--- a/ext/standard/tests/streams/proc_open_bug60120.phpt
+++ b/ext/standard/tests/streams/proc_open_bug60120.phpt
@@ -68,4 +68,3 @@ string(2049) "%s"
string(0) ""
string(0) ""
===DONE===
-
diff --git a/ext/standard/tests/streams/proc_open_bug64438.phpt b/ext/standard/tests/streams/proc_open_bug64438.phpt
index 747f1171f3..bcddecf401 100644
--- a/ext/standard/tests/streams/proc_open_bug64438.phpt
+++ b/ext/standard/tests/streams/proc_open_bug64438.phpt
@@ -67,4 +67,3 @@ string(4097) "%s"
string(0) ""
string(0) ""
===DONE===
-
diff --git a/ext/standard/tests/streams/stream_resolve_include_path.phpt b/ext/standard/tests/streams/stream_resolve_include_path.phpt
index aea5cdd96c..4109b5672e 100644
--- a/ext/standard/tests/streams/stream_resolve_include_path.phpt
+++ b/ext/standard/tests/streams/stream_resolve_include_path.phpt
@@ -34,4 +34,3 @@ NULL
bool(false)
string(%d) "%stest_path%sfile"
string(%d) "%stest_path%snested%sfile"
-
diff --git a/ext/standard/tests/streams/stream_set_chunk_size.phpt b/ext/standard/tests/streams/stream_set_chunk_size.phpt
index ce272519c4..5d7d51adb2 100644
--- a/ext/standard/tests/streams/stream_set_chunk_size.phpt
+++ b/ext/standard/tests/streams/stream_set_chunk_size.phpt
@@ -52,7 +52,6 @@ echo "\nerror conditions\n";
var_dump(stream_set_chunk_size($f, 0));
var_dump(stream_set_chunk_size($f, -1));
var_dump(stream_set_chunk_size($f, array()));
-
--EXPECTF--
bool(true)
should return previous chunk size (8192)
diff --git a/ext/standard/tests/streams/user-stream-error.phpt b/ext/standard/tests/streams/user-stream-error.phpt
index 2832107993..5cc87e7360 100644
--- a/ext/standard/tests/streams/user-stream-error.phpt
+++ b/ext/standard/tests/streams/user-stream-error.phpt
@@ -11,7 +11,6 @@ class FailStream {
stream_wrapper_register('mystream', 'FailStream');
fopen('mystream://foo', 'r');
echo 'Done';
-
--EXPECTF--
Warning: fopen(mystream://foo): failed to open stream: "FailStream::stream_open" call failed in %s%euser-stream-error.php on line %d
diff --git a/ext/standard/tests/streams/user_streams_consumed_bug.phpt b/ext/standard/tests/streams/user_streams_consumed_bug.phpt
index 147a7bd0a7..bad319cd22 100644
--- a/ext/standard/tests/streams/user_streams_consumed_bug.phpt
+++ b/ext/standard/tests/streams/user_streams_consumed_bug.phpt
@@ -29,4 +29,3 @@ Hello
int(6)
Goodbye
int(8)
-