diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:33:09 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:33:09 +0200 |
commit | d679f02295ea079338f029b7f5f4cb65b37f190c (patch) | |
tree | 53c519e1f829913a54d9dcea004721a3714cea26 /ext/sockets | |
parent | e84662c35cffaa95ead4322bfe9d61815c185722 (diff) | |
download | php-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/sockets')
40 files changed, 1 insertions, 47 deletions
diff --git a/ext/sockets/tests/mcast_ipv4_send.phpt b/ext/sockets/tests/mcast_ipv4_send.phpt index 0dd858f297..58395aed26 100644 --- a/ext/sockets/tests/mcast_ipv4_send.phpt +++ b/ext/sockets/tests/mcast_ipv4_send.phpt @@ -45,7 +45,6 @@ var_dump($r); $r = socket_get_option($s, $level, IP_MULTICAST_IF); var_dump($r); echo "\n"; - --EXPECT-- Setting IP_MULTICAST_TTL bool(true) diff --git a/ext/sockets/tests/mcast_ipv4_send_error.phpt b/ext/sockets/tests/mcast_ipv4_send_error.phpt index 5cd3d8e7d7..0929c79bdd 100644 --- a/ext/sockets/tests/mcast_ipv4_send_error.phpt +++ b/ext/sockets/tests/mcast_ipv4_send_error.phpt @@ -52,7 +52,6 @@ var_dump($r); $r = socket_get_option($s, $level, IP_MULTICAST_TTL); var_dump($r); echo "\n"; - --EXPECTF-- Setting IP_MULTICAST_LOOP with 256 bool(true) diff --git a/ext/sockets/tests/mcast_ipv6_recv.phpt b/ext/sockets/tests/mcast_ipv6_recv.phpt index 6ff97b60d5..83fc5064c7 100644 --- a/ext/sockets/tests/mcast_ipv6_recv.phpt +++ b/ext/sockets/tests/mcast_ipv6_recv.phpt @@ -43,7 +43,6 @@ $so = socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_SOURCE_GROUP, array( if ($so === false) { die('skip protocol independent multicast API is unavailable.'); } - --FILE-- <?php include __DIR__."/mcast_helpers.php.inc"; diff --git a/ext/sockets/tests/mcast_ipv6_recv_limited.phpt b/ext/sockets/tests/mcast_ipv6_recv_limited.phpt index 9fd5459950..e989e9b58c 100644 --- a/ext/sockets/tests/mcast_ipv6_recv_limited.phpt +++ b/ext/sockets/tests/mcast_ipv6_recv_limited.phpt @@ -38,7 +38,6 @@ if (defined("MCAST_JOIN_SOURCE_GROUP")) { die('skip protocol independent multicast API is available.'); } } - --FILE-- <?php include __DIR__."/mcast_helpers.php.inc"; diff --git a/ext/sockets/tests/mcast_ipv6_send.phpt b/ext/sockets/tests/mcast_ipv6_send.phpt index a9d6293fc9..99010d369e 100644 --- a/ext/sockets/tests/mcast_ipv6_send.phpt +++ b/ext/sockets/tests/mcast_ipv6_send.phpt @@ -49,7 +49,6 @@ var_dump($r); $r = socket_get_option($s, $level, IPV6_MULTICAST_IF); var_dump($r); echo "\n"; - --EXPECT-- Setting IPV6_MULTICAST_TTL bool(true) diff --git a/ext/sockets/tests/socket_bind.phpt b/ext/sockets/tests/socket_bind.phpt index 118361e42c..8417801c37 100644 --- a/ext/sockets/tests/socket_bind.phpt +++ b/ext/sockets/tests/socket_bind.phpt @@ -32,10 +32,8 @@ fa@php.net $s_close = socket_close($s_c); var_dump($s_close); ?> - --EXPECT-- bool(true) bool(true) int(16) NULL - diff --git a/ext/sockets/tests/socket_bind_params.phpt b/ext/sockets/tests/socket_bind_params.phpt index 29af2a2d45..23b8c58b0d 100644 --- a/ext/sockets/tests/socket_bind_params.phpt +++ b/ext/sockets/tests/socket_bind_params.phpt @@ -21,7 +21,6 @@ fa@php.net ?> --EXPECTF-- - Warning: socket_bind() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/sockets/tests/socket_close_params.phpt b/ext/sockets/tests/socket_close_params.phpt index 91cc85195e..c15059907b 100644 --- a/ext/sockets/tests/socket_close_params.phpt +++ b/ext/sockets/tests/socket_close_params.phpt @@ -16,6 +16,5 @@ fa@php.net var_dump($s_c); ?> --EXPECTF-- - Warning: socket_close() expects exactly 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/sockets/tests/socket_cmsg_credentials.phpt b/ext/sockets/tests/socket_cmsg_credentials.phpt index 6fa2517db2..09266e6cbd 100644 --- a/ext/sockets/tests/socket_cmsg_credentials.phpt +++ b/ext/sockets/tests/socket_cmsg_credentials.phpt @@ -18,7 +18,6 @@ die('skip SO_PASSCRED is not defined'); <?php $path = __DIR__ . "/unix_sock"; @unlink($path); - --FILE-- <?php include __DIR__."/mcast_helpers.php.inc"; @@ -57,7 +56,6 @@ print_r($data); $pid = getmypid(); var_dump($data['control'][0]['data']['pid'] === $pid); - --EXPECTF-- creating send socket resource(%d) of type (Socket) diff --git a/ext/sockets/tests/socket_cmsg_rights.phpt b/ext/sockets/tests/socket_cmsg_rights.phpt index e4d1f03b87..75ce0680b9 100644 --- a/ext/sockets/tests/socket_cmsg_rights.phpt +++ b/ext/sockets/tests/socket_cmsg_rights.phpt @@ -15,7 +15,6 @@ die('skip not for AIX'); <?php $path = __DIR__ . "/unix_sock"; @unlink($path); - --FILE-- <?php include __DIR__."/mcast_helpers.php.inc"; diff --git a/ext/sockets/tests/socket_connect_error.phpt b/ext/sockets/tests/socket_connect_error.phpt index 713791d849..675bc97d1c 100644 --- a/ext/sockets/tests/socket_connect_error.phpt +++ b/ext/sockets/tests/socket_connect_error.phpt @@ -30,4 +30,3 @@ Warning: socket_create() expects exactly 3 parameters, 0 given in %s on line %d Warning: socket_create() expects exactly 3 parameters, 2 given in %s on line %d Warning: socket_create() expects parameter 1 to be int, array given in %s on line %d - diff --git a/ext/sockets/tests/socket_connect_params.phpt b/ext/sockets/tests/socket_connect_params.phpt index e731672f57..94c38de1cb 100644 --- a/ext/sockets/tests/socket_connect_params.phpt +++ b/ext/sockets/tests/socket_connect_params.phpt @@ -23,7 +23,6 @@ fa@php.net ?> --EXPECTF-- - Warning: socket_connect() expects at least 2 parameters, 0 given in %s on line %d Warning: socket_connect() expects at least 2 parameters, 1 given in %s on line %d diff --git a/ext/sockets/tests/socket_create_listen-nobind.phpt b/ext/sockets/tests/socket_create_listen-nobind.phpt index 90ae26e073..bd7e5bfd43 100644 --- a/ext/sockets/tests/socket_create_listen-nobind.phpt +++ b/ext/sockets/tests/socket_create_listen-nobind.phpt @@ -22,4 +22,4 @@ Warning: socket_create_listen(): unable to bind to given address [13]: Permissio unlink(dirname(__FILE__) . '/006_root_check.tmp'); --CREDITS-- Till Klampaeckel, till@php.net -PHP Testfest Berlin 2009-05-09
\ No newline at end of file +PHP Testfest Berlin 2009-05-09 diff --git a/ext/sockets/tests/socket_create_params.phpt b/ext/sockets/tests/socket_create_params.phpt index f1f76fa4b9..2f121cdb53 100644 --- a/ext/sockets/tests/socket_create_params.phpt +++ b/ext/sockets/tests/socket_create_params.phpt @@ -16,7 +16,6 @@ fa@php.net $s_w = socket_create(AF_INET, SOCK_STREAM); ?> --EXPECTF-- - Warning: socket_create() expects exactly 3 parameters, 0 given in %s on line %d Warning: socket_create() expects exactly 3 parameters, 1 given in %s on line %d diff --git a/ext/sockets/tests/socket_export_stream-1.phpt b/ext/sockets/tests/socket_export_stream-1.phpt index 498e0a277c..f8f560b60b 100644 --- a/ext/sockets/tests/socket_export_stream-1.phpt +++ b/ext/sockets/tests/socket_export_stream-1.phpt @@ -5,7 +5,6 @@ socket_export_stream: Basic test if (!extension_loaded('sockets')) { die('SKIP sockets extension not available.'); } - --FILE-- <?php diff --git a/ext/sockets/tests/socket_export_stream-2.phpt b/ext/sockets/tests/socket_export_stream-2.phpt index c33fba3cc2..d3db5e36c8 100644 --- a/ext/sockets/tests/socket_export_stream-2.phpt +++ b/ext/sockets/tests/socket_export_stream-2.phpt @@ -5,7 +5,6 @@ socket_export_stream: Bad arguments if (!extension_loaded('sockets')) { die('SKIP sockets extension not available.'); } - --FILE-- <?php @@ -45,4 +44,3 @@ resource(%d) of type (Socket) Warning: socket_export_stream(): supplied resource is not a valid Socket resource in %s on line %d bool(false) Done. - diff --git a/ext/sockets/tests/socket_export_stream-3.phpt b/ext/sockets/tests/socket_export_stream-3.phpt index b13bb34739..b7233dc7b9 100644 --- a/ext/sockets/tests/socket_export_stream-3.phpt +++ b/ext/sockets/tests/socket_export_stream-3.phpt @@ -44,4 +44,3 @@ resource(%d) of type (Socket) int(10) string(10) "my message" Done. - diff --git a/ext/sockets/tests/socket_export_stream-4-win.phpt b/ext/sockets/tests/socket_export_stream-4-win.phpt index e38db7bd08..cd118c034a 100644 --- a/ext/sockets/tests/socket_export_stream-4-win.phpt +++ b/ext/sockets/tests/socket_export_stream-4-win.phpt @@ -8,7 +8,6 @@ if (!extension_loaded('sockets')) { if(substr(PHP_OS, 0, 3) != 'WIN' ) { die("skip Not Valid for Linux"); } - --FILE-- <?php diff --git a/ext/sockets/tests/socket_getpeername.phpt b/ext/sockets/tests/socket_getpeername.phpt index 34de42de80..dc00d44641 100644 --- a/ext/sockets/tests/socket_getpeername.phpt +++ b/ext/sockets/tests/socket_getpeername.phpt @@ -23,7 +23,6 @@ fa@php.net var_dump($port); socket_close($s_c); ?> - --EXPECTF-- bool(true) diff --git a/ext/sockets/tests/socket_getsockname.phpt b/ext/sockets/tests/socket_getsockname.phpt index f3f392130c..9039acc555 100644 --- a/ext/sockets/tests/socket_getsockname.phpt +++ b/ext/sockets/tests/socket_getsockname.phpt @@ -23,10 +23,8 @@ fa@php.net var_dump($port); socket_close($s_c); ?> - --EXPECTF-- bool(true) bool(true) string(7) "0.0.0.0" int(%i) - diff --git a/ext/sockets/tests/socket_import_stream-1.phpt b/ext/sockets/tests/socket_import_stream-1.phpt index 222fca5e2d..925966312d 100644 --- a/ext/sockets/tests/socket_import_stream-1.phpt +++ b/ext/sockets/tests/socket_import_stream-1.phpt @@ -5,7 +5,6 @@ socket_import_stream: Basic test if (!extension_loaded('sockets')) { die('SKIP sockets extension not available.'); } - --FILE-- <?php diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt index fd4c9e8e2d..e1fada608e 100644 --- a/ext/sockets/tests/socket_import_stream-2.phpt +++ b/ext/sockets/tests/socket_import_stream-2.phpt @@ -5,7 +5,6 @@ socket_import_stream: Bad arguments if (!extension_loaded('sockets')) { die('SKIP sockets extension not available.'); } - --FILE-- <?php @@ -46,4 +45,3 @@ bool(true) Warning: socket_import_stream(): supplied resource is not a valid stream resource in %s on line %d bool(false) Done. - diff --git a/ext/sockets/tests/socket_import_stream-3.phpt b/ext/sockets/tests/socket_import_stream-3.phpt index 2261a03ee4..53814d11cb 100644 --- a/ext/sockets/tests/socket_import_stream-3.phpt +++ b/ext/sockets/tests/socket_import_stream-3.phpt @@ -43,4 +43,3 @@ resource(%d) of type (Socket) int(10) string(10) "my message" Done. - diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt b/ext/sockets/tests/socket_import_stream-4-win.phpt index 1c9a7789c6..6c62a89fff 100644 --- a/ext/sockets/tests/socket_import_stream-4-win.phpt +++ b/ext/sockets/tests/socket_import_stream-4-win.phpt @@ -8,7 +8,6 @@ if (!extension_loaded('sockets')) { if(substr(PHP_OS, 0, 3) != 'WIN' ) { die("skip Not Valid for Linux"); } - --FILE-- <?php diff --git a/ext/sockets/tests/socket_listen_params.phpt b/ext/sockets/tests/socket_listen_params.phpt index 5e20999374..0d5922c240 100644 --- a/ext/sockets/tests/socket_listen_params.phpt +++ b/ext/sockets/tests/socket_listen_params.phpt @@ -16,6 +16,5 @@ fa@php.net var_dump($s_c); ?> --EXPECTF-- - Warning: socket_listen() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/sockets/tests/socket_read_params.phpt b/ext/sockets/tests/socket_read_params.phpt index 52dc1bebce..acf1d2f35d 100644 --- a/ext/sockets/tests/socket_read_params.phpt +++ b/ext/sockets/tests/socket_read_params.phpt @@ -20,7 +20,6 @@ fa@php.net socket_close($s_c_l); ?> --EXPECTF-- - Warning: socket_read() expects at least 2 parameters, 0 given in %s on line %d Warning: socket_read() expects at least 2 parameters, 1 given in %s on line %d diff --git a/ext/sockets/tests/socket_recvmsg.phpt b/ext/sockets/tests/socket_recvmsg.phpt index a2204112b3..4265e02535 100644 --- a/ext/sockets/tests/socket_recvmsg.phpt +++ b/ext/sockets/tests/socket_recvmsg.phpt @@ -47,7 +47,6 @@ $data = [ ]; if (!socket_recvmsg($s, $data, 0)) die("recvmsg"); print_r($data); - --EXPECTF-- creating send socket resource(%d) of type (Socket) diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt index fb9a311b17..5082e74f8f 100644 --- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt +++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt @@ -60,7 +60,6 @@ $data = [ ]; if (!socket_recvmsg($s, $data, 0)) die("recvmsg"); print_r($data); - --EXPECTF-- creating send socket resource(5) of type (Socket) diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt index 750b22dabf..70867e755a 100644 --- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt +++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt @@ -10,7 +10,6 @@ if (!defined('IPPROTO_IPV6')) * WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg * does not accept IPV6_TCLASS messages. We still test that sendmsg() works * corectly by sending an IPV6_PKTINFO message that will have no effect */ - --FILE-- <?php include __DIR__."/mcast_helpers.php.inc"; @@ -55,7 +54,6 @@ $data = [ ]; if (!socket_recvmsg($s, $data, 0)) die("recvmsg"); print_r($data); - --EXPECTF-- creating send socket resource(%d) of type (Socket) diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt index ced060e8a3..689421011e 100644 --- a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt +++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt @@ -46,7 +46,6 @@ if (!extension_loaded('sockets')) { socket_close($socket); --EXPECTF-- - Warning: Wrong parameter count for socket_sendto() in %s on line %d bool(false) diff --git a/ext/sockets/tests/socket_set_block-wrongparams.phpt b/ext/sockets/tests/socket_set_block-wrongparams.phpt index 7c80695525..80c7f164ec 100644 --- a/ext/sockets/tests/socket_set_block-wrongparams.phpt +++ b/ext/sockets/tests/socket_set_block-wrongparams.phpt @@ -15,4 +15,3 @@ Warning: socket_set_block() expects parameter 1 to be resource, array given in % --CREDITS-- Robin Mehner, robin@coding-robin.de PHP Testfest Berlin 2009-05-09 - diff --git a/ext/sockets/tests/socket_set_nonblock.phpt b/ext/sockets/tests/socket_set_nonblock.phpt index 55137d3582..29c9372ef8 100644 --- a/ext/sockets/tests/socket_set_nonblock.phpt +++ b/ext/sockets/tests/socket_set_nonblock.phpt @@ -18,7 +18,5 @@ fa@php.net #socket_accept($s_c_l); socket_close($s_c_l); ?> - --EXPECTF-- resource(%i) of type (Socket) - diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt index 05d718ce63..fe0afd7c51 100644 --- a/ext/sockets/tests/socket_set_option_bindtodevice.phpt +++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt @@ -30,7 +30,6 @@ var_dump($retval_2); socket_close($socket); ?> - --EXPECTF-- bool(true) diff --git a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt index c44f58e793..8ee5218cb0 100644 --- a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt +++ b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt @@ -31,7 +31,6 @@ var_dump(socket_set_option($s, IPPROTO_IPV6, IPV6_PKTINFO, [ //A work-around with is sort-of possible (with IPV6_2292PKTOPTIONS), //but not worth it //var_dump(socket_get_option($s, IPPROTO_IPV6, IPV6_PKTINFO)); - --EXPECTF-- Warning: socket_set_option(): error converting user data (path: in6_pktinfo): The key 'addr' is required in %s on line %d bool(false) diff --git a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt index 57d8656e87..a27d4075db 100644 --- a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt +++ b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt @@ -29,7 +29,6 @@ var_dump($retval_2); var_dump($retval_3 === $options); socket_close($socket); ?> - --EXPECTF-- Warning: socket_set_option(): no key "sec" passed in optval in %s on line %d bool(true) diff --git a/ext/sockets/tests/socket_set_option_seolinger.phpt b/ext/sockets/tests/socket_set_option_seolinger.phpt index 36606b4eed..4d171fc70a 100644 --- a/ext/sockets/tests/socket_set_option_seolinger.phpt +++ b/ext/sockets/tests/socket_set_option_seolinger.phpt @@ -36,7 +36,6 @@ var_dump((bool)$retval_3["l_onoff"] === (bool)$options["l_onoff"]); socket_close($socket); ?> - --EXPECTF-- Warning: socket_set_option(): no key "l_onoff" passed in optval in %s on line %d diff --git a/ext/sockets/tests/socket_set_option_sndtimeo.phpt b/ext/sockets/tests/socket_set_option_sndtimeo.phpt index 3be634341b..1b4fb5570d 100644 --- a/ext/sockets/tests/socket_set_option_sndtimeo.phpt +++ b/ext/sockets/tests/socket_set_option_sndtimeo.phpt @@ -29,7 +29,6 @@ var_dump($retval_2); var_dump($retval_3 === $options); socket_close($socket); ?> - --EXPECTF-- Warning: socket_set_option(): no key "sec" passed in optval in %s on line %d bool(true) diff --git a/ext/sockets/tests/socket_strerror.phpt b/ext/sockets/tests/socket_strerror.phpt index 033e37742d..aef56e5a84 100644 --- a/ext/sockets/tests/socket_strerror.phpt +++ b/ext/sockets/tests/socket_strerror.phpt @@ -20,7 +20,6 @@ fa@php.net } ?> --EXPECTF-- - Warning: socket_strerror() expects exactly 1 parameter, 0 given in %s on line %d string(7) "Success" string(23) "Operation not permitted" diff --git a/ext/sockets/tests/socket_write_params.phpt b/ext/sockets/tests/socket_write_params.phpt index 9991de53ed..5a1a5a89ff 100644 --- a/ext/sockets/tests/socket_write_params.phpt +++ b/ext/sockets/tests/socket_write_params.phpt @@ -20,7 +20,6 @@ fa@php.net socket_close($s_c); ?> --EXPECTF-- - Warning: socket_write() expects at least 2 parameters, 0 given in %s on line %d Warning: socket_write() expects at least 2 parameters, 1 given in %s on line %d diff --git a/ext/sockets/tests/wsaprotocol_info_0.phpt b/ext/sockets/tests/wsaprotocol_info_0.phpt index 19550d11e9..2750b32080 100644 --- a/ext/sockets/tests/wsaprotocol_info_0.phpt +++ b/ext/sockets/tests/wsaprotocol_info_0.phpt @@ -57,4 +57,3 @@ Warning: socket_wsaprotocol_info_export(): Unable to export WSA protocol info [0 in %s on line %d Warning: socket_wsaprotocol_info_import(): Unable to open file mapping [0x00000002] in %s on line %d - |