Convert fetch_resource warnings into TypeErrors

More type checks that are not part of zpp and should generate a
TypeError in PHP 8.

8 files changed, 120 insertions, 73 deletions

diff --git a/ext/sockets/tests/socket_export_stream-2.phpt b/ext/sockets/tests/socket_export_stream-2.phpt
index fb89bd28d7..e95945038a 100644
--- a/ext/sockets/tests/socket_export_stream-2.phpt
+++ b/ext/sockets/tests/socket_export_stream-2.phpt
@@ -8,24 +8,31 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 
-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)));
+try {
+    var_dump(socket_export_stream(fopen(__FILE__, "rb")));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump(socket_export_stream(stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND)));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 var_dump($s);
 socket_close($s);
-var_dump(socket_export_stream($s));
+try {
+    var_dump(socket_export_stream($s));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 
 echo "Done.";
 ?>
 --EXPECTF--
-Warning: socket_export_stream(): supplied resource is not a valid Socket resource in %s on line %d
-bool(false)
-
-Warning: socket_export_stream(): supplied resource is not a valid Socket resource in %s on line %d
-bool(false)
+socket_export_stream(): supplied resource is not a valid Socket resource
+socket_export_stream(): supplied resource is not a valid Socket resource
 resource(%d) of type (Socket)
-
-Warning: socket_export_stream(): supplied resource is not a valid Socket resource in %s on line %d
-bool(false)
+socket_export_stream(): supplied resource is not a valid Socket resource
 Done.
diff --git a/ext/sockets/tests/socket_export_stream-4-win.phpt b/ext/sockets/tests/socket_export_stream-4-win.phpt
index cd118c034a..260fbb24d5 100644
--- a/ext/sockets/tests/socket_export_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_export_stream-4-win.phpt
@@ -14,15 +14,27 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
 function test($stream, $sock) {
 	if ($stream !== null) {
 		echo "stream_set_blocking ";
-		print_r(stream_set_blocking($stream, 0));
+		try {
+			print_r(stream_set_blocking($stream, 0));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 	}
 	if ($sock !== null) {
 		echo "socket_set_block ";
-		print_r(socket_set_block($sock));
+		try {
+			print_r(socket_set_block($sock));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 		echo "socket_get_option ";
-		print_r(socket_get_option($sock, SOL_SOCKET, SO_TYPE));
+		try {
+			print_r(socket_get_option($sock, SOL_SOCKET, SO_TYPE));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 	}
 	echo "\n";
@@ -80,8 +92,7 @@ stream_set_blocking 1
 
 
 close stream
-stream_set_blocking 
-Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d
+stream_set_blocking stream_set_blocking(): supplied resource is not a valid stream resource
 
 socket_set_block 
 Warning: socket_set_block(): unable to set blocking mode [%d]: An operation was attempted on something that is not a socket.
@@ -94,14 +105,11 @@ Warning: socket_get_option(): unable to retrieve socket option [%d]: An operatio
 
 
 close socket
-stream_set_blocking 
-Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d
+stream_set_blocking stream_set_blocking(): supplied resource is not a valid stream resource
 
-socket_set_block 
-Warning: socket_set_block(): supplied resource is not a valid Socket resource in %s on line %d
+socket_set_block socket_set_block(): supplied resource is not a valid Socket resource
 
-socket_get_option 
-Warning: socket_get_option(): supplied resource is not a valid Socket resource in %s on line %d
+socket_get_option socket_get_option(): supplied resource is not a valid Socket resource
 
 
 Done.
diff --git a/ext/sockets/tests/socket_export_stream-4.phpt b/ext/sockets/tests/socket_export_stream-4.phpt
index ff329ec795..668ac648d3 100644
--- a/ext/sockets/tests/socket_export_stream-4.phpt
+++ b/ext/sockets/tests/socket_export_stream-4.phpt
@@ -14,15 +14,27 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) {
 function test($stream, $sock) {
 	if ($stream !== null) {
 		echo "stream_set_blocking ";
-		print_r(stream_set_blocking($stream, 0));
+		try {
+			print_r(stream_set_blocking($stream, 0));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 	}
 	if ($sock !== null) {
 		echo "socket_set_block ";
-		print_r(socket_set_block($sock));
+		try {
+            print_r(socket_set_block($sock));
+        } catch (TypeError $e) {
+            echo $e->getMessage(), "\n";
+        }
 		echo "\n";
 		echo "socket_get_option ";
-		print_r(socket_get_option($sock, SOL_SOCKET, SO_TYPE));
+		try {
+            print_r(socket_get_option($sock, SOL_SOCKET, SO_TYPE));
+        } catch (TypeError $e) {
+            echo $e->getMessage(), "\n";
+        }
 		echo "\n";
 	}
 	echo "\n";
@@ -80,8 +92,7 @@ stream_set_blocking 1
 
 
 close stream
-stream_set_blocking 
-Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d
+stream_set_blocking stream_set_blocking(): supplied resource is not a valid stream resource
 
 socket_set_block 
 Warning: socket_set_block(): unable to set blocking mode [%d]: %s in %s on line %d
@@ -92,14 +103,11 @@ Warning: socket_get_option(): unable to retrieve socket option [%d]: %s in %s on
 
 
 close socket
-stream_set_blocking 
-Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d
+stream_set_blocking stream_set_blocking(): supplied resource is not a valid stream resource
 
-socket_set_block 
-Warning: socket_set_block(): supplied resource is not a valid Socket resource in %s on line %d
+socket_set_block socket_set_block(): supplied resource is not a valid Socket resource
 
-socket_get_option 
-Warning: socket_get_option(): supplied resource is not a valid Socket resource in %s on line %d
+socket_get_option socket_get_option(): supplied resource is not a valid Socket resource
 
 
 Done.
diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt
index 8464b46039..19b3bf1029 100644
--- a/ext/sockets/tests/socket_import_stream-2.phpt
+++ b/ext/sockets/tests/socket_import_stream-2.phpt
@@ -9,23 +9,27 @@ if (!extension_loaded('sockets')) {
 <?php
 
 var_dump(socket_import_stream(fopen(__FILE__, "rb")));
-var_dump(socket_import_stream(socket_create(AF_INET, SOCK_DGRAM, SOL_UDP)));
+try {
+    var_dump(socket_import_stream(socket_create(AF_INET, SOCK_DGRAM, SOL_UDP)));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 $s = stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND);
 var_dump($s);
 var_dump(fclose($s));
-var_dump(socket_import_stream($s));
+try {
+    var_dump(socket_import_stream($s));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 echo "Done.";
 ?>
 --EXPECTF--
 Warning: socket_import_stream(): cannot represent a stream of type STDIO as a Socket Descriptor in %s on line %d
 bool(false)
-
-Warning: socket_import_stream(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+socket_import_stream(): supplied resource is not a valid stream resource
 resource(%d) of type (stream)
 bool(true)
-
-Warning: socket_import_stream(): supplied resource is not a valid stream resource in %s on line %d
-bool(false)
+socket_import_stream(): supplied resource is not a valid stream resource
 Done.
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt b/ext/sockets/tests/socket_import_stream-4-win.phpt
index a281cbcbce..35d8a99fc8 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -14,15 +14,27 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
 function test($stream, $sock) {
 	if ($stream !== null) {
 		echo "stream_set_blocking ";
-		print_r(stream_set_blocking($stream, 0));
+		try {
+			print_r(stream_set_blocking($stream, 0));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 	}
 	if ($sock !== null) {
 		echo "socket_set_block ";
-		print_r(socket_set_block($sock));
+		try {
+			print_r(socket_set_block($sock));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 		echo "socket_get_option ";
-		print_r(socket_get_option($sock, SOL_SOCKET, SO_TYPE));
+		try {
+			print_r(socket_get_option($sock, SOL_SOCKET, SO_TYPE));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 	}
 	echo "\n";
@@ -75,8 +87,7 @@ stream_set_blocking 1
 
 
 close stream
-stream_set_blocking 
-Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d
+stream_set_blocking stream_set_blocking(): supplied resource is not a valid stream resource
 
 socket_set_block 
 Warning: socket_set_block(): unable to set blocking mode [10038]: %s
@@ -89,14 +100,11 @@ Warning: socket_get_option(): unable to retrieve socket option [10038]: %s
 
 
 close socket
-stream_set_blocking 
-Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d
+stream_set_blocking stream_set_blocking(): supplied resource is not a valid stream resource
 
-socket_set_block 
-Warning: socket_set_block(): supplied resource is not a valid Socket resource in %s on line %d
+socket_set_block socket_set_block(): supplied resource is not a valid Socket resource
 
-socket_get_option 
-Warning: socket_get_option(): supplied resource is not a valid Socket resource in %s on line %d
+socket_get_option socket_get_option(): supplied resource is not a valid Socket resource
 
 
 Done.
diff --git a/ext/sockets/tests/socket_import_stream-4.phpt b/ext/sockets/tests/socket_import_stream-4.phpt
index f124161e10..5a528c6e33 100644
--- a/ext/sockets/tests/socket_import_stream-4.phpt
+++ b/ext/sockets/tests/socket_import_stream-4.phpt
@@ -14,15 +14,27 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) {
 function test($stream, $sock) {
 	if ($stream !== null) {
 		echo "stream_set_blocking ";
-		print_r(stream_set_blocking($stream, 0));
+		try {
+			print_r(stream_set_blocking($stream, 0));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 	}
 	if ($sock !== null) {
 		echo "socket_set_block ";
-		print_r(socket_set_block($sock));
+		try {
+			print_r(socket_set_block($sock));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 		echo "socket_get_option ";
-		print_r(socket_get_option($sock, SOL_SOCKET, SO_TYPE));
+		try {
+			print_r(socket_get_option($sock, SOL_SOCKET, SO_TYPE));
+		} catch (TypeError $e) {
+			echo $e->getMessage(), "\n";
+		}
 		echo "\n";
 	}
 	echo "\n";
@@ -75,8 +87,7 @@ stream_set_blocking 1
 
 
 close stream
-stream_set_blocking 
-Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d
+stream_set_blocking stream_set_blocking(): supplied resource is not a valid stream resource
 
 socket_set_block 
 Warning: socket_set_block(): unable to set blocking mode [%d]: %s in %s on line %d
@@ -87,14 +98,11 @@ Warning: socket_get_option(): unable to retrieve socket option [%d]: %s in %s on
 
 
 close socket
-stream_set_blocking 
-Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d
+stream_set_blocking stream_set_blocking(): supplied resource is not a valid stream resource
 
-socket_set_block 
-Warning: socket_set_block(): supplied resource is not a valid Socket resource in %s on line %d
+socket_set_block socket_set_block(): supplied resource is not a valid Socket resource
 
-socket_get_option 
-Warning: socket_get_option(): supplied resource is not a valid Socket resource in %s on line %d
+socket_get_option socket_get_option(): supplied resource is not a valid Socket resource
 
 
 Done.
diff --git a/ext/sockets/tests/socket_set_block-retval.phpt b/ext/sockets/tests/socket_set_block-retval.phpt
index 88e0029989..89dcc7ab4f 100644
--- a/ext/sockets/tests/socket_set_block-retval.phpt
+++ b/ext/sockets/tests/socket_set_block-retval.phpt
@@ -15,14 +15,16 @@ socket_close($socket);
 
 $socket2 = socket_create_listen(31340);
 socket_close($socket2);
-var_dump(socket_set_block($socket2));
+try {
+    var_dump(socket_set_block($socket2));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
-
-Warning: socket_set_block(): supplied resource is not a valid Socket resource in %s on line %d
-bool(false)
+socket_set_block(): supplied resource is not a valid Socket resource
 --CREDITS--
 Robin Mehner, robin@coding-robin.de
 PHP Testfest Berlin 2009-05-09
diff --git a/ext/sockets/tests/socket_set_nonblock-retval.phpt b/ext/sockets/tests/socket_set_nonblock-retval.phpt
index c9bb1150ab..fb0e593810 100644
--- a/ext/sockets/tests/socket_set_nonblock-retval.phpt
+++ b/ext/sockets/tests/socket_set_nonblock-retval.phpt
@@ -15,14 +15,16 @@ socket_close($socket);
 
 $socket2 = socket_create_listen(31340);
 socket_close($socket2);
-var_dump(socket_set_nonblock($socket2));
+try {
+    var_dump(socket_set_nonblock($socket2));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
-
-Warning: socket_set_nonblock(): supplied resource is not a valid Socket resource in %s on line %d
-bool(false)
+socket_set_nonblock(): supplied resource is not a valid Socket resource
 --CREDITS--
 Robin Mehner, robin@coding-robin.de
 PHP Testfest Berlin 2009-05-09