Remove more PHP 6 leftovers from tests

19 files changed, 79 insertions, 79 deletions

diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt
index 0eb4a2b838..640738b250 100644
--- a/ext/imap/tests/imap_body_basic.phpt
+++ b/ext/imap/tests/imap_body_basic.phpt
@@ -43,6 +43,6 @@ Create a new mailbox for test
 Create a temporary mailbox and add 1 msgs
 .. mailbox '%s' created
 Msg Count in new mailbox: 1
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 ===Done===
diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt
index 6867ad897a..4de03ddc52 100644
--- a/ext/imap/tests/imap_close_variation1.phpt
+++ b/ext/imap/tests/imap_close_variation1.phpt
@@ -169,12 +169,12 @@ NULL
 
 -- Iteration 16 --
 
-Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, string given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 17 --
 
-Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, string given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 18 --
@@ -184,17 +184,17 @@ NULL
 
 -- Iteration 19 --
 
-Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, string given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 20 --
 
-Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, string given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 21 --
 
-Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, string given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 22 --
diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt
index 97c298b7bd..f1d36d0abe 100644
--- a/ext/imap/tests/imap_close_variation2.phpt
+++ b/ext/imap/tests/imap_close_variation2.phpt
@@ -189,13 +189,13 @@ CL_EXPUNGE was not set, 3 msgs in mailbox
 
 -- Iteration 16 --
 
-Warning: imap_close() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_close() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 CL_EXPUNGE was not set, 3 msgs in mailbox
 
 -- Iteration 17 --
 
-Warning: imap_close() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_close() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 CL_EXPUNGE was not set, 3 msgs in mailbox
 
diff --git a/ext/imap/tests/imap_expunge_error.phpt b/ext/imap/tests/imap_expunge_error.phpt
index d99dcf0ff1..dc9cf5baa2 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, %unicode_string_optional% given in %s on line %d
+Warning: imap_num_recent() expects parameter 1 to be resource, string given in %s on line %d
 
 Warning: imap_num_recent() expects parameter 1 to be resource, boolean given in %s on line %d
diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt
index 6c7df6e762..437cdcfa8a 100644
--- a/ext/imap/tests/imap_fetch_overview_variation1.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt
@@ -174,12 +174,12 @@ NULL
 
 -- Testing with first argument value: %string|unicode%(0) ""
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Testing with first argument value: %string|unicode%(0) ""
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Testing with first argument value: array(0) {
@@ -190,17 +190,17 @@ NULL
 
 -- Testing with first argument value: %string|unicode%(6) "string"
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Testing with first argument value: %string|unicode%(6) "string"
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Testing with first argument value: %string|unicode%(11) "hello world"
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Testing with first argument value: object(classA)#1 (0) {
diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt
index 086885f6a5..fbc0319fe8 100644
--- a/ext/imap/tests/imap_fetch_overview_variation2.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt
@@ -201,7 +201,7 @@ Sequence out of range
 -- Testing with second argument value: array(0) {
 }
 
-Warning: imap_fetch_overview() expects parameter 2 to be %binary_string_optional%, array given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 2 to be string, array given in %s on line %d
 Sequence out of range
 
 -- Testing with second argument value: %string|unicode%(6) "string"
@@ -225,6 +225,6 @@ Syntax error in sequence
 
 -- Testing with second argument value: resource(%d) of type (stream)
 
-Warning: imap_fetch_overview() expects parameter 2 to be %binary_string_optional%, resource given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 2 to be string, resource given in %s on line %d
 Syntax error in sequence
 ===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt
index 66b84b165f..c821f2046e 100644
--- a/ext/imap/tests/imap_fetchbody_basic.phpt
+++ b/ext/imap/tests/imap_fetchbody_basic.phpt
@@ -68,14 +68,14 @@ Create a temporary mailbox and add 1 msgs
 
 -- All possible arguments --
 -- Option is FT_UID --
-%unicode|string%(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
+string(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
 -- Option is FT_PEEK --
-%unicode|string%(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
+string(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
 Seen Flag: int(%d)
 -- Option is FT_INTERNAL --
-%unicode|string%(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
+string(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
 
 -- Mandatory arguments --
-%unicode|string%(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
+string(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
 Seen Flag: int(%d)
 ===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt
index f566f9bf86..ac9087c3a2 100644
--- a/ext/imap/tests/imap_fetchbody_variation1.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation1.phpt
@@ -174,12 +174,12 @@ NULL
 
 -- Iteration 16 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, string given in %s on line 85
 NULL
 
 -- Iteration 17 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, string given in %s on line 85
 NULL
 
 -- Iteration 18 --
@@ -189,17 +189,17 @@ NULL
 
 -- Iteration 19 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, string given in %s on line 85
 NULL
 
 -- Iteration 20 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, string given in %s on line 85
 NULL
 
 -- Iteration 21 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, string given in %s on line 85
 NULL
 
 -- Iteration 22 --
diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt
index bc76c5d2ab..8565e233c9 100644
--- a/ext/imap/tests/imap_fetchbody_variation2.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation2.phpt
@@ -111,7 +111,7 @@ Warning: imap_fetchbody(): Bad message number in %s on line %d
 bool(false)
 
 -- Iteration 2 --
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 
 -- Iteration 3 --
 
@@ -159,7 +159,7 @@ Warning: imap_fetchbody(): Bad message number in %s on line %d
 bool(false)
 
 -- Iteration 12 --
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 
 -- Iteration 13 --
 
@@ -167,7 +167,7 @@ Warning: imap_fetchbody(): Bad message number in %s on line %d
 bool(false)
 
 -- Iteration 14 --
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 
 -- Iteration 15 --
 
@@ -176,12 +176,12 @@ bool(false)
 
 -- Iteration 16 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
@@ -191,17 +191,17 @@ NULL
 
 -- Iteration 19 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
diff --git a/ext/imap/tests/imap_fetchbody_variation3.phpt b/ext/imap/tests/imap_fetchbody_variation3.phpt
index dc1778e1e0..19656a1df3 100644
--- a/ext/imap/tests/imap_fetchbody_variation3.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation3.phpt
@@ -113,72 +113,72 @@ Subject: test1
 "
 
 -- Iteration 2 --
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 
 -- Iteration 3 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 4 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 5 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 6 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 7 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 8 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 9 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 10 --
-%unicode|string%(%d) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1
 
 1: this is a test message, please ignore%a"
 
 -- Iteration 11 --
-%unicode|string%(%d) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1
 
 1: this is a test message, please ignore%a"
 
 -- Iteration 12 --
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 
 -- Iteration 13 --
-%unicode|string%(%d) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1
 
 1: this is a test message, please ignore%a"
 
 -- Iteration 14 --
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 
 -- Iteration 15 --
-%unicode|string%(%d) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1
 
 1: this is a test message, please ignore%a"
 
 -- Iteration 16 --
-%unicode|string%(%d) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1
 
 1: this is a test message, please ignore%a"
 
 -- Iteration 17 --
-%unicode|string%(%d) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1
 
@@ -186,30 +186,30 @@ Subject: test1
 
 -- Iteration 18 --
 
-Warning: imap_fetchbody() expects parameter 3 to be %unicode_string_optional%, array given in %s on line 87
+Warning: imap_fetchbody() expects parameter 3 to be string, array given in %s on line 87
 NULL
 
 -- Iteration 19 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 20 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 21 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 22 --
-%unicode|string%(0) ""
+string(0) ""
 
 -- Iteration 23 --
-%unicode|string%(%d) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1
 
 1: this is a test message, please ignore%a"
 
 -- Iteration 24 --
-%unicode|string%(%d) "From: %s
+string(%d) "From: %s
 To: %s
 Subject: test1
 
diff --git a/ext/imap/tests/imap_fetchbody_variation6.phpt b/ext/imap/tests/imap_fetchbody_variation6.phpt
index 52a50a77d6..96f754b625 100644
--- a/ext/imap/tests/imap_fetchbody_variation6.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation6.phpt
@@ -61,10 +61,10 @@ bool(false)
 -- $msg_no is 1,3 --
 
 Notice: A non well formed numeric value encountered in %s on line %d
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 
 -- $msg_no is 1:3 --
 
 Notice: A non well formed numeric value encountered in %s on line %d
-%unicode|string%(%d) "1: this is a test message, please ignore%a"
+string(%d) "1: this is a test message, please ignore%a"
 ===DONE===
diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt
index aabdc2ef10..22d56b1bd3 100644
--- a/ext/imap/tests/imap_fetchheader_variation1.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation1.phpt
@@ -185,27 +185,27 @@ NULL
 
 -- Iteration 16 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt
index 7e7a3fc979..64ed2be319 100644
--- a/ext/imap/tests/imap_fetchheader_variation2.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation2.phpt
@@ -126,7 +126,7 @@ Warning: imap_fetchheader(): Bad message number in %s on line %d
 bool(false)
 
 -- Iteration 2 --
-%unicode|string%(%d) "From: foo@anywhere.com
+string(%d) "From: foo@anywhere.com
 Subject: Test msg 1
 To: %s
 MIME-Version: 1.0
@@ -180,7 +180,7 @@ Warning: imap_fetchheader(): Bad message number in %s on line %d
 bool(false)
 
 -- Iteration 12 --
-%unicode|string%(%d) "From: foo@anywhere.com
+string(%d) "From: foo@anywhere.com
 Subject: Test msg 1
 To: %s
 MIME-Version: 1.0
@@ -194,7 +194,7 @@ Warning: imap_fetchheader(): Bad message number in %s on line %d
 bool(false)
 
 -- Iteration 14 --
-%unicode|string%(%d) "From: foo@anywhere.com
+string(%d) "From: foo@anywhere.com
 Subject: Test msg 1
 To: %s
 MIME-Version: 1.0
@@ -209,27 +209,27 @@ bool(false)
 
 -- Iteration 16 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt
index ed2aa84dcc..0554ef0102 100644
--- a/ext/imap/tests/imap_fetchheader_variation5.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation5.phpt
@@ -62,7 +62,7 @@ bool(false)
 -- $msg_no is 1,3 --
 
 Notice: A non well formed numeric value encountered in %s on line %d
-%unicode|string%(%d) "From: foo@anywhere.com
+string(%d) "From: foo@anywhere.com
 Subject: Test msg 1
 To: %s
 MIME-Version: 1.0
@@ -73,7 +73,7 @@ Content-Type: MULTIPART/mixed; BOUNDARY="%s"
 -- $msg_no is 1:3 --
 
 Notice: A non well formed numeric value encountered in %s on line %d
-%unicode|string%(%d) "From: foo@anywhere.com
+string(%d) "From: foo@anywhere.com
 Subject: Test msg 1
 To: %s
 MIME-Version: 1.0
diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt
index f8e6201eba..8738b7dd82 100644
--- a/ext/imap/tests/imap_gc_error.phpt
+++ b/ext/imap/tests/imap_gc_error.phpt
@@ -28,7 +28,7 @@ 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, %unicode_string_optional% given in %s on line %d
+Warning: imap_gc() expects parameter 1 to be resource, string given in %s on line %d
 
 Warning: imap_gc() expects parameter 1 to be resource, boolean given in %s on line %d
 
diff --git a/ext/imap/tests/imap_headers.phpt b/ext/imap/tests/imap_headers.phpt
index 93c51f9a28..84fa66f627 100644
--- a/ext/imap/tests/imap_headers.phpt
+++ b/ext/imap/tests/imap_headers.phpt
@@ -22,7 +22,7 @@ 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, %unicode_string_optional% given in %s on line %d
+Warning: imap_headers() expects parameter 1 to be resource, string given in %s on line %d
 
 Warning: imap_headers() expects parameter 1 to be resource, boolean 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 6c4f50e021..5a2448a1cc 100644
--- a/ext/imap/tests/imap_num_msg_error.phpt
+++ b/ext/imap/tests/imap_num_msg_error.phpt
@@ -22,7 +22,7 @@ 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, %unicode_string_optional% given in %s on line %d
+Warning: imap_num_msg() expects parameter 1 to be resource, string given in %s on line %d
 
 Warning: imap_num_msg() expects parameter 1 to be resource, boolean 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 e723473b7e..238b307176 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, %unicode_string_optional% given in %s on line %d
+Warning: imap_expunge() expects parameter 1 to be resource, string given in %s on line %d
 
 Warning: imap_expunge() expects parameter 1 to be resource, boolean 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 7c87867bdc..d3d94d19b5 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, %unicode_string_optional% given in %s on line %d
+Warning: imap_ping() expects parameter 1 to be resource, string given in %s on line %d
 
 Warning: imap_ping() expects parameter 1 to be resource, boolean given in %s on line %d