Skip to content

Commit e1feec6

Browse files
nikicnikic
committed
Update ext/sockets parameter names
1 parent d9dce83 commit e1feec6

9 files changed

+74
-83
lines changed

‎ext/sockets/sockets.stub.php

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ final class AddressInfo
1010
{
1111
}
1212

13-
function socket_select(?array &$read_fds, ?array &$write_fds, ?array &$except_fds, ?int $tv_sec, int $tv_usec = 0): int|false {}
13+
function socket_select(?array &$read, ?array &$write, ?array &$except, ?int $seconds, int $microseconds = 0): int|false {}
1414

1515
function socket_create_listen(int $port, int $backlog = 128): Socket|false {}
1616

@@ -24,65 +24,65 @@ function socket_listen(Socket $socket, int $backlog = 0): bool {}
2424

2525
function socket_close(Socket $socket): void {}
2626

27-
function socket_write(Socket $socket, string $buf, ?int $length = null): int|false {}
27+
function socket_write(Socket $socket, string $data, ?int $max_length = null): int|false {}
2828

29-
function socket_read(Socket $socket, int $length, int $type = PHP_BINARY_READ): string|false {}
29+
function socket_read(Socket $socket, int $length, int $mode = PHP_BINARY_READ): string|false {}
3030

3131
/**
32-
* @param string $addr
32+
* @param string $address
3333
* @param int $port
3434
*/
35-
function socket_getsockname(Socket $socket, &$addr, &$port = null): bool {}
35+
function socket_getsockname(Socket $socket, &$address, &$port = null): bool {}
3636

3737
/**
38-
* @param string $addr
38+
* @param string $address
3939
* @param int $port
4040
*/
41-
function socket_getpeername(Socket $socket, &$addr, &$port = null): bool {}
41+
function socket_getpeername(Socket $socket, &$address, &$port = null): bool {}
4242

4343
function socket_create(int $domain, int $type, int $protocol): Socket|false {}
4444

45-
function socket_connect(Socket $socket, string $addr, ?int $port = null): bool {}
45+
function socket_connect(Socket $socket, string $address, ?int $port = null): bool {}
4646

47-
function socket_strerror(int $errno): string {}
47+
function socket_strerror(int $error_code): string {}
4848

49-
function socket_bind(Socket $socket, string $addr, int $port = 0): bool {}
49+
function socket_bind(Socket $socket, string $address, int $port = 0): bool {}
5050

51-
/** @param string|null $buf */
52-
function socket_recv(Socket $socket, &$buf, int $len, int $flags): int|false {}
51+
/** @param string|null $data */
52+
function socket_recv(Socket $socket, &$data, int $length, int $flags): int|false {}
5353

54-
function socket_send(Socket $socket, string $buf, int $len, int $flags): int|false {}
54+
function socket_send(Socket $socket, string $data, int $length, int $flags): int|false {}
5555

5656
/**
57-
* @param string $buf
58-
* @param string $name
57+
* @param string $data
58+
* @param string $address
5959
* @param int $port
6060
*/
61-
function socket_recvfrom(Socket $socket, &$buf, int $len, int $flags, &$name, &$port = null): int|false {}
61+
function socket_recvfrom(Socket $socket, &$data, int $length, int $flags, &$address, &$port = null): int|false {}
6262

63-
function socket_sendto(Socket $socket, string $buf, int $len, int $flags, string $addr, ?int $port = null): int|false {}
63+
function socket_sendto(Socket $socket, string $data, int $length, int $flags, string $address, ?int $port = null): int|false {}
6464

65-
function socket_get_option(Socket $socket, int $level, int $optname): array|int|false {}
65+
function socket_get_option(Socket $socket, int $level, int $option): array|int|false {}
6666

6767
/** @alias socket_get_option */
68-
function socket_getopt(Socket $socket, int $level, int $optname): array|int|false {}
68+
function socket_getopt(Socket $socket, int $level, int $option): array|int|false {}
6969

70-
/** @param array|string|int $optval */
71-
function socket_set_option(Socket $socket, int $level, int $optname, $optval): bool {}
70+
/** @param array|string|int $value */
71+
function socket_set_option(Socket $socket, int $level, int $option, $value): bool {}
7272

7373
/**
74-
* @param array|string|int $optval
74+
* @param array|string|int $value
7575
* @alias socket_set_option
7676
*/
77-
function socket_setopt(Socket $socket, int $level, int $optname, $optval): bool {}
77+
function socket_setopt(Socket $socket, int $level, int $option, $value): bool {}
7878

7979
#ifdef HAVE_SOCKETPAIR
80-
/** @param array $fd */
81-
function socket_create_pair(int $domain, int $type, int $protocol, &$fd): ?bool {}
80+
/** @param array $pair */
81+
function socket_create_pair(int $domain, int $type, int $protocol, &$pair): ?bool {}
8282
#endif
8383

8484
#ifdef HAVE_SHUTDOWN
85-
function socket_shutdown(Socket $socket, int $how = 2): bool {}
85+
function socket_shutdown(Socket $socket, int $mode = 2): bool {}
8686
#endif
8787

8888
function socket_last_error(?Socket $socket = null): int {}
@@ -95,19 +95,19 @@ function socket_import_stream($stream): Socket|false {}
9595
/** @return resource|false */
9696
function socket_export_stream(Socket $socket) {}
9797

98-
function socket_sendmsg(Socket $socket, array $msghdr, int $flags = 0): int|false {}
98+
function socket_sendmsg(Socket $socket, array $message, int $flags = 0): int|false {}
9999

100-
function socket_recvmsg(Socket $socket, array &$msghdr, int $flags = 0): int|false {}
100+
function socket_recvmsg(Socket $socket, array &$message, int $flags = 0): int|false {}
101101

102-
function socket_cmsg_space(int $level, int $type, int $n = 0): ?int {}
102+
function socket_cmsg_space(int $level, int $type, int $num = 0): ?int {}
103103

104104
function socket_addrinfo_lookup(string $host, ?string $service = null, array $hints = []): array|false {}
105105

106-
function socket_addrinfo_connect(AddressInfo $addr): Socket|false {}
106+
function socket_addrinfo_connect(AddressInfo $address): Socket|false {}
107107

108-
function socket_addrinfo_bind(AddressInfo $addr): Socket|false {}
108+
function socket_addrinfo_bind(AddressInfo $address): Socket|false {}
109109

110-
function socket_addrinfo_explain(AddressInfo $addr): array {}
110+
function socket_addrinfo_explain(AddressInfo $address): array {}
111111

112112
#ifdef PHP_WIN32
113113
function socket_wsaprotocol_info_export(Socket $socket, int $target_pid): string|false {}

‎ext/sockets/sockets_arginfo.h

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: f35790f5f703b37c45230e97e8f0ee736727b4bd */
2+
* Stub hash: 35196eb31a98dd0b30761eed91f10a8b7e814f9e */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_select, 0, 4, MAY_BE_LONG|MAY_BE_FALSE)
5-
ZEND_ARG_TYPE_INFO(1, read_fds, IS_ARRAY, 1)
6-
ZEND_ARG_TYPE_INFO(1, write_fds, IS_ARRAY, 1)
7-
ZEND_ARG_TYPE_INFO(1, except_fds, IS_ARRAY, 1)
8-
ZEND_ARG_TYPE_INFO(0, tv_sec, IS_LONG, 1)
9-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, tv_usec, IS_LONG, 0, "0")
5+
ZEND_ARG_TYPE_INFO(1, read, IS_ARRAY, 1)
6+
ZEND_ARG_TYPE_INFO(1, write, IS_ARRAY, 1)
7+
ZEND_ARG_TYPE_INFO(1, except, IS_ARRAY, 1)
8+
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 1)
9+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, microseconds, IS_LONG, 0, "0")
1010
ZEND_END_ARG_INFO()
1111

1212
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_socket_create_listen, 0, 1, Socket, MAY_BE_FALSE)
@@ -35,19 +35,19 @@ ZEND_END_ARG_INFO()
3535

3636
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_write, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
3737
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
38-
ZEND_ARG_TYPE_INFO(0, buf, IS_STRING, 0)
39-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
38+
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
39+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 1, "null")
4040
ZEND_END_ARG_INFO()
4141

4242
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_read, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
4343
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
4444
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
45-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "PHP_BINARY_READ")
45+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_BINARY_READ")
4646
ZEND_END_ARG_INFO()
4747

4848
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_getsockname, 0, 2, _IS_BOOL, 0)
4949
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
50-
ZEND_ARG_INFO(1, addr)
50+
ZEND_ARG_INFO(1, address)
5151
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, port, "null")
5252
ZEND_END_ARG_INFO()
5353

@@ -61,65 +61,65 @@ ZEND_END_ARG_INFO()
6161

6262
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_connect, 0, 2, _IS_BOOL, 0)
6363
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
64-
ZEND_ARG_TYPE_INFO(0, addr, IS_STRING, 0)
64+
ZEND_ARG_TYPE_INFO(0, address, IS_STRING, 0)
6565
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 1, "null")
6666
ZEND_END_ARG_INFO()
6767

6868
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_strerror, 0, 1, IS_STRING, 0)
69-
ZEND_ARG_TYPE_INFO(0, errno, IS_LONG, 0)
69+
ZEND_ARG_TYPE_INFO(0, error_code, IS_LONG, 0)
7070
ZEND_END_ARG_INFO()
7171

7272
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_bind, 0, 2, _IS_BOOL, 0)
7373
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
74-
ZEND_ARG_TYPE_INFO(0, addr, IS_STRING, 0)
74+
ZEND_ARG_TYPE_INFO(0, address, IS_STRING, 0)
7575
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "0")
7676
ZEND_END_ARG_INFO()
7777

7878
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_recv, 0, 4, MAY_BE_LONG|MAY_BE_FALSE)
7979
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
80-
ZEND_ARG_INFO(1, buf)
81-
ZEND_ARG_TYPE_INFO(0, len, IS_LONG, 0)
80+
ZEND_ARG_INFO(1, data)
81+
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
8282
ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
8383
ZEND_END_ARG_INFO()
8484

8585
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_send, 0, 4, MAY_BE_LONG|MAY_BE_FALSE)
8686
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
87-
ZEND_ARG_TYPE_INFO(0, buf, IS_STRING, 0)
88-
ZEND_ARG_TYPE_INFO(0, len, IS_LONG, 0)
87+
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
88+
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
8989
ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
9090
ZEND_END_ARG_INFO()
9191

9292
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_recvfrom, 0, 5, MAY_BE_LONG|MAY_BE_FALSE)
9393
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
94-
ZEND_ARG_INFO(1, buf)
95-
ZEND_ARG_TYPE_INFO(0, len, IS_LONG, 0)
94+
ZEND_ARG_INFO(1, data)
95+
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
9696
ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
97-
ZEND_ARG_INFO(1, name)
97+
ZEND_ARG_INFO(1, address)
9898
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, port, "null")
9999
ZEND_END_ARG_INFO()
100100

101101
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_sendto, 0, 5, MAY_BE_LONG|MAY_BE_FALSE)
102102
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
103-
ZEND_ARG_TYPE_INFO(0, buf, IS_STRING, 0)
104-
ZEND_ARG_TYPE_INFO(0, len, IS_LONG, 0)
103+
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
104+
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
105105
ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
106-
ZEND_ARG_TYPE_INFO(0, addr, IS_STRING, 0)
106+
ZEND_ARG_TYPE_INFO(0, address, IS_STRING, 0)
107107
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 1, "null")
108108
ZEND_END_ARG_INFO()
109109

110110
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_get_option, 0, 3, MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_FALSE)
111111
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
112112
ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0)
113-
ZEND_ARG_TYPE_INFO(0, optname, IS_LONG, 0)
113+
ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
114114
ZEND_END_ARG_INFO()
115115

116116
#define arginfo_socket_getopt arginfo_socket_get_option
117117

118118
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_set_option, 0, 4, _IS_BOOL, 0)
119119
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
120120
ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0)
121-
ZEND_ARG_TYPE_INFO(0, optname, IS_LONG, 0)
122-
ZEND_ARG_INFO(0, optval)
121+
ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
122+
ZEND_ARG_INFO(0, value)
123123
ZEND_END_ARG_INFO()
124124

125125
#define arginfo_socket_setopt arginfo_socket_set_option
@@ -129,14 +129,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_create_pair, 0, 4, _IS_BO
129129
ZEND_ARG_TYPE_INFO(0, domain, IS_LONG, 0)
130130
ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
131131
ZEND_ARG_TYPE_INFO(0, protocol, IS_LONG, 0)
132-
ZEND_ARG_INFO(1, fd)
132+
ZEND_ARG_INFO(1, pair)
133133
ZEND_END_ARG_INFO()
134134
#endif
135135

136136
#if defined(HAVE_SHUTDOWN)
137137
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_shutdown, 0, 1, _IS_BOOL, 0)
138138
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
139-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, how, IS_LONG, 0, "2")
139+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "2")
140140
ZEND_END_ARG_INFO()
141141
#endif
142142

@@ -158,20 +158,20 @@ ZEND_END_ARG_INFO()
158158

159159
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_sendmsg, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
160160
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
161-
ZEND_ARG_TYPE_INFO(0, msghdr, IS_ARRAY, 0)
161+
ZEND_ARG_TYPE_INFO(0, message, IS_ARRAY, 0)
162162
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
163163
ZEND_END_ARG_INFO()
164164

165165
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_recvmsg, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
166166
ZEND_ARG_OBJ_INFO(0, socket, Socket, 0)
167-
ZEND_ARG_TYPE_INFO(1, msghdr, IS_ARRAY, 0)
167+
ZEND_ARG_TYPE_INFO(1, message, IS_ARRAY, 0)
168168
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
169169
ZEND_END_ARG_INFO()
170170

171171
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_cmsg_space, 0, 2, IS_LONG, 1)
172172
ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0)
173173
ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
174-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, n, IS_LONG, 0, "0")
174+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, num, IS_LONG, 0, "0")
175175
ZEND_END_ARG_INFO()
176176

177177
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_addrinfo_lookup, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
@@ -181,13 +181,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_addrinfo_lookup, 0, 1, MA
181181
ZEND_END_ARG_INFO()
182182

183183
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_socket_addrinfo_connect, 0, 1, Socket, MAY_BE_FALSE)
184-
ZEND_ARG_OBJ_INFO(0, addr, AddressInfo, 0)
184+
ZEND_ARG_OBJ_INFO(0, address, AddressInfo, 0)
185185
ZEND_END_ARG_INFO()
186186

187187
#define arginfo_socket_addrinfo_bind arginfo_socket_addrinfo_connect
188188

189189
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_addrinfo_explain, 0, 1, IS_ARRAY, 0)
190-
ZEND_ARG_OBJ_INFO(0, addr, AddressInfo, 0)
190+
ZEND_ARG_OBJ_INFO(0, address, AddressInfo, 0)
191191
ZEND_END_ARG_INFO()
192192

193193
#if defined(PHP_WIN32)

‎ext/sockets/tests/mcast_ipv4_send_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ bool(true)
7777
int(0)
7878

7979
Setting IP_MULTICAST_TTL with 256
80-
socket_set_option(): Argument #4 ($optval) must be between 0 and 255
80+
socket_set_option(): Argument #4 ($value) must be between 0 and 255
8181
int(1)
8282

8383
Setting IP_MULTICAST_TTL with "254"
8484
bool(true)
8585
int(254)
8686

8787
Setting IP_MULTICAST_TTL with -1
88-
socket_set_option(): Argument #4 ($optval) must be between 0 and 255
88+
socket_set_option(): Argument #4 ($value) must be between 0 and 255
8989
int(254)

‎ext/sockets/tests/socket_select_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ try {
1414
}
1515
?>
1616
--EXPECT--
17-
socket_select(): Argument #1 ($read_fds) must only have elements of type Socket, string given
17+
socket_select(): Argument #1 ($read) must only have elements of type Socket, string given

‎ext/sockets/tests/socket_send_params.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ext/sockets - socket_send - test with incorrect parameters
1717
socket_close($s_c);
1818
?>
1919
--EXPECT--
20-
socket_send(): Argument #3 ($len) must be greater than or equal to 0
20+
socket_send(): Argument #3 ($length) must be greater than or equal to 0

‎ext/sockets/tests/socket_sendto_params.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ext/sockets - socket_sendto - test with incorrect parameters
1717
socket_close($s_c);
1818
?>
1919
--EXPECT--
20-
socket_sendto(): Argument #3 ($len) must be greater than or equal to 0
20+
socket_sendto(): Argument #3 ($length) must be greater than or equal to 0

‎ext/sockets/tests/socket_set_option_rcvtimeo.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ var_dump($retval_3 === $options);
3434
socket_close($socket);
3535
?>
3636
--EXPECT--
37-
socket_set_option(): Argument #4 ($optval) must have key "sec"
37+
socket_set_option(): Argument #4 ($value) must have key "sec"
3838
bool(true)
3939
bool(true)
40-
--CREDITS--
41-
Moritz Neuhaeuser, info@xcompile.net
42-
PHP Testfest Berlin 2009-05-10

‎ext/sockets/tests/socket_set_option_seolinger.phpt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,8 @@ var_dump((bool)$retval_3["l_onoff"] === (bool)$options["l_onoff"]);
4545
socket_close($socket);
4646
?>
4747
--EXPECT--
48-
socket_set_option(): Argument #4 ($optval) must have key "l_onoff"
49-
socket_set_option(): Argument #4 ($optval) must have key "l_linger"
48+
socket_set_option(): Argument #4 ($value) must have key "l_onoff"
49+
socket_set_option(): Argument #4 ($value) must have key "l_linger"
5050
bool(true)
5151
bool(true)
5252
bool(true)
53-
--CREDITS--
54-
Moritz Neuhaeuser, info@xcompile.net
55-
PHP Testfest Berlin 2009-05-10

‎ext/sockets/tests/socket_set_option_sndtimeo.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ var_dump($retval_3 === $options);
3434
socket_close($socket);
3535
?>
3636
--EXPECT--
37-
socket_set_option(): Argument #4 ($optval) must have key "sec"
37+
socket_set_option(): Argument #4 ($value) must have key "sec"
3838
bool(true)
3939
bool(true)
40-
--CREDITS--
41-
Moritz Neuhaeuser, info@xcompile.net
42-
PHP Testfest Berlin 2009-05-10

0 commit comments

Comments
 (0)