summaryrefslogtreecommitdiff
path: root/ext/zip
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/zip
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/zip')
-rw-r--r--ext/zip/tests/bug47667.phpt1
-rw-r--r--ext/zip/tests/bug49072.phpt1
-rw-r--r--ext/zip/tests/bug53603.phpt3
-rw-r--r--ext/zip/tests/bug8009.phpt1
-rw-r--r--ext/zip/tests/bug8700.phpt1
-rw-r--r--ext/zip/tests/oo_getstatusstring.phpt1
-rw-r--r--ext/zip/tests/oo_properties.phpt1
-rw-r--r--ext/zip/tests/zip_entry_compressionmethod.phpt1
8 files changed, 0 insertions, 10 deletions
diff --git a/ext/zip/tests/bug47667.phpt b/ext/zip/tests/bug47667.phpt
index fada9bf80f..4a45e5db07 100644
--- a/ext/zip/tests/bug47667.phpt
+++ b/ext/zip/tests/bug47667.phpt
@@ -36,6 +36,5 @@ echo "files: " , $zip->numFiles;
$zip->close();
unlink($filename);
-
--EXPECT--
files: 1
diff --git a/ext/zip/tests/bug49072.phpt b/ext/zip/tests/bug49072.phpt
index 04bd06e4ad..7f35b635e9 100644
--- a/ext/zip/tests/bug49072.phpt
+++ b/ext/zip/tests/bug49072.phpt
@@ -20,5 +20,4 @@ while (! feof($r)) {
}
?>
--EXPECTF--
-
Warning: fread(): Zip stream error: CRC error in %s on line %d
diff --git a/ext/zip/tests/bug53603.phpt b/ext/zip/tests/bug53603.phpt
index f8ff1b4d44..56d84ad3de 100644
--- a/ext/zip/tests/bug53603.phpt
+++ b/ext/zip/tests/bug53603.phpt
@@ -27,9 +27,6 @@ if ($zip->open($file) !== TRUE) {
$a = $zip->extractTo('teststream://test');
var_dump($a);
-
--EXPECTF--
-
Warning: ZipArchive::extractTo(teststream://test/foo): failed to open stream: "TestStream::stream_open" call failed in %s on line %d
bool(false)
-
diff --git a/ext/zip/tests/bug8009.phpt b/ext/zip/tests/bug8009.phpt
index 5dd363d2da..2d48da8e4a 100644
--- a/ext/zip/tests/bug8009.phpt
+++ b/ext/zip/tests/bug8009.phpt
@@ -22,6 +22,5 @@ $zip->close();
unlink($filename);
echo "status: " . $zip->status . "\n";
echo "\n";
-
--EXPECT--
status: 0
diff --git a/ext/zip/tests/bug8700.phpt b/ext/zip/tests/bug8700.phpt
index c394cf0bec..1006b1823d 100644
--- a/ext/zip/tests/bug8700.phpt
+++ b/ext/zip/tests/bug8700.phpt
@@ -25,6 +25,5 @@ if ($contents_from_idx != $contents_from_name) {
$zip->close();
echo "status: " . $zip->status . "\n";
echo "\n";
-
--EXPECT--
status: 0
diff --git a/ext/zip/tests/oo_getstatusstring.phpt b/ext/zip/tests/oo_getstatusstring.phpt
index efd19e318e..87462694ac 100644
--- a/ext/zip/tests/oo_getstatusstring.phpt
+++ b/ext/zip/tests/oo_getstatusstring.phpt
@@ -25,4 +25,3 @@ unlink($dirname.'foo.zip');
--EXPECT--
string(8) "No error"
string(16) "Invalid argument"
-
diff --git a/ext/zip/tests/oo_properties.phpt b/ext/zip/tests/oo_properties.phpt
index 886317b57b..0747f13366 100644
--- a/ext/zip/tests/oo_properties.phpt
+++ b/ext/zip/tests/oo_properties.phpt
@@ -57,4 +57,3 @@ zip->filename (%d):
zip->comment (19):
empty(): 0
isset(): 1
-
diff --git a/ext/zip/tests/zip_entry_compressionmethod.phpt b/ext/zip/tests/zip_entry_compressionmethod.phpt
index cabdbb797f..970ea7a8c0 100644
--- a/ext/zip/tests/zip_entry_compressionmethod.phpt
+++ b/ext/zip/tests/zip_entry_compressionmethod.phpt
@@ -21,4 +21,3 @@ stored
stored
stored
deflated
-