streams: Indicate which argument fails the stream ZPP check

Author: Girgias

ext/bz2/tests/004.phpt

@@ -112,8 +112,8 @@ array(2) {
 }
 string(10) "DATA_ERROR"
 int(-4)
-bzread(): supplied resource is not a valid stream resource
-bzerror(): supplied resource is not a valid stream resource
-bzerrstr(): supplied resource is not a valid stream resource
-bzerrno(): supplied resource is not a valid stream resource
+bzread(): Argument #1 ($bz) must be an open stream resource
+bzerror(): Argument #1 ($bz) must be an open stream resource
+bzerrstr(): Argument #1 ($bz) must be an open stream resource
+bzerrno(): Argument #1 ($bz) must be an open stream resource
 Done

ext/sockets/tests/socket_export_stream-4-win.phpt

@@ -92,7 +92,7 @@ stream_set_blocking 1
 
 
 close stream
-stream_set_blocking TypeError: stream_set_blocking(): supplied resource is not a valid stream resource
+stream_set_blocking TypeError: stream_set_blocking(): Argument #1 ($stream) must be an open 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 in %s on line %d
@@ -103,7 +103,7 @@ Warning: socket_get_option(): Unable to retrieve socket option [%d]: An operatio
 
 
 close socket
-stream_set_blocking TypeError: stream_set_blocking(): supplied resource is not a valid stream resource
+stream_set_blocking TypeError: stream_set_blocking(): Argument #1 ($stream) must be an open stream resource
 
 socket_set_block Error: socket_set_block(): Argument #1 ($socket) has already been closed
 

ext/sockets/tests/socket_export_stream-4.phpt

@@ -94,7 +94,7 @@ stream_set_blocking 1
 
 
 close stream
-stream_set_blocking TypeError: stream_set_blocking(): supplied resource is not a valid stream resource
+stream_set_blocking TypeError: stream_set_blocking(): Argument #1 ($stream) must be an open stream resource
 
 socket_set_block 
 Warning: socket_set_block(): unable to set blocking mode [%d]: %s in %s on line %d
@@ -105,7 +105,7 @@ Warning: socket_get_option(): Unable to retrieve socket option [%d]: %s in %s on
 
 
 close socket
-stream_set_blocking TypeError: stream_set_blocking(): supplied resource is not a valid stream resource
+stream_set_blocking TypeError: stream_set_blocking(): Argument #1 ($stream) must be an open stream resource
 
 socket_set_block Error: socket_set_block(): Argument #1 ($socket) has already been closed
 

ext/sockets/tests/socket_import_stream-4-win.phpt

@@ -87,7 +87,7 @@ stream_set_blocking 1
 
 
 close stream
-stream_set_blocking TypeError: stream_set_blocking(): supplied resource is not a valid stream resource
+stream_set_blocking TypeError: stream_set_blocking(): Argument #1 ($stream) must be an open stream resource
 
 socket_set_block 
 Warning: socket_set_block(): unable to set blocking mode [10038]: %s in %ssocket_import_stream-4-win.php on line %d
@@ -98,7 +98,7 @@ Warning: socket_get_option(): Unable to retrieve socket option [10038]: %s in %s
 
 
 close socket
-stream_set_blocking TypeError: stream_set_blocking(): supplied resource is not a valid stream resource
+stream_set_blocking TypeError: stream_set_blocking(): Argument #1 ($stream) must be an open stream resource
 
 socket_set_block Error: socket_set_block(): Argument #1 ($socket) has already been closed
 

ext/sockets/tests/socket_import_stream-4.phpt

@@ -89,7 +89,7 @@ stream_set_blocking 1
 
 
 close stream
-stream_set_blocking TypeError: stream_set_blocking(): supplied resource is not a valid stream resource
+stream_set_blocking TypeError: stream_set_blocking(): Argument #1 ($stream) must be an open stream resource
 
 socket_set_block 
 Warning: socket_set_block(): unable to set blocking mode [%d]: %s in %s on line %d
@@ -100,7 +100,7 @@ Warning: socket_get_option(): Unable to retrieve socket option [%d]: %s in %s on
 
 
 close socket
-stream_set_blocking TypeError: stream_set_blocking(): supplied resource is not a valid stream resource
+stream_set_blocking TypeError: stream_set_blocking(): Argument #1 ($stream) must be an open stream resource
 
 socket_set_block Error: socket_set_block(): Argument #1 ($socket) has already been closed
 

ext/standard/tests/file/007_basic.phpt

@@ -102,170 +102,170 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'wb' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'wt' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'w+' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'w+b' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'w+t' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'r' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'rb' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'rt' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'r+' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'r+b' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'r+t' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'a' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'ab' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'at' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'a+' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'a+t' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'a+b' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 
 -- Iteration with mode 'x' --
 resource(%d) of type (stream)
 int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'xb' --
@@ -274,8 +274,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'xt' --
@@ -284,8 +284,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'x+' --
@@ -294,8 +294,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'x+b' --
@@ -304,8 +304,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 resource(%d) of type (Unknown)
 
 -- Iteration with mode 'x+t' --
@@ -314,8 +314,8 @@ int(0)
 bool(false)
 bool(true)
 resource(%d) of type (Unknown)
-ftell(): supplied resource is not a valid stream resource
-feof(): supplied resource is not a valid stream resource
+ftell(): Argument #1 ($stream) must be an open stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 resource(%d) of type (Unknown)
 
 *** Done ***

ext/standard/tests/file/fclose_variation1.phpt

@@ -15,6 +15,6 @@ try {
 echo "\nDone.\n";
 ?>
 --EXPECT--
-fread(): supplied resource is not a valid stream resource
+fread(): Argument #1 ($stream) must be an open stream resource
 
 Done.

ext/standard/tests/file/feof_basic.phpt

@@ -94,5 +94,5 @@ bool(false)
 *** testing feof after a seek passed the end ***
 bool(false)
 *** closing file, testing eof ***
-feof(): supplied resource is not a valid stream resource
+feof(): Argument #1 ($stream) must be an open stream resource
 Done

ext/standard/tests/file/fgetc_variation2.phpt

@@ -30,5 +30,5 @@ echo "Done";
 --EXPECT--
 *** Testing fgetc() : usage variations ***
 -- Testing fgetc() with closed handle --
-fgetc(): supplied resource is not a valid stream resource
+fgetc(): Argument #1 ($stream) must be an open stream resource
 Done

ext/standard/tests/file/fgets_variation2.phpt

@@ -35,6 +35,6 @@ echo "Done";
 --EXPECT--
 *** Testing fgets() : usage variations ***
 -- Testing fgets() with closed handle --
-fgets(): supplied resource is not a valid stream resource
-fgets(): supplied resource is not a valid stream resource
+fgets(): Argument #1 ($stream) must be an open stream resource
+fgets(): Argument #1 ($stream) must be an open stream resource
 Done

ext/standard/tests/file/flock.phpt

@@ -46,7 +46,7 @@ $file = __DIR__."/flock.dat";
 unlink($file);
 ?>
 --EXPECT--
-flock(): supplied resource is not a valid stream resource
+flock(): Argument #1 ($stream) must be an open stream resource
 bool(true)
 bool(true)
 bool(true)

ext/standard/tests/file/flock_error.phpt

@@ -70,4 +70,4 @@ flock(): Argument #2 ($operation) must be of type int, string given
 flock(): Argument #2 ($operation) must be of type int, string given
 --- Iteration 7 ---
 flock(): Argument #2 ($operation) must be of type int, string given
-flock(): supplied resource is not a valid stream resource
+flock(): Argument #1 ($stream) must be an open stream resource