Make type error messages more consistent

Closes GH-5092

7 files changed, 13 insertions, 13 deletions

diff --git a/ext/imap/tests/imap_expunge_error.phpt b/ext/imap/tests/imap_expunge_error.phpt
index f1298843bb..3b6686a68d 100644
--- a/ext/imap/tests/imap_expunge_error.phpt
+++ b/ext/imap/tests/imap_expunge_error.phpt
@@ -22,6 +22,6 @@ Checking with no parameters
 Warning: imap_num_recent() expects exactly 1 parameter, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_num_recent() expects parameter 1 to be resource, string given in %s on line %d
+Warning: imap_num_recent() expects argument #1 to be of type resource, string given in %s on line %d
 
-Warning: imap_num_recent() expects parameter 1 to be resource, bool given in %s on line %d
+Warning: imap_num_recent() expects argument #1 to be of type resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt
index 9606c1ae2d..e3c05c6855 100644
--- a/ext/imap/tests/imap_gc_error.phpt
+++ b/ext/imap/tests/imap_gc_error.phpt
@@ -28,8 +28,8 @@ Checking with no parameters
 Warning: imap_gc() Expects exactly 2 parameters, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_gc() Expects parameter 1 to be resource, string given in %s on line %d
+Warning: imap_gc() expects argument #1 to be of type resource, string given in %s on line %d
 
-Warning: imap_gc() Expects parameter 1 to be resource, bool given in %s on line %d
+Warning: imap_gc() expects argument #1 to be of type resource, bool given in %s on line %d
 
 Warning: imap_gc(): Invalid value for the flags parameter in %s on line %d
diff --git a/ext/imap/tests/imap_headers.phpt b/ext/imap/tests/imap_headers.phpt
index cd9d6d387f..73c0c52306 100644
--- a/ext/imap/tests/imap_headers.phpt
+++ b/ext/imap/tests/imap_headers.phpt
@@ -22,6 +22,6 @@ Checking with no parameters
 Warning: imap_headers() expects exactly 1 parameter, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_headers() expects parameter 1 to be resource, string given in %s on line %d
+Warning: imap_headers() expects argument #1 to be of type resource, string given in %s on line %d
 
-Warning: imap_headers() expects parameter 1 to be resource, bool given in %s on line %d
+Warning: imap_headers() expects argument #1 to be of type resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_num_msg_error.phpt b/ext/imap/tests/imap_num_msg_error.phpt
index fffa3ae951..e6a5650e6d 100644
--- a/ext/imap/tests/imap_num_msg_error.phpt
+++ b/ext/imap/tests/imap_num_msg_error.phpt
@@ -22,6 +22,6 @@ Checking with no parameters
 Warning: imap_num_msg() expects exactly 1 parameter, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_num_msg() expects parameter 1 to be resource, string given in %s on line %d
+Warning: imap_num_msg() expects argument #1 to be of type resource, string given in %s on line %d
 
-Warning: imap_num_msg() expects parameter 1 to be resource, bool given in %s on line %d
+Warning: imap_num_msg() expects argument #1 to be of type resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_num_recent_error.phpt b/ext/imap/tests/imap_num_recent_error.phpt
index b0ad5cefa0..4f4fef5054 100644
--- a/ext/imap/tests/imap_num_recent_error.phpt
+++ b/ext/imap/tests/imap_num_recent_error.phpt
@@ -22,6 +22,6 @@ Checking with no parameters
 Warning: imap_expunge() expects exactly 1 parameter, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_expunge() expects parameter 1 to be resource, string given in %s on line %d
+Warning: imap_expunge() expects argument #1 to be of type resource, string given in %s on line %d
 
-Warning: imap_expunge() expects parameter 1 to be resource, bool given in %s on line %d
+Warning: imap_expunge() expects argument #1 to be of type resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_ping_error.phpt b/ext/imap/tests/imap_ping_error.phpt
index 5c2498c302..918407ac06 100644
--- a/ext/imap/tests/imap_ping_error.phpt
+++ b/ext/imap/tests/imap_ping_error.phpt
@@ -22,6 +22,6 @@ Checking with no parameters
 Warning: imap_ping() expects exactly 1 parameter, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_ping() expects parameter 1 to be resource, string given in %s on line %d
+Warning: imap_ping() expects argument #1 to be of type resource, string given in %s on line %d
 
-Warning: imap_ping() expects parameter 1 to be resource, bool given in %s on line %d
+Warning: imap_ping() expects argument #1 to be of type resource, bool given in %s on line %d
diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt
index a69b86b595..7b83309ef7 100644
--- a/ext/imap/tests/imap_timeout_basic.phpt
+++ b/ext/imap/tests/imap_timeout_basic.phpt
@@ -44,7 +44,7 @@ Checking with no parameters
 Warning: imap_timeout() expects at least 1 parameter, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_timeout() expects parameter 1 to be int, %s given in %s on line %d
+Warning: imap_timeout() expects argument #1 to be of type int, %s given in %s on line %d
 GET values:
 int(%d)
 int(%d)