diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:32:30 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:32:30 +0200 |
| commit | b746e6988743b46ccb0542d5d568eef0608ee296 (patch) | |
| tree | 2f5248149fec900b613e165f7dd050da0011743e /ext/ftp | |
| parent | 3599a2d82beff1ff3387a04c73fcdac9dd5336d4 (diff) | |
| download | php-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/ftp')
| -rw-r--r-- | ext/ftp/tests/006.phpt | 2 | ||||
| -rw-r--r-- | ext/ftp/tests/007.phpt | 2 | ||||
| -rw-r--r-- | ext/ftp/tests/ftp_alloc_basic1.phpt | 2 | ||||
| -rw-r--r-- | ext/ftp/tests/ftp_alloc_basic2.phpt | 2 | ||||
| -rw-r--r-- | ext/ftp/tests/ftp_exec_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/ftp/tests/ftp_rawlist_basic2.phpt | 2 | ||||
| -rw-r--r-- | ext/ftp/tests/ftp_rmdir_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/ftp/tests/ftp_ssl_connect_error.phpt | 1 |
8 files changed, 7 insertions, 8 deletions
diff --git a/ext/ftp/tests/006.phpt b/ext/ftp/tests/006.phpt index 6b76a7e0ae..ff0d258917 100644 --- a/ext/ftp/tests/006.phpt +++ b/ext/ftp/tests/006.phpt @@ -105,4 +105,4 @@ Warning: ftp_mlsd() expects exactly 2 parameters, 1 given in %s006.php on line 2 NULL Warning: ftp_append() expects at least 3 parameters, 1 given in %s006.php on line 27 -NULL
\ No newline at end of file +NULL diff --git a/ext/ftp/tests/007.phpt b/ext/ftp/tests/007.phpt index 6a6f0da940..eebe8cf1e3 100644 --- a/ext/ftp/tests/007.phpt +++ b/ext/ftp/tests/007.phpt @@ -145,4 +145,4 @@ Warning: ftp_set_option(): supplied resource is not a valid FTP Buffer resource bool(false) Warning: ftp_get_option(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/ftp/tests/ftp_alloc_basic1.phpt b/ext/ftp/tests/ftp_alloc_basic1.phpt index b2bdf7440d..c90f6e73fc 100644 --- a/ext/ftp/tests/ftp_alloc_basic1.phpt +++ b/ext/ftp/tests/ftp_alloc_basic1.phpt @@ -18,4 +18,4 @@ ftp_login($ftp, 'user', 'pass'); var_dump(ftp_alloc($ftp, 1024)); ?> --EXPECT-- -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/ftp/tests/ftp_alloc_basic2.phpt b/ext/ftp/tests/ftp_alloc_basic2.phpt index b9e4253fe8..41911e3396 100644 --- a/ext/ftp/tests/ftp_alloc_basic2.phpt +++ b/ext/ftp/tests/ftp_alloc_basic2.phpt @@ -20,4 +20,4 @@ var_dump($result); ?> --EXPECT-- bool(true) -string(20) "1024 bytes allocated"
\ No newline at end of file +string(20) "1024 bytes allocated" diff --git a/ext/ftp/tests/ftp_exec_basic.phpt b/ext/ftp/tests/ftp_exec_basic.phpt index 4a1f63e388..dbf7ce331f 100644 --- a/ext/ftp/tests/ftp_exec_basic.phpt +++ b/ext/ftp/tests/ftp_exec_basic.phpt @@ -18,4 +18,4 @@ if (!$ftp) die("Couldn't connect to the server"); var_dump(ftp_exec($ftp, 'ls -al')); ?> --EXPECT-- -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/ftp/tests/ftp_rawlist_basic2.phpt b/ext/ftp/tests/ftp_rawlist_basic2.phpt index 1d93643429..9ea9bd2865 100644 --- a/ext/ftp/tests/ftp_rawlist_basic2.phpt +++ b/ext/ftp/tests/ftp_rawlist_basic2.phpt @@ -18,4 +18,4 @@ if (!$ftp) die("Couldn't connect to the server"); var_dump(ftp_rawlist($ftp, 'no_exists/')); ?> --EXPECT-- -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/ftp/tests/ftp_rmdir_basic.phpt b/ext/ftp/tests/ftp_rmdir_basic.phpt index 6626cb4bed..84063db05f 100644 --- a/ext/ftp/tests/ftp_rmdir_basic.phpt +++ b/ext/ftp/tests/ftp_rmdir_basic.phpt @@ -18,4 +18,4 @@ ftp_login($ftp, 'user', 'pass'); var_dump(ftp_rmdir($ftp, 'www/')); ?> --EXPECT-- -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/ftp/tests/ftp_ssl_connect_error.phpt b/ext/ftp/tests/ftp_ssl_connect_error.phpt index f139696c7f..85fcf76f79 100644 --- a/ext/ftp/tests/ftp_ssl_connect_error.phpt +++ b/ext/ftp/tests/ftp_ssl_connect_error.phpt @@ -24,7 +24,6 @@ echo "\n-- Testing ftp_ssl_connect() function timeout warning for value 0 --\n"; ftp_ssl_connect('totes.invalid', 21, 0); echo "===DONE===\n"; - --EXPECTF-- *** Testing ftp_ssl_connect() function : error conditions *** |