diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 12:56:38 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 12:56:38 +0200 |
| commit | 1ad08256f349fa513157437abc4feb245cce03fc (patch) | |
| tree | a6bd8d17fa64b625757ac04b1436696c3e760f61 /Zend | |
| parent | f87f7bb8c7be413afd02548435112fa2c5030a4a (diff) | |
| download | php-git-1ad08256f349fa513157437abc4feb245cce03fc.tar.gz | |
Sync leading and final newlines in source code files
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.
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 'Zend')
| -rw-r--r-- | Zend/Makefile.am | 1 | ||||
| -rwxr-xr-x | Zend/buildconf | 1 | ||||
| -rw-r--r-- | Zend/tests/bug40236.inc | 2 | ||||
| -rw-r--r-- | Zend/tests/nowdoc.inc | 1 | ||||
| -rw-r--r-- | Zend/tests/return_types/classes.php.inc | 1 | ||||
| -rw-r--r-- | Zend/zend_highlight.c | 1 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.skl | 1 |
7 files changed, 1 insertions, 7 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am index dc62bf681c..537deb26f9 100644 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@ -53,4 +53,3 @@ depend: zend_execute.lo: $(srcdir)/zend_execute.c $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c - diff --git a/Zend/buildconf b/Zend/buildconf index fe8dee6f76..b2e0a2958c 100755 --- a/Zend/buildconf +++ b/Zend/buildconf @@ -30,4 +30,3 @@ if cmp configure.old configure > /dev/null 2>&1; then else echo "buildconf: created or modified ${1}configure" fi - diff --git a/Zend/tests/bug40236.inc b/Zend/tests/bug40236.inc index fc03349f7e..a8b97e691e 100644 --- a/Zend/tests/bug40236.inc +++ b/Zend/tests/bug40236.inc @@ -7,4 +7,4 @@ function func5() { } function func6() { } function func7() { } print ("ok\n"); -?>
\ No newline at end of file +?> diff --git a/Zend/tests/nowdoc.inc b/Zend/tests/nowdoc.inc index 98f9fbaacf..c903740e24 100644 --- a/Zend/tests/nowdoc.inc +++ b/Zend/tests/nowdoc.inc @@ -8,4 +8,3 @@ class d { public function __construct() { $this->d = 4; } }; $d = new d; ?> - diff --git a/Zend/tests/return_types/classes.php.inc b/Zend/tests/return_types/classes.php.inc index e4b691e353..34abd8490a 100644 --- a/Zend/tests/return_types/classes.php.inc +++ b/Zend/tests/return_types/classes.php.inc @@ -2,4 +2,3 @@ class A {} class B extends A {} - diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index fb489b6e7a..e3c6d0acac 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -238,4 +238,3 @@ ZEND_API void zend_strip(void) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index dfe25bce70..30f0017cbd 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -120,4 +120,3 @@ ZEND_API int zend_vm_kind(void) { return ZEND_VM_KIND; } - |