remove support for string|unicode in tests

4 files changed, 15 insertions, 15 deletions

diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt
index 3deb51a6a6..d0f17aebde 100644
--- a/ext/imap/tests/imap_binary_basic.phpt
+++ b/ext/imap/tests/imap_binary_basic.phpt
@@ -38,11 +38,11 @@ var_dump(bin2hex($base64));
 --EXPECTF--
 *** Testing imap_binary() : basic functionality ***
 Encode as short string
-%string|unicode%(136) "5647687063794270637942686269426c654746746347786c49484e30636d6c755a794230627942695a53426959584e6c49445930494756755932396b0d0a5a57513d0d0a"
+string(136) "5647687063794270637942686269426c654746746347786c49484e30636d6c755a794230627942695a53426959584e6c49445930494756755932396b0d0a5a57513d0d0a"
 Encode a string which results in more than 60 charters of output
-%string|unicode%(200) "56476870637942706379426849477876626d6367633352796157356e4948647064476767636d567a64577830637942706269427462334a6c4948526f0d0a595734674e6a416759326868636d466a64475679637942765a694276645852776458513d0d0a"
+string(200) "56476870637942706379426849477876626d6367633352796157356e4948647064476767636d567a64577830637942706269427462334a6c4948526f0d0a595734674e6a416759326868636d466a64475679637942765a694276645852776458513d0d0a"
 Encode a string with special characters
-%string|unicode%(60) "5879737450587464573130374f30422b497a3876506934384c413d3d0d0a"
+string(60) "5879737450587464573130374f30422b497a3876506934384c413d3d0d0a"
 Encode some hexadecimal data
-%string|unicode%(144) "65444177584867774d5678344d444a636544417a584867774e4678344d445663654441325848684751567834526b4a6365455a4458486847524678340d0a526b566365455a470d0a"
+string(144) "65444177584867774d5678344d444a636544417a584867774e4678344d445663654441325848684751567834526b4a6365455a4458486847524678340d0a526b566365455a470d0a"
 ===Done===
diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt
index bcccec6913..38fbccd7ec 100644
--- a/ext/imap/tests/imap_fetch_overview_variation1.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt
@@ -172,12 +172,12 @@ NULL
 Warning: imap_fetch_overview() expects parameter 1 to be resource, bool given in %s on line %d
 NULL
 
--- Testing with first argument value: %string|unicode%(0) ""
+-- Testing with first argument value: string(0) ""
 
 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) ""
+-- Testing with first argument value: string(0) ""
 
 Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d
 NULL
@@ -188,17 +188,17 @@ NULL
 Warning: imap_fetch_overview() expects parameter 1 to be resource, array given in %s on line %d
 NULL
 
--- Testing with first argument value: %string|unicode%(6) "string"
+-- Testing with first argument value: string(6) "string"
 
 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"
+-- Testing with first argument value: string(6) "string"
 
 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"
+-- Testing with first argument value: string(11) "hello world"
 
 Warning: imap_fetch_overview() expects parameter 1 to be resource, string given in %s on line %d
 NULL
diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt
index fbc0319fe8..a1b9d71b54 100644
--- a/ext/imap/tests/imap_fetch_overview_variation2.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt
@@ -192,10 +192,10 @@ udate is OK
 -- Testing with second argument value: bool(false)
 Sequence out of range
 
--- Testing with second argument value: %string|unicode%(0) ""
+-- Testing with second argument value: string(0) ""
 Sequence out of range
 
--- Testing with second argument value: %string|unicode%(0) ""
+-- Testing with second argument value: string(0) ""
 Sequence out of range
 
 -- Testing with second argument value: array(0) {
@@ -204,13 +204,13 @@ Sequence out of range
 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"
+-- Testing with second argument value: string(6) "string"
 Syntax error in sequence
 
--- Testing with second argument value: %string|unicode%(6) "string"
+-- Testing with second argument value: string(6) "string"
 Syntax error in sequence
 
--- Testing with second argument value: %string|unicode%(11) "hello world"
+-- Testing with second argument value: string(11) "hello world"
 Syntax error in sequence
 
 -- Testing with second argument value: object(classA)#1 (0) {
diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt
index 7bd78d899e..d33b44addb 100644
--- a/ext/imap/tests/imap_fetch_overview_variation3.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt
@@ -58,7 +58,7 @@ require_once(dirname(__FILE__).'/clean.inc');
 Create a temporary mailbox and add 1 msgs
 .. mailbox '{%s}%s' created
 
-Testing with option value:%string|unicode%(1) "1"
+Testing with option value:string(1) "1"
 imap_fetch_overview() returns an object
 
 Testing with option value:bool(true)