summaryrefslogtreecommitdiff
path: root/ext/sysvshm
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-15 04:32:30 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-15 04:32:30 +0200
commitb746e6988743b46ccb0542d5d568eef0608ee296 (patch)
tree2f5248149fec900b613e165f7dd050da0011743e /ext/sysvshm
parent3599a2d82beff1ff3387a04c73fcdac9dd5336d4 (diff)
downloadphp-git-b746e6988743b46ccb0542d5d568eef0608ee296.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/sysvshm')
-rw-r--r--ext/sysvshm/tests/005.phpt1
-rw-r--r--ext/sysvshm/tests/006.phpt1
-rw-r--r--ext/sysvshm/tests/007.phpt2
-rw-r--r--ext/sysvshm/tests/shutdown_crash_0.phpt2
4 files changed, 0 insertions, 6 deletions
diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt
index 9a2fc895f6..0a3d3422e8 100644
--- a/ext/sysvshm/tests/005.phpt
+++ b/ext/sysvshm/tests/005.phpt
@@ -41,7 +41,6 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
-
Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d
NULL
diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt
index d5418f3f26..b38aee02a1 100644
--- a/ext/sysvshm/tests/006.phpt
+++ b/ext/sysvshm/tests/006.phpt
@@ -29,7 +29,6 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
-
Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d
NULL
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
index 86ac09d6c2..a165a8bfbf 100644
--- a/ext/sysvshm/tests/007.phpt
+++ b/ext/sysvshm/tests/007.phpt
@@ -24,7 +24,6 @@ var_dump(shm_remove($s));
echo "Done\n";
?>
--EXPECTF--
-
Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d
NULL
@@ -41,4 +40,3 @@ bool(true)
Warning: shm_remove(): supplied resource is not a valid sysvshm resource in %s007.php on line %d
bool(false)
Done
-
diff --git a/ext/sysvshm/tests/shutdown_crash_0.phpt b/ext/sysvshm/tests/shutdown_crash_0.phpt
index 8509316fa1..0f2a02dfb5 100644
--- a/ext/sysvshm/tests/shutdown_crash_0.phpt
+++ b/ext/sysvshm/tests/shutdown_crash_0.phpt
@@ -15,8 +15,6 @@ var_dump($s = shm_attach($key, 1024));
shm_remove($s);
var_dump($s = shm_attach($key, 1024));
shm_remove($s);
-
--EXPECTF--
resource(%d) of type (sysvshm)
resource(%d) of type (sysvshm)
-