diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 12:51:01 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 12:51:01 +0200 |
commit | 03f3b8479b88688e45fd0879b755937fd01f593a (patch) | |
tree | 8cab94a81a619098de26c9a8a9f7060b4229710f /ext/intl | |
parent | ed64e1d59a546b63334d94f31304921f3d156609 (diff) | |
download | php-git-03f3b8479b88688e45fd0879b755937fd01f593a.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 'ext/intl')
-rw-r--r-- | ext/intl/common/common_date.cpp | 1 | ||||
-rw-r--r-- | ext/intl/common/common_date.h | 1 | ||||
-rw-r--r-- | ext/intl/dateformat/dateformat_attrcpp.cpp | 1 | ||||
-rw-r--r-- | ext/intl/dateformat/dateformat_attrcpp.h | 1 | ||||
-rw-r--r-- | ext/intl/dateformat/dateformat_format.c | 1 | ||||
-rw-r--r-- | ext/intl/dateformat/dateformat_helpers.h | 1 | ||||
-rw-r--r-- | ext/intl/dateformat/dateformat_parse.c | 1 | ||||
-rw-r--r-- | ext/intl/doc/Tutorial.txt | 1 | ||||
-rw-r--r-- | ext/intl/doc/grapheme_api.php | 2 | ||||
-rw-r--r-- | ext/intl/doc/normalizer_api.php | 2 | ||||
-rw-r--r-- | ext/intl/grapheme/grapheme_string.c | 1 | ||||
-rw-r--r-- | ext/intl/grapheme/grapheme_util.c | 1 | ||||
-rw-r--r-- | ext/intl/tests/resourcebundle.build | 2 | ||||
-rw-r--r-- | ext/intl/tests/resourcebundle.inc | 1 | ||||
-rw-r--r-- | ext/intl/uchar/uchar.c | 1 |
15 files changed, 1 insertions, 17 deletions
diff --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp index 26c198bc42..9210c36ebd 100644 --- a/ext/intl/common/common_date.cpp +++ b/ext/intl/common/common_date.cpp @@ -247,4 +247,3 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func) return rv; } - diff --git a/ext/intl/common/common_date.h b/ext/intl/common/common_date.h index d6b7c20719..6d15145516 100644 --- a/ext/intl/common/common_date.h +++ b/ext/intl/common/common_date.h @@ -37,4 +37,3 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz, U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func); #endif /* COMMON_DATE_H */ - diff --git a/ext/intl/dateformat/dateformat_attrcpp.cpp b/ext/intl/dateformat/dateformat_attrcpp.cpp index 858cbf5d4d..fec8eb1a67 100644 --- a/ext/intl/dateformat/dateformat_attrcpp.cpp +++ b/ext/intl/dateformat/dateformat_attrcpp.cpp @@ -245,4 +245,3 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar) RETURN_TRUE; } /* }}} */ - diff --git a/ext/intl/dateformat/dateformat_attrcpp.h b/ext/intl/dateformat/dateformat_attrcpp.h index c8e4e5b702..ab69914540 100644 --- a/ext/intl/dateformat/dateformat_attrcpp.h +++ b/ext/intl/dateformat/dateformat_attrcpp.h @@ -30,4 +30,3 @@ PHP_FUNCTION(datefmt_set_calendar); PHP_FUNCTION(datefmt_get_calendar_object); #endif /* DATEFORMAT_ATTRCPP_H */ - diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c index 2d1e78b512..5e51796cad 100644 --- a/ext/intl/dateformat/dateformat_format.c +++ b/ext/intl/dateformat/dateformat_format.c @@ -188,4 +188,3 @@ PHP_FUNCTION(datefmt_format) } /* }}} */ - diff --git a/ext/intl/dateformat/dateformat_helpers.h b/ext/intl/dateformat/dateformat_helpers.h index eb90c99169..a2a146b7d7 100644 --- a/ext/intl/dateformat/dateformat_helpers.h +++ b/ext/intl/dateformat/dateformat_helpers.h @@ -36,4 +36,3 @@ int datefmt_process_calendar_arg(zval* calendar_zv, bool& calendar_owned); #endif /* DATEFORMAT_HELPERS_H */ - diff --git a/ext/intl/dateformat/dateformat_parse.c b/ext/intl/dateformat/dateformat_parse.c index a8331777bb..52f885195b 100644 --- a/ext/intl/dateformat/dateformat_parse.c +++ b/ext/intl/dateformat/dateformat_parse.c @@ -208,4 +208,3 @@ PHP_FUNCTION(datefmt_localtime) } } /* }}} */ - diff --git a/ext/intl/doc/Tutorial.txt b/ext/intl/doc/Tutorial.txt index 316d81357c..b4feb2ae15 100644 --- a/ext/intl/doc/Tutorial.txt +++ b/ext/intl/doc/Tutorial.txt @@ -236,4 +236,3 @@ length and string comparison string comparison performance. NUMERIC_COLLATION - When turned on, this attribute generates a collation key for the numeric value of substrings of digits. This is a way to get '100' to sort AFTER '2'. - diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php index 91f4869166..75ad7a04b5 100644 --- a/ext/intl/doc/grapheme_api.php +++ b/ext/intl/doc/grapheme_api.php @@ -128,5 +128,3 @@ function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_COUNT, $start = 0, &$next) {} ?> - - diff --git a/ext/intl/doc/normalizer_api.php b/ext/intl/doc/normalizer_api.php index a9bb566e67..21b02a9109 100644 --- a/ext/intl/doc/normalizer_api.php +++ b/ext/intl/doc/normalizer_api.php @@ -88,5 +88,3 @@ class Normalizer { ?> - - diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 91d5741ea1..57bac1e1d1 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -908,4 +908,3 @@ PHP_FUNCTION(grapheme_extract) * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index d81060b5a1..3765ffe424 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -407,4 +407,3 @@ UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *stat * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/intl/tests/resourcebundle.build b/ext/intl/tests/resourcebundle.build index 560dc8fb45..273e4407b7 100644 --- a/ext/intl/tests/resourcebundle.build +++ b/ext/intl/tests/resourcebundle.build @@ -30,4 +30,4 @@ file_put_contents("$here/_files/res_index.txt", $res_index); passthru( ICU_DIR."genrb -s $here/_files/ -d $here/_files/resourcebundle res_index.txt"); -// passthru(ICU_DIR."icupkg -tl -a $here/rb.txt -s $here/_files -d $here/_files new $here/_files/resourcebundle.dat");
\ No newline at end of file +// passthru(ICU_DIR."icupkg -tl -a $here/rb.txt -s $here/_files -d $here/_files new $here/_files/resourcebundle.dat"); diff --git a/ext/intl/tests/resourcebundle.inc b/ext/intl/tests/resourcebundle.inc index 2ec138bb7d..a7727a3ec8 100644 --- a/ext/intl/tests/resourcebundle.inc +++ b/ext/intl/tests/resourcebundle.inc @@ -10,4 +10,3 @@ function debug( $res ) { } return $ret . sprintf( "%5d: %s\n", intl_get_error_code(), intl_get_error_message() ); } - diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index 1add74b2b5..d9f257dd68 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -778,4 +778,3 @@ int php_uchar_minit(INIT_FUNC_ARGS) { return SUCCESS; } - |