14 files changed, 12 insertions, 107 deletions
diff --git a/ext/sockets/tests/socket_connect_params.phpt b/ext/sockets/tests/socket_connect_params.phpt
index 94c38de1cb..f1fdf55a81 100644
--- a/ext/sockets/tests/socket_connect_params.phpt
+++ b/ext/sockets/tests/socket_connect_params.phpt
@@ -14,8 +14,11 @@ fa@php.net
     $rand = rand(1,999);
     $s_c = socket_create_listen(31330+$rand);
     // wrong parameter count
-    $s_w = socket_connect();
-    $s_w = socket_connect($s_c);
+    try {
+        $s_w = socket_connect($s_c);
+    } catch (TypeError $e) {
+        echo $e->getMessage(), "\n";
+    }
     $s_w = socket_connect($s_c, '0.0.0.0');
     $s_w = socket_connect($s_c, '0.0.0.0', 31330+$rand);
 
@@ -23,9 +26,7 @@ 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
+socket_connect() expects at least 2 parameters, 1 given
 
 Warning: socket_connect(): Socket of type AF_INET requires 3 arguments in %s on line %d
 
diff --git a/ext/sockets/tests/socket_create_listen_used.phpt b/ext/sockets/tests/socket_create_listen_used.phpt
index b41e2caefc..2dfec4fbf7 100644
--- a/ext/sockets/tests/socket_create_listen_used.phpt
+++ b/ext/sockets/tests/socket_create_listen_used.phpt
@@ -18,7 +18,6 @@ fa@php.net
     // default invocation
     $s_c_l2 = socket_create_listen(31330+$rand);
     var_dump($s_c_l2);
-    socket_close($s_c_l2);
     socket_close($s_c_l);
 ?>
 --EXPECTF--
@@ -26,5 +25,3 @@ resource(%i) of type (Socket)
 
 Warning: socket_create_listen(): unable to bind to given address [%i]: %a in %s on line %d
 bool(false)
-
-Warning: socket_close() expects parameter 1 to be resource, bool given in %s on line %d
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
index 554819ac99..5cf054458a 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -10,10 +10,6 @@ if (!extension_loaded('sockets')) {
 }
 --FILE--
 <?php
-var_dump(socket_create_pair(AF_INET, null, null));
-
-$domain = 'unknown';
-var_dump(socket_create_pair($domain, SOCK_STREAM, 0, $sockets));
 
 var_dump(socket_create_pair(AF_INET, null, null, $sockets));
 
@@ -21,11 +17,6 @@ var_dump(socket_create_pair(31337, null, null, $sockets));
 
 var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
 --EXPECTF--
-Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
-NULL
-
-Warning: socket_create_pair() expects parameter 1 to be int, string given in %s on line %d
-NULL
 bool(true)
 
 Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 856d2cdc52..41154620ad 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -10,23 +10,15 @@ if (!extension_loaded('sockets')) {
 }
 --FILE--
 <?php
-var_dump(socket_create_pair(AF_INET, null, null));
-
-$domain = 'unknown';
-var_dump(socket_create_pair($domain, SOCK_STREAM, 0, $sockets));
 
 var_dump(socket_create_pair(AF_INET, null, null, $sockets));
 
 var_dump(socket_create_pair(31337, null, null, $sockets));
 
 var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
---EXPECTF--
-Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
-NULL
-
-Warning: socket_create_pair() expects parameter 1 to be int, string given in %s on line %d
-NULL
 
+?>
+--EXPECTF--
 Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
 bool(false)
 
diff --git a/ext/sockets/tests/socket_export_stream-2.phpt b/ext/sockets/tests/socket_export_stream-2.phpt
index d3db5e36c8..fb89bd28d7 100644
--- a/ext/sockets/tests/socket_export_stream-2.phpt
+++ b/ext/sockets/tests/socket_export_stream-2.phpt
@@ -8,10 +8,6 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 
-var_dump(socket_export_stream());
-var_dump(socket_export_stream(1, 2));
-var_dump(socket_export_stream(1));
-var_dump(socket_export_stream(new stdclass));
 var_dump(socket_export_stream(fopen(__FILE__, "rb")));
 var_dump(socket_export_stream(stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND)));
 $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
@@ -21,19 +17,8 @@ var_dump(socket_export_stream($s));
 
 
 echo "Done.";
+?>
 --EXPECTF--
-Warning: socket_export_stream() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: socket_export_stream() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: socket_export_stream() expects parameter 1 to be resource, int given in %s on line %d
-NULL
-
-Warning: socket_export_stream() expects parameter 1 to be resource, object given in %s on line %d
-NULL
-
 Warning: socket_export_stream(): supplied resource is not a valid Socket resource in %s on line %d
 bool(false)
 
diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt
index e1fada608e..8464b46039 100644
--- a/ext/sockets/tests/socket_import_stream-2.phpt
+++ b/ext/sockets/tests/socket_import_stream-2.phpt
@@ -8,10 +8,6 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 
-var_dump(socket_import_stream());
-var_dump(socket_import_stream(1, 2));
-var_dump(socket_import_stream(1));
-var_dump(socket_import_stream(new stdclass));
 var_dump(socket_import_stream(fopen(__FILE__, "rb")));
 var_dump(socket_import_stream(socket_create(AF_INET, SOCK_DGRAM, SOL_UDP)));
 $s = stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND);
@@ -19,21 +15,9 @@ var_dump($s);
 var_dump(fclose($s));
 var_dump(socket_import_stream($s));
 
-
 echo "Done.";
+?>
 --EXPECTF--
-Warning: socket_import_stream() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: socket_import_stream() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: socket_import_stream() expects parameter 1 to be resource, int given in %s on line %d
-NULL
-
-Warning: socket_import_stream() expects parameter 1 to be resource, object given in %s on line %d
-NULL
-
 Warning: socket_import_stream(): cannot represent a stream of type STDIO as a Socket Descriptor in %s on line %d
 bool(false)
 
diff --git a/ext/sockets/tests/socket_listen-wrongparams.phpt b/ext/sockets/tests/socket_listen-wrongparams.phpt
index 41d7ac1f10..b5715a5ff5 100644
--- a/ext/sockets/tests/socket_listen-wrongparams.phpt
+++ b/ext/sockets/tests/socket_listen-wrongparams.phpt
@@ -10,13 +10,9 @@ if (!extension_loaded('sockets')) {
 }
 --FILE--
 <?php
-var_dump(socket_listen(null));
 $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
 var_dump(socket_listen($socket));
 --EXPECTF--
-Warning: socket_listen() expects parameter 1 to be resource, null given in %s on line %d
-NULL
-
 Warning: socket_listen(): unable to listen on socket [%d]: Invalid argument in %s on line %d
 bool(false)
 --CREDITS--
diff --git a/ext/sockets/tests/socket_read_params.phpt b/ext/sockets/tests/socket_read_params.phpt
index acf1d2f35d..4d462ce3a7 100644
--- a/ext/sockets/tests/socket_read_params.phpt
+++ b/ext/sockets/tests/socket_read_params.phpt
@@ -12,16 +12,9 @@ fa@php.net
 --FILE--
 <?php
     $rand = rand(1,999);
-    // wrong parameter count
-    $s_c = socket_read();
-    $s_c = socket_read(14);
     $s_c_l = socket_create_listen(31330+$rand);
     $s_c = socket_read($s_c_l, 25);
     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
-
 Warning: socket_read(): unable to read from socket [%i]: %a in %s on line %d
diff --git a/ext/sockets/tests/socket_select-wrongparams-2.phpt b/ext/sockets/tests/socket_select-wrongparams-2.phpt
index c149973e70..a7c423df1b 100644
--- a/ext/sockets/tests/socket_select-wrongparams-2.phpt
+++ b/ext/sockets/tests/socket_select-wrongparams-2.phpt
@@ -12,12 +12,9 @@ $write   = null;
 $except  = null;
 $time    = 0;
 var_dump(socket_select($sockets, $write, $except, $time));
-socket_select($sockets, $write, $except);
 --EXPECTF--
 Warning: socket_select(): no resource arrays were passed to select in %s on line %d
 bool(false)
-
-Warning: socket_select() expects at least 4 parameters, 3 given in %s on line %d
 --CREDITS--
 Till Klampaeckel, till@php.net
 Berlin TestFest 2009
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
index 689421011e..0720b319b7 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
@@ -16,7 +16,6 @@ if (!extension_loaded('sockets')) {
     }
 
     $address = '127.0.0.1';
-    socket_sendto($socket, '', 1, 0, $address); // cause warning
     if (!socket_bind($socket, $address, 1223)) {
         die("Unable to bind to $address:1223");
     }
@@ -34,8 +33,6 @@ if (!extension_loaded('sockets')) {
 
     $from = "";
     $port = 0;
-    socket_recvfrom($socket, $buf, 12, 0); // cause warning
-    socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
     $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
     if ($bytes_received == -1) {
         die('An error occurred while receiving from the socket');
@@ -45,13 +42,8 @@ if (!extension_loaded('sockets')) {
     echo "Received $buf from remote address $from and remote port $port" . PHP_EOL;
 
     socket_close($socket);
---EXPECTF--
-Warning: Wrong parameter count for socket_sendto() in %s on line %d
+--EXPECT--
 bool(false)
-
-Warning: socket_recvfrom() expects at least 5 parameters, 4 given in %s on line %d
-
-Warning: Wrong parameter count for socket_recvfrom() in %s on line %d
 Received Ping! from remote address 127.0.0.1 and remote port 1223
 --CREDITS--
 Falko Menge <mail at falko-menge dot de>
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
index 8754028f84..fbc4da3861 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
@@ -20,7 +20,6 @@ require 'ipv6_skipif.inc';
     }
     socket_recvfrom($socket, $buf, 12, 0, $from, $port); // cause warning
     $address = '::1';
-    socket_sendto($socket, '', 1, 0, $address); // cause warning
     if (!socket_bind($socket, $address, 1223)) {
         die("Unable to bind to $address:1223");
     }
@@ -36,8 +35,6 @@ require 'ipv6_skipif.inc';
 
     $from = "";
     $port = 0;
-    socket_recvfrom($socket, $buf, 12, 0); // cause warning
-    socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
     $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
     if ($bytes_received == -1) {
         die('An error occurred while receiving from the socket');
@@ -50,12 +47,6 @@ require 'ipv6_skipif.inc';
 --EXPECTF--
 Warning: socket_recvfrom(): unable to recvfrom [10022]: %s
  in %s on line %d
-
-Warning: Wrong parameter count for socket_sendto() in %s on line %d
-
-Warning: socket_recvfrom() expects at least 5 parameters, 4 given in %s on line %d
-
-Warning: Wrong parameter count for socket_recvfrom() in %s on line %d
 Received Ping! from remote address ::1 and remote port 1223
 --CREDITS--
 Falko Menge <mail at falko-menge dot de>
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
index bd07904277..ef44109b81 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
@@ -20,7 +20,6 @@ require 'ipv6_skipif.inc';
     }
     var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); // false (EAGAIN, no warning)
     $address = '::1';
-    socket_sendto($socket, '', 1, 0, $address); // cause warning
     if (!socket_bind($socket, $address, 1223)) {
         die("Unable to bind to $address:1223");
     }
@@ -36,8 +35,6 @@ require 'ipv6_skipif.inc';
 
     $from = "";
     $port = 0;
-    socket_recvfrom($socket, $buf, 12, 0); // cause warning
-    socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
     $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
     if ($bytes_received == -1) {
         die('An error occurred while receiving from the socket');
@@ -47,14 +44,8 @@ require 'ipv6_skipif.inc';
     echo "Received $buf from remote address $from and remote port $port" . PHP_EOL;
 
     socket_close($socket);
---EXPECTF--
+--EXPECT--
 bool(false)
-
-Warning: Wrong parameter count for socket_sendto() in %s on line %d
-
-Warning: socket_recvfrom() expects at least 5 parameters, 4 given in %s on line %d
-
-Warning: Wrong parameter count for socket_recvfrom() in %s on line %d
 Received Ping! from remote address ::1 and remote port 1223
 --CREDITS--
 Falko Menge <mail at falko-menge dot de>
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
index e25bf4df1a..600cbea595 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
@@ -26,7 +26,6 @@ if (!extension_loaded('sockets')) {
 
     $msg = "Ping!";
     $len = strlen($msg);
-    $bytes_sent = socket_sendto($socket, $msg, $len, 0); // cause warning
     $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address);
     if ($bytes_sent == -1) {
 		@unlink($address);
@@ -54,8 +53,6 @@ if (!extension_loaded('sockets')) {
 --EXPECTF--
 Warning: socket_create(): Unable to create socket [%d]: Protocol not supported in %s on line %d
 bool(false)
-
-Warning: socket_sendto() expects at least 5 parameters, 4 given in %s on line %d
 bool(false)
 Received Ping!
 --CREDITS--
diff --git a/ext/sockets/tests/socket_strerror.phpt b/ext/sockets/tests/socket_strerror.phpt
index aef56e5a84..4f1237e890 100644
--- a/ext/sockets/tests/socket_strerror.phpt
+++ b/ext/sockets/tests/socket_strerror.phpt
@@ -14,13 +14,11 @@ fa@php.net
 ?>
 --FILE--
 <?php
-    $s_s = socket_strerror();
     for ($i=0;$i<=132;$i++) {
         var_dump(socket_strerror($i));
     }
 ?>
 --EXPECTF--
-Warning: socket_strerror() expects exactly 1 parameter, 0 given in %s on line %d
 string(7) "Success"
 string(23) "Operation not permitted"
 string(25) "No such file or directory"