further changes

Author: devnexen

ext/sockets/sockets.c

@@ -2321,13 +2321,13 @@ PHP_FUNCTION(socket_set_option)
 
 			zval *socket = zend_read_property(socket_so_splice_ce, so_splice_obj, "socket", strlen("socket"), false, &tmpA);
 			if (Z_TYPE_P(socket) == IS_NULL) {
-					zend_argument_type_error(4, "invalid SocketSoSplice socket member value");
+					zend_argument_type_error(4, "socket cannot be null");
 					RETURN_THROWS();
 			}
 			zval *max = zend_read_property(socket_so_splice_ce, so_splice_obj, "max", strlen("max"), false, &tmpB);
 			zval *array = zend_read_property(socket_so_splice_ce, so_splice_obj, "time", strlen("time"), false, &tmpC);
 			if (Z_TYPE_P(array) == IS_NULL) {
-					zend_argument_type_error(4, "invalid SocketSoSplice time member value");
+					zend_argument_type_error(4, "time cannot be null");
 					RETURN_THROWS();
 			}
 

ext/sockets/tests/socket_set_option_so_splice.phpt

@@ -38,10 +38,64 @@ try {
 	echo $e->getMessage(), PHP_EOL;
 }
 
+
+try {
+	$s = new SocketSoSplice();
+	socket_set_option($socket, SOL_SOCKET, SO_SPLICE, $s);
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	$s = new SocketSoSplice();
+	$s->max = 1024;
+	$s->socket = $todrain;
+	$s->time = ["invalid" => 0, "usec" => 0];
+	socket_set_option($socket, SOL_SOCKET, SO_SPLICE, $s);
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	$s = new SocketSoSplice();
+	$s->max = 1024;
+	$s->socket = $todrain;
+	$s->time = ["sec" => 0, "nosec" => 0];
+	socket_set_option($socket, SOL_SOCKET, SO_SPLICE, $s);
+} catch (Error $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+socket_bind($todrain, '127.0.0.1', 0);
+socket_listen($todrain, 1);
+
+socket_getsockname($todrain, $addr, $port);
+socket_connect($socket, $addr, $port);
+$peer = socket_accept($todrain);
+
+$s1 = new SocketSoSplice();
+$s1->max = 5;
+$s1->socket = $todrain;
+$s1->time = ["sec" => 1, "usec" => 1];
+
+$s2 = new SocketSoSplice();
+$s2->max = 5;
+$s2->socket = $socket;
+$s2->time = ["sec" => 1, "usec" => 1];
+var_dump(socket_set_option($socket, SOL_SOCKET, SO_SPLICE, $s1));
+var_dump(socket_set_option($todrain, SOL_SOCKET, SO_SPLICE, $s2));
+socket_write($socket, "HELLO", 5);
+var_dump(socket_read($peer, 5, PHP_NORMAL_READ));
+
+socket_close($peer);
 socket_close($todrain);
 socket_close($socket);
+
 ?>
 --EXPECT--
 socket_set_option(): Argument #4 ($value) must be of type SocketSoSplice, Socket given
 socket_set_option(): Argument #4 ($value) must be of type SocketSoSplice, badClass given
 socket_set_option(): Argument #4 ($value) "max" key must be greater than or equal to 0
+Typed property SocketSoSplice::$socket must not be accessed before initialization
+socket_set_option(): Argument #4 ($value) time must have key "sec"
+socket_set_option(): Argument #4 ($value) time must have key "usec"