summaryrefslogtreecommitdiff
path: root/ext/json
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-15 04:33:09 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-15 04:33:09 +0200
commitd679f02295ea079338f029b7f5f4cb65b37f190c (patch)
tree53c519e1f829913a54d9dcea004721a3714cea26 /ext/json
parente84662c35cffaa95ead4322bfe9d61815c185722 (diff)
downloadphp-git-d679f02295ea079338f029b7f5f4cb65b37f190c.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/json')
-rw-r--r--ext/json/tests/bug72787.phpt1
-rw-r--r--ext/json/tests/fail001.phpt1
-rw-r--r--ext/json/tests/json_last_error_error.phpt1
-rw-r--r--ext/json/tests/json_last_error_msg_error.phpt1
-rw-r--r--ext/json/tests/serialize.phpt2
5 files changed, 0 insertions, 6 deletions
diff --git a/ext/json/tests/bug72787.phpt b/ext/json/tests/bug72787.phpt
index c9820faa9f..2b0a49121a 100644
--- a/ext/json/tests/bug72787.phpt
+++ b/ext/json/tests/bug72787.phpt
@@ -10,6 +10,5 @@ var_dump(json_decode('[]', false, 0x100000000));
?>
--EXPECTF--
-
Warning: json_decode(): Depth must be lower than %d in %s on line %d
NULL
diff --git a/ext/json/tests/fail001.phpt b/ext/json/tests/fail001.phpt
index 47c2e65487..21dd42f8c3 100644
--- a/ext/json/tests/fail001.phpt
+++ b/ext/json/tests/fail001.phpt
@@ -164,4 +164,3 @@ AS OBJECT
NULL
AS ARRAY
NULL
-
diff --git a/ext/json/tests/json_last_error_error.phpt b/ext/json/tests/json_last_error_error.phpt
index 9b520ed9a7..e733b32854 100644
--- a/ext/json/tests/json_last_error_error.phpt
+++ b/ext/json/tests/json_last_error_error.phpt
@@ -18,4 +18,3 @@ NULL
Warning: json_last_error() expects exactly 0 parameters, 4 given in %s on line %d
NULL
-
diff --git a/ext/json/tests/json_last_error_msg_error.phpt b/ext/json/tests/json_last_error_msg_error.phpt
index 1a5f9d1bda..719e9fc50c 100644
--- a/ext/json/tests/json_last_error_msg_error.phpt
+++ b/ext/json/tests/json_last_error_msg_error.phpt
@@ -18,4 +18,3 @@ NULL
Warning: json_last_error_msg() expects exactly 0 parameters, 4 given in %s on line %d
NULL
-
diff --git a/ext/json/tests/serialize.phpt b/ext/json/tests/serialize.phpt
index 159c9f214f..1aa90750da 100644
--- a/ext/json/tests/serialize.phpt
+++ b/ext/json/tests/serialize.phpt
@@ -78,5 +78,3 @@ foreach(array('NonSerializingTest','SerializingTest','ValueSerializingTest','Sel
{"data":{"str":"foo","int":1,"float":2.3,"bool":false,"nil":null,"arr":[1,2,3],"obj":{}}}
{"data":["foo",1,2.3,false,null,[1,2,3],{}]}
{"data":{"str":"foo","int":1,"float":2.3,"bool":false,"nil":null,"arr":[1,2,3],"obj":{}}}
-
-