Skip to content

Commit f67dc49

Browse files
nikicnikic
committed
sockets test fixes
1 parent 73de76c commit f67dc49

12 files changed

+12
-91
lines changed

‎ext/sockets/tests/socket_connect_params.phpt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,19 @@ [email protected]
1414
$rand = rand(1,999);
1515
$s_c = socket_create_listen(31330+$rand);
1616
// wrong parameter count
17-
$s_w = socket_connect();
18-
$s_w = socket_connect($s_c);
17+
try {
18+
$s_w = socket_connect($s_c);
19+
} catch (TypeError $e) {
20+
echo $e->getMessage(), "\n";
21+
}
1922
$s_w = socket_connect($s_c, '0.0.0.0');
2023
$s_w = socket_connect($s_c, '0.0.0.0', 31330+$rand);
2124

2225
socket_close($s_c);
2326

2427
?>
2528
--EXPECTF--
26-
Warning: socket_connect() expects at least 2 parameters, 0 given in %s on line %d
27-
28-
Warning: socket_connect() expects at least 2 parameters, 1 given in %s on line %d
29+
socket_connect() expects at least 2 parameters, 1 given
2930

3031
Warning: socket_connect(): Socket of type AF_INET requires 3 arguments in %s on line %d
3132

‎ext/sockets/tests/socket_create_listen_used.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ [email protected]
1818
// default invocation
1919
$s_c_l2 = socket_create_listen(31330+$rand);
2020
var_dump($s_c_l2);
21-
socket_close($s_c_l2);
2221
socket_close($s_c_l);
2322
?>
2423
--EXPECTF--
2524
resource(%i) of type (Socket)
2625

2726
Warning: socket_create_listen(): unable to bind to given address [%i]: %a in %s on line %d
2827
bool(false)
29-
30-
Warning: socket_close() expects parameter 1 to be resource, bool given in %s on line %d

‎ext/sockets/tests/socket_create_pair-wrongparams.phpt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,15 @@ if (!extension_loaded('sockets')) {
1010
}
1111
--FILE--
1212
<?php
13-
var_dump(socket_create_pair(AF_INET, null, null));
14-
15-
$domain = 'unknown';
16-
var_dump(socket_create_pair($domain, SOCK_STREAM, 0, $sockets));
1713

1814
var_dump(socket_create_pair(AF_INET, null, null, $sockets));
1915

2016
var_dump(socket_create_pair(31337, null, null, $sockets));
2117

2218
var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
23-
--EXPECTF--
24-
Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
25-
NULL
26-
27-
Warning: socket_create_pair() expects parameter 1 to be int, string given in %s on line %d
28-
NULL
2919

20+
?>
21+
--EXPECTF--
3022
Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
3123
bool(false)
3224

‎ext/sockets/tests/socket_export_stream-2.phpt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ if (!extension_loaded('sockets')) {
88
--FILE--
99
<?php
1010

11-
var_dump(socket_export_stream());
12-
var_dump(socket_export_stream(1, 2));
13-
var_dump(socket_export_stream(1));
14-
var_dump(socket_export_stream(new stdclass));
1511
var_dump(socket_export_stream(fopen(__FILE__, "rb")));
1612
var_dump(socket_export_stream(stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND)));
1713
$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
@@ -21,19 +17,8 @@ var_dump(socket_export_stream($s));
2117

2218

2319
echo "Done.";
20+
?>
2421
--EXPECTF--
25-
Warning: socket_export_stream() expects exactly 1 parameter, 0 given in %s on line %d
26-
NULL
27-
28-
Warning: socket_export_stream() expects exactly 1 parameter, 2 given in %s on line %d
29-
NULL
30-
31-
Warning: socket_export_stream() expects parameter 1 to be resource, int given in %s on line %d
32-
NULL
33-
34-
Warning: socket_export_stream() expects parameter 1 to be resource, object given in %s on line %d
35-
NULL
36-
3722
Warning: socket_export_stream(): supplied resource is not a valid Socket resource in %s on line %d
3823
bool(false)
3924

‎ext/sockets/tests/socket_import_stream-2.phpt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,16 @@ if (!extension_loaded('sockets')) {
88
--FILE--
99
<?php
1010

11-
var_dump(socket_import_stream());
12-
var_dump(socket_import_stream(1, 2));
13-
var_dump(socket_import_stream(1));
14-
var_dump(socket_import_stream(new stdclass));
1511
var_dump(socket_import_stream(fopen(__FILE__, "rb")));
1612
var_dump(socket_import_stream(socket_create(AF_INET, SOCK_DGRAM, SOL_UDP)));
1713
$s = stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND);
1814
var_dump($s);
1915
var_dump(fclose($s));
2016
var_dump(socket_import_stream($s));
2117

22-
2318
echo "Done.";
19+
?>
2420
--EXPECTF--
25-
Warning: socket_import_stream() expects exactly 1 parameter, 0 given in %s on line %d
26-
NULL
27-
28-
Warning: socket_import_stream() expects exactly 1 parameter, 2 given in %s on line %d
29-
NULL
30-
31-
Warning: socket_import_stream() expects parameter 1 to be resource, int given in %s on line %d
32-
NULL
33-
34-
Warning: socket_import_stream() expects parameter 1 to be resource, object given in %s on line %d
35-
NULL
36-
3721
Warning: socket_import_stream(): cannot represent a stream of type STDIO as a Socket Descriptor in %s on line %d
3822
bool(false)
3923

‎ext/sockets/tests/socket_listen-wrongparams.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,9 @@ if (!extension_loaded('sockets')) {
1010
}
1111
--FILE--
1212
<?php
13-
var_dump(socket_listen(null));
1413
$socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
1514
var_dump(socket_listen($socket));
1615
--EXPECTF--
17-
Warning: socket_listen() expects parameter 1 to be resource, null given in %s on line %d
18-
NULL
19-
2016
Warning: socket_listen(): unable to listen on socket [%d]: Invalid argument in %s on line %d
2117
bool(false)
2218
--CREDITS--

‎ext/sockets/tests/socket_read_params.phpt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,9 @@ [email protected]
1212
--FILE--
1313
<?php
1414
$rand = rand(1,999);
15-
// wrong parameter count
16-
$s_c = socket_read();
17-
$s_c = socket_read(14);
1815
$s_c_l = socket_create_listen(31330+$rand);
1916
$s_c = socket_read($s_c_l, 25);
2017
socket_close($s_c_l);
2118
?>
2219
--EXPECTF--
23-
Warning: socket_read() expects at least 2 parameters, 0 given in %s on line %d
24-
25-
Warning: socket_read() expects at least 2 parameters, 1 given in %s on line %d
26-
2720
Warning: socket_read(): unable to read from socket [%i]: %a in %s on line %d

‎ext/sockets/tests/socket_select-wrongparams-2.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ $write = null;
1212
$except = null;
1313
$time = 0;
1414
var_dump(socket_select($sockets, $write, $except, $time));
15-
socket_select($sockets, $write, $except);
1615
--EXPECTF--
1716
Warning: socket_select(): no resource arrays were passed to select in %s on line %d
1817
bool(false)
19-
20-
Warning: socket_select() expects at least 4 parameters, 3 given in %s on line %d
2118
--CREDITS--
2219
Till Klampaeckel, [email protected]
2320
Berlin TestFest 2009

‎ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ if (!extension_loaded('sockets')) {
1616
}
1717

1818
$address = '127.0.0.1';
19-
socket_sendto($socket, '', 1, 0, $address); // cause warning
2019
if (!socket_bind($socket, $address, 1223)) {
2120
die("Unable to bind to $address:1223");
2221
}
@@ -34,8 +33,6 @@ if (!extension_loaded('sockets')) {
3433

3534
$from = "";
3635
$port = 0;
37-
socket_recvfrom($socket, $buf, 12, 0); // cause warning
38-
socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
3936
$bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
4037
if ($bytes_received == -1) {
4138
die('An error occurred while receiving from the socket');
@@ -45,13 +42,7 @@ if (!extension_loaded('sockets')) {
4542
echo "Received $buf from remote address $from and remote port $port" . PHP_EOL;
4643

4744
socket_close($socket);
48-
--EXPECTF--
49-
Warning: Wrong parameter count for socket_sendto() in %s on line %d
50-
bool(false)
51-
52-
Warning: socket_recvfrom() expects at least 5 parameters, 4 given in %s on line %d
53-
54-
Warning: Wrong parameter count for socket_recvfrom() in %s on line %d
45+
--EXPECT--
5546
Received Ping! from remote address 127.0.0.1 and remote port 1223
5647
--CREDITS--
5748
Falko Menge <mail at falko-menge dot de>

‎ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ require 'ipv6_skipif.inc';
2020
}
2121
var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); // false (EAGAIN, no warning)
2222
$address = '::1';
23-
socket_sendto($socket, '', 1, 0, $address); // cause warning
2423
if (!socket_bind($socket, $address, 1223)) {
2524
die("Unable to bind to $address:1223");
2625
}
@@ -36,8 +35,6 @@ require 'ipv6_skipif.inc';
3635

3736
$from = "";
3837
$port = 0;
39-
socket_recvfrom($socket, $buf, 12, 0); // cause warning
40-
socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
4138
$bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
4239
if ($bytes_received == -1) {
4340
die('An error occurred while receiving from the socket');
@@ -47,14 +44,7 @@ require 'ipv6_skipif.inc';
4744
echo "Received $buf from remote address $from and remote port $port" . PHP_EOL;
4845

4946
socket_close($socket);
50-
--EXPECTF--
51-
bool(false)
52-
53-
Warning: Wrong parameter count for socket_sendto() in %s on line %d
54-
55-
Warning: socket_recvfrom() expects at least 5 parameters, 4 given in %s on line %d
56-
57-
Warning: Wrong parameter count for socket_recvfrom() in %s on line %d
47+
--EXPECT--
5848
Received Ping! from remote address ::1 and remote port 1223
5949
--CREDITS--
6050
Falko Menge <mail at falko-menge dot de>

0 commit comments

Comments
 (0)