Remove more PHP 6 leftovers from tests

294 files changed, 4208 insertions, 4208 deletions

diff --git a/Zend/tests/bug46811.phpt b/Zend/tests/bug46811.phpt
index e98f6e7720..fe41bffff6 100644
--- a/Zend/tests/bug46811.phpt
+++ b/Zend/tests/bug46811.phpt
@@ -9,5 +9,5 @@ var_dump(ini_get("arg_separator.output"));
 ?>
 --EXPECTF--
 bool(false)
-%unicode|string%(1) "&"
+string(1) "&"
 
diff --git a/Zend/tests/bug48533.phpt b/Zend/tests/bug48533.phpt
index 61a56d38ac..3b4777884e 100644
--- a/Zend/tests/bug48533.phpt
+++ b/Zend/tests/bug48533.phpt
@@ -31,11 +31,11 @@ $x::c();
 
 ?>
 --EXPECTF--
-%unicode|string%(9) "__call::a"
+string(9) "__call::a"
 int(2)
-%unicode|string%(9) "__call::c"
-%unicode|string%(15) "__callStatic::a"
+string(9) "__call::c"
+string(15) "__callStatic::a"
 
 Deprecated: Non-static method foo::b() should not be called statically in %s on line %d
 int(2)
-%unicode|string%(15) "__callStatic::c"
+string(15) "__callStatic::c"
diff --git a/Zend/tests/bug48770.phpt b/Zend/tests/bug48770.phpt
index 40fa84157b..067e892e66 100644
--- a/Zend/tests/bug48770.phpt
+++ b/Zend/tests/bug48770.phpt
@@ -50,4 +50,4 @@ $c->func('This should work!');
 
 ?>
 --EXPECTF--
-%unicode|string%(26) "A::func: This should work!"
+string(26) "A::func: This should work!"
diff --git a/Zend/tests/bug48770_2.phpt b/Zend/tests/bug48770_2.phpt
index dff54e1550..54ce92fa61 100644
--- a/Zend/tests/bug48770_2.phpt
+++ b/Zend/tests/bug48770_2.phpt
@@ -46,8 +46,8 @@ $c->func('This should work!');
 
 ?>
 --EXPECTF--
-%unicode|string%(27) "A::func2: This should work!"
-%unicode|string%(27) "A::func3: This should work!"
+string(27) "A::func2: This should work!"
+string(27) "A::func3: This should work!"
 
 Warning: call_user_func_array() expects parameter 1 to be a valid callback, cannot access private method A::func22() in %s on line %d
 
diff --git a/Zend/tests/bug48770_3.phpt b/Zend/tests/bug48770_3.phpt
index 68fe84314d..43311df533 100644
--- a/Zend/tests/bug48770_3.phpt
+++ b/Zend/tests/bug48770_3.phpt
@@ -45,7 +45,7 @@ $c->func('This should work!');
 
 ?>
 --EXPECTF--
-%unicode|string%(27) "B::func2: This should work!"
-%unicode|string%(27) "B::func3: This should work!"
+string(27) "B::func2: This should work!"
+string(27) "B::func3: This should work!"
 
 Warning: call_user_func_array() expects parameter 1 to be a valid callback, class 'B' does not have a method 'inexistent' in %s on line %d
diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/bug49908.phpt
index ea05f2b567..4f2b5b7cb2 100644
--- a/Zend/tests/bug49908.phpt
+++ b/Zend/tests/bug49908.phpt
@@ -17,8 +17,8 @@ new Foo;
 
 ?>
 --EXPECTF--
-%unicode|string%(3) "Foo"
-%unicode|string%(3) "Bar"
+string(3) "Foo"
+string(3) "Bar"
 
 Fatal error: Uncaught Exception: Bar in %s:%d
 Stack trace:
diff --git a/Zend/tests/call_user_func_002.phpt b/Zend/tests/call_user_func_002.phpt
index e79dd1a759..0bf3d39376 100644
--- a/Zend/tests/call_user_func_002.phpt
+++ b/Zend/tests/call_user_func_002.phpt
@@ -14,7 +14,7 @@ call_user_func(array($foo, ''));
 
 ?>
 --EXPECTF--
-%unicode|string%(3) "foo"
+string(3) "foo"
 
 Warning: call_user_func() expects parameter 1 to be a valid callback, class 'foo' not found in %s on line %d
 
diff --git a/Zend/tests/call_user_func_003.phpt b/Zend/tests/call_user_func_003.phpt
index d516584eb2..102433f557 100644
--- a/Zend/tests/call_user_func_003.phpt
+++ b/Zend/tests/call_user_func_003.phpt
@@ -20,11 +20,11 @@ var_dump(call_user_func(function() use (&$foo) { return $foo; }, '__invoke'));
 
 ?>
 --EXPECTF--
-%unicode|string%(3) "OK!"
+string(3) "OK!"
 object(Closure)#%d (1) {
-  [%u|b%"static"]=>
+  ["static"]=>
   array(1) {
-    [%u|b%"instance"]=>
+    ["instance"]=>
     object(Closure)#%d (0) {
     }
   }
diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt
index 529e590090..99e94cd9b2 100644
--- a/ext/curl/tests/curl_basic_009.phpt
+++ b/ext/curl/tests/curl_basic_009.phpt
@@ -19,5 +19,5 @@ curl_close($ch);
 
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%Srotocol%s"
+string(%d) "%Srotocol%s"
 int(1)
diff --git a/ext/curl/tests/curl_basic_010.phpt b/ext/curl/tests/curl_basic_010.phpt
index 72a591ff16..20bcc59be6 100644
--- a/ext/curl/tests/curl_basic_010.phpt
+++ b/ext/curl/tests/curl_basic_010.phpt
@@ -26,5 +26,5 @@ curl_close($ch);
 
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:)%r %s"
+string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:)%r %s"
 int(5)
diff --git a/ext/curl/tests/curl_basic_016.phpt b/ext/curl/tests/curl_basic_016.phpt
index b5890c0f6e..2bd1f05037 100644
--- a/ext/curl/tests/curl_basic_016.phpt
+++ b/ext/curl/tests/curl_basic_016.phpt
@@ -19,7 +19,7 @@ if ($curl_version['version_number'] > 0x071201) {
 ===DONE===
 --EXPECTF--
 array(2%d) {
-  [%u|b%"url"]=>
+  ["url"]=>
   string(0) ""
   ["content_type"]=>
   NULL
diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt
index 359421fc0a..5c085c1c93 100644
--- a/ext/curl/tests/curl_basic_018.phpt
+++ b/ext/curl/tests/curl_basic_018.phpt
@@ -66,7 +66,7 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
 ===DONE===
 --EXPECTF--
 *** Testing curl_exec() : basic functionality ***
-%unicode|string%(75) "Hello World!
+string(75) "Hello World!
 Hello World!Hello World!
 Hello World!Hello World!
 Hello World!"
diff --git a/ext/curl/tests/curl_basic_021.phpt b/ext/curl/tests/curl_basic_021.phpt
index d9f5a90bef..e803d98837 100644
--- a/ext/curl/tests/curl_basic_021.phpt
+++ b/ext/curl/tests/curl_basic_021.phpt
@@ -18,5 +18,5 @@ Jean-Marc Fontaine <jmf@durcommefaire.net>
 ?>
 ===DONE===
 --EXPECTF--
-%unicode|string%(24) "text/plain;charset=utf-8"
+string(24) "text/plain;charset=utf-8"
 ===DONE===
diff --git a/ext/curl/tests/curl_multi_getcontent_error3.phpt b/ext/curl/tests/curl_multi_getcontent_error3.phpt
index 2ad14804ba..2e1c7b2765 100644
--- a/ext/curl/tests/curl_multi_getcontent_error3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error3.phpt
@@ -49,5 +49,5 @@ if (!extension_loaded('curl')) print 'skip';
 
 ?>
 --EXPECTF--
-Warning: curl_multi_getcontent() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: curl_multi_getcontent() expects parameter 1 to be resource, string given in %s on line %d
 CURL2
diff --git a/ext/curl/tests/curl_setopt_error.phpt b/ext/curl/tests/curl_setopt_error.phpt
index dd7298342e..b9727c8a55 100644
--- a/ext/curl/tests/curl_setopt_error.phpt
+++ b/ext/curl/tests/curl_setopt_error.phpt
@@ -40,6 +40,6 @@ Warning: curl_setopt() expects exactly 3 parameters, 2 given in %s on line %d
 
 Warning: curl_setopt() expects parameter 1 to be resource, boolean given in %s on line %d
 
-Warning: curl_setopt() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: curl_setopt() expects parameter 2 to be integer, string given in %s on line %d
 
 Warning: curl_setopt(): Invalid curl configuration option in %scurl_setopt_error.php on line %d
diff --git a/ext/date/tests/009.phpt b/ext/date/tests/009.phpt
index 3697ed61f5..23c7668a9f 100644
--- a/ext/date/tests/009.phpt
+++ b/ext/date/tests/009.phpt
@@ -33,18 +33,18 @@ echo "Done\n";
 Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 bool(false)
-%unicode|string%(%d) "Tue Tuesday Jun June Tue Jun 27 00:00:00 2006 %s
+string(%d) "Tue Tuesday Jun June Tue Jun 27 00:00:00 2006 %s
 %s %"
-%unicode|string%(5) "%q %a"
-%unicode|string%(%d) "%s"
-%unicode|string%(4) "blah"
+string(5) "%q %a"
+string(%d) "%s"
+string(4) "blah"
 
 Warning: gmstrftime() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 bool(false)
-%unicode|string%(%d) "Mon Monday Jun June Mon Jun 26 21:00:00 2006 %s
+string(%d) "Mon Monday Jun June Mon Jun 26 21:00:00 2006 %s
 %s %"
-%unicode|string%(5) "%q %a"
-%unicode|string%(%d) "%s"
-%unicode|string%(4) "blah"
+string(5) "%q %a"
+string(%d) "%s"
+string(4) "blah"
 Done
diff --git a/ext/date/tests/bug46108.phpt b/ext/date/tests/bug46108.phpt
index 12fdfa7e5d..c423db3aa2 100644
--- a/ext/date/tests/bug46108.phpt
+++ b/ext/date/tests/bug46108.phpt
@@ -10,10 +10,10 @@ var_dump(unserialize(serialize(new Datetime)));
 ?>
 --EXPECTF--
 object(DateTime)#%d (3) {
-  [%u|b%"date"]=>
+  ["date"]=>
   %string|unicode%(%d) "%s"
-  [%u|b%"timezone_type"]=>
+  ["timezone_type"]=>
   int(%d)
-  [%u|b%"timezone"]=>
+  ["timezone"]=>
   %string|unicode%(%d) "America/Sao_Paulo"
 }
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
index ad104f1eef..c91071f364 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
@@ -17,4 +17,4 @@ $cdata->deleteData(1, 10);
 var_dump($cdata->data);
 ?>
 --EXPECTF--
-%unicode|string%(%d) "t"
\ No newline at end of file
+string(%d) "t"
\ No newline at end of file
diff --git a/ext/filter/tests/bug44779.phpt b/ext/filter/tests/bug44779.phpt
index 65a1e094ee..fb9dff1d46 100644
--- a/ext/filter/tests/bug44779.phpt
+++ b/ext/filter/tests/bug44779.phpt
@@ -7,4 +7,4 @@ Bug #44779 (filter returns NULL in CLI when it shouldn't)
 var_dump(filter_input(INPUT_SERVER, "PHP_SELF"));
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%s"
+string(%d) "%s"
diff --git a/ext/filter/tests/bug50158.phpt b/ext/filter/tests/bug50158.phpt
index 72c31a7205..d41dfd56c0 100644
--- a/ext/filter/tests/bug50158.phpt
+++ b/ext/filter/tests/bug50158.phpt
@@ -19,7 +19,7 @@ var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
 
 ?>
 --EXPECTF--
-%unicode|string%(21) "test=mail@example.com"
-%unicode|string%(21) "test-mail@example.com"
-%unicode|string%(21) "test+mail@example.com"
-%unicode|string%(21) "test?mail@example.com"
+string(21) "test=mail@example.com"
+string(21) "test-mail@example.com"
+string(21) "test+mail@example.com"
+string(21) "test?mail@example.com"
diff --git a/ext/gd/tests/imagefilter_error14.phpt b/ext/gd/tests/imagefilter_error14.phpt
index 9db5c60506..50359a29d0 100644
--- a/ext/gd/tests/imagefilter_error14.phpt
+++ b/ext/gd/tests/imagefilter_error14.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_COLORIZE, 'wrong parameter', 255, 255));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefilter_error16.phpt b/ext/gd/tests/imagefilter_error16.phpt
index 4ce425a479..c4ecc0b96a 100644
--- a/ext/gd/tests/imagefilter_error16.phpt
+++ b/ext/gd/tests/imagefilter_error16.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_CONTRAST, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefilter_error19.phpt b/ext/gd/tests/imagefilter_error19.phpt
index c79be0a17a..a225d6391f 100644
--- a/ext/gd/tests/imagefilter_error19.phpt
+++ b/ext/gd/tests/imagefilter_error19.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_BRIGHTNESS, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefilter_error2.phpt b/ext/gd/tests/imagefilter_error2.phpt
index 2523168af5..a9fefd377a 100644
--- a/ext/gd/tests/imagefilter_error2.phpt
+++ b/ext/gd/tests/imagefilter_error2.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 2 to be integer, string given in %s on line %d
 NULL
diff --git a/ext/gd/tests/imagefilter_error3.phpt b/ext/gd/tests/imagefilter_error3.phpt
index 4440f7d000..413183d4bb 100644
--- a/ext/gd/tests/imagefilter_error3.phpt
+++ b/ext/gd/tests/imagefilter_error3.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_PIXELATE, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefilter_error5.phpt b/ext/gd/tests/imagefilter_error5.phpt
index 443f12b32b..6ed6ae66b8 100644
--- a/ext/gd/tests/imagefilter_error5.phpt
+++ b/ext/gd/tests/imagefilter_error5.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_SMOOTH, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be float, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be float, string given in %s on line %d
 bool(false)
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
diff --git a/ext/ldap/tests/ldap_err2str_error.phpt b/ext/ldap/tests/ldap_err2str_error.phpt
index e6795271ea..c60bc52185 100644
--- a/ext/ldap/tests/ldap_err2str_error.phpt
+++ b/ext/ldap/tests/ldap_err2str_error.phpt
@@ -23,6 +23,6 @@ NULL
 Warning: ldap_err2str() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: ldap_err2str() expects parameter 1 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: ldap_err2str() expects parameter 1 to be integer, string given in %s on line %d
 NULL
 ===DONE===
diff --git a/ext/ldap/tests/ldap_get_entries_error.phpt b/ext/ldap/tests/ldap_get_entries_error.phpt
index b728dd2547..7e0f4c0b98 100644
--- a/ext/ldap/tests/ldap_get_entries_error.phpt
+++ b/ext/ldap/tests/ldap_get_entries_error.phpt
@@ -28,6 +28,6 @@ NULL
 Warning: ldap_get_entries() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: ldap_get_entries() expects parameter 2 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: ldap_get_entries() expects parameter 2 to be resource, string given in %s on line %d
 NULL
 ===DONE===
diff --git a/ext/ldap/tests/ldap_sort_error.phpt b/ext/ldap/tests/ldap_sort_error.phpt
index 26781638d1..c41b56ab51 100644
--- a/ext/ldap/tests/ldap_sort_error.phpt
+++ b/ext/ldap/tests/ldap_sort_error.phpt
@@ -35,7 +35,7 @@ bool(false)
 
 Deprecated: Function ldap_sort() is deprecated in %s.php on line %d
 
-Warning: ldap_sort() expects parameter 3 to be %binary_string_optional%, resource given in %s on line %d
+Warning: ldap_sort() expects parameter 3 to be string, resource given in %s on line %d
 bool(false)
 
 Deprecated: Function ldap_sort() is deprecated in %s.php on line %d
diff --git a/ext/ldap/tests/ldap_unbind_error.phpt b/ext/ldap/tests/ldap_unbind_error.phpt
index b0c0dab09c..85e586eb6f 100644
--- a/ext/ldap/tests/ldap_unbind_error.phpt
+++ b/ext/ldap/tests/ldap_unbind_error.phpt
@@ -33,7 +33,7 @@ bool(false)
 Warning: ldap_unbind() expects exactly 1 parameter, 2 given in %s on line %d
 bool(false)
 
-Warning: ldap_unbind() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: ldap_unbind() expects parameter 1 to be resource, string given in %s on line %d
 bool(false)
 bool(true)
 
diff --git a/ext/mbstring/tests/mb_ereg3.phpt b/ext/mbstring/tests/mb_ereg3.phpt
index abec3e7ad7..8dca4358fc 100644
--- a/ext/mbstring/tests/mb_ereg3.phpt
+++ b/ext/mbstring/tests/mb_ereg3.phpt
@@ -34,7 +34,7 @@ array(1) {
   string(2) "-1"
 }
 
-Warning: mbereg_search_init() expects parameter 3 to be %binary_string_optional%, array given in %s on line %d
+Warning: mbereg_search_init() expects parameter 3 to be string, array given in %s on line %d
 int(-1)
 int(-1)
 array(1) {
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index 522c99e800..aaece46faf 100644
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -78,8 +78,8 @@ array(11) {
   [8]=>
   NULL
   [9]=>
-  %unicode|string%(4) "foo1"
+  string(4) "foo1"
   [10]=>
-  %unicode|string%(4) "1000"
+  string(4) "1000"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index 9374763862..63d5b43cfc 100644
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -86,18 +86,18 @@ mysqli_close($link);
 --EXPECTF--
 array(7) {
   [0]=>
-  %unicode|string%(10) "2002-01-02"
+  string(10) "2002-01-02"
   [1]=>
-  %unicode|string%(8) "12:49:00"
+  string(8) "12:49:00"
   [2]=>
-  %unicode|string%(19) "2002-01-02 17:46:59"
+  string(19) "2002-01-02 17:46:59"
   [3]=>
   int(2010)
   [4]=>
-  %unicode|string%(19) "2010-07-10 00:00:00"
+  string(19) "2010-07-10 00:00:00"
   [5]=>
-  %unicode|string%(19) "0000-00-00 00:00:00"
+  string(19) "0000-00-00 00:00:00"
   [6]=>
-  %unicode|string%(19) "1999-12-29 00:00:00"
+  string(19) "1999-12-29 00:00:00"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 010d6e1960..4896a786a8 100644
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -64,26 +64,26 @@ mysqli_close($link);
 --EXPECTF--
 array(2) {
   [0]=>
-  %unicode|string%(10) "1234567890"
+  string(10) "1234567890"
   [1]=>
-  %unicode|string%(15) "this is a test0"
+  string(15) "this is a test0"
 }
 array(2) {
   [0]=>
-  %unicode|string%(10) "1234567891"
+  string(10) "1234567891"
   [1]=>
-  %unicode|string%(15) "this is a test1"
+  string(15) "this is a test1"
 }
 array(2) {
   [0]=>
-  %unicode|string%(10) "1234567892"
+  string(10) "1234567892"
   [1]=>
-  %unicode|string%(15) "this is a test2"
+  string(15) "this is a test2"
 }
 array(2) {
   [0]=>
-  %unicode|string%(10) "1234567893"
+  string(10) "1234567893"
   [1]=>
-  %unicode|string%(15) "this is a test3"
+  string(15) "this is a test3"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt
index 07292a1f3e..e433351e01 100644
--- a/ext/mysqli/tests/005.phpt
+++ b/ext/mysqli/tests/005.phpt
@@ -54,8 +54,8 @@ mysqli_close($link);
 --EXPECTF--
 array(2) {
   [0]=>
-  %unicode|string%(10) "1234567890"
+  string(10) "1234567890"
   [1]=>
-  %unicode|string%(13) "32K String ok"
+  string(13) "32K String ok"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt
index 30d42c39a6..e82ca65859 100644
--- a/ext/mysqli/tests/009.phpt
+++ b/ext/mysqli/tests/009.phpt
@@ -101,7 +101,7 @@ array(8) {
   [2]=>
   int(4)
   [3]=>
-  %unicode|string%(14) "33333333333333"
+  string(14) "33333333333333"
   [4]=>
   int(0)
   [5]=>
diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt
index b14516ff78..3b93b0a207 100644
--- a/ext/mysqli/tests/011.phpt
+++ b/ext/mysqli/tests/011.phpt
@@ -73,6 +73,6 @@ array(8) {
   [6]=>
   string(6) "foobar"
   [7]=>
-  %unicode|string%(11) "mysql rulez"
+  string(11) "mysql rulez"
 }
 done!
diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt
index 91abae4850..ebf8d76daf 100644
--- a/ext/mysqli/tests/012.phpt
+++ b/ext/mysqli/tests/012.phpt
@@ -72,6 +72,6 @@ array(8) {
   [6]=>
   string(3) "206"
   [7]=>
-  %unicode|string%(3) "6.7"
+  string(3) "6.7"
 }
 done!
diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt
index da6a0052cc..30044dc4fb 100644
--- a/ext/mysqli/tests/014.phpt
+++ b/ext/mysqli/tests/014.phpt
@@ -84,14 +84,14 @@ mysqli autocommit/commit/rollback
 Num_of_rows=1
 array(2) {
   [0]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [1]=>
-  %unicode|string%(6) "foobar"
+  string(6) "foobar"
 }
 array(2) {
   [0]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
   [1]=>
-  %unicode|string%(4) "egon"
+  string(4) "egon"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index c671ad68ff..227a142d6a 100644
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -81,14 +81,14 @@ mysqli autocommit/commit/rollback with innodb
 --EXPECTF--
 array(2) {
   [0]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [1]=>
-  %unicode|string%(6) "foobar"
+  string(6) "foobar"
 }
 array(2) {
   [0]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
   [1]=>
-  %unicode|string%(4) "egon"
+  string(4) "egon"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt
index 8e1ffe6200..143143c8f5 100644
--- a/ext/mysqli/tests/016.phpt
+++ b/ext/mysqli/tests/016.phpt
@@ -29,5 +29,5 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-%unicode|string%(6) "foobar"
+string(6) "foobar"
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt
index 082202f528..ee2713672d 100644
--- a/ext/mysqli/tests/017.phpt
+++ b/ext/mysqli/tests/017.phpt
@@ -36,8 +36,8 @@ array(3) {
   [0]=>
   string(32) "37b51d194a7513e45b56f6524f2d51f2"
   [1]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   [2]=>
-  %unicode|string%(3) "foo"
+  string(3) "foo"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index 5e6aac0f0b..3c5530c03a 100644
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -87,8 +87,8 @@ array(11) {
   [8]=>
   NULL
   [9]=>
-  %unicode|string%(3) "foo"
+  string(3) "foo"
   [10]=>
-  %unicode|string%(6) "foobar"
+  string(6) "foobar"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index 5ff58c0348..6076529959 100644
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -52,8 +52,8 @@ mysqli_close($link);
 --EXPECTF--
 array(2) {
   [0]=>
-  %unicode|string%(10) "1234567890"
+  string(10) "1234567890"
   [1]=>
-  %unicode|string%(14) "this is a test"
+  string(14) "this is a test"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index 9cb71c0ea1..81450d2845 100644
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -57,7 +57,7 @@ mysqli_close($link);
 --EXPECTF--
 array(2) {
   [0]=>
-  %unicode|string%(10) "1234567890"
+  string(10) "1234567890"
   [1]=>
   %s(13) "32K String ok"
 }
diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index 47d763a7c3..997dee6517 100644
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -58,8 +58,8 @@ mysqli_close($link);
 --EXPECTF--
 array(2) {
   [0]=>
-  %unicode|string%(10) "Hello Worl"
+  string(10) "Hello Worl"
   [1]=>
-  %unicode|string%(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence."
+  string(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence."
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt
index af453dde01..67e54d632c 100644
--- a/ext/mysqli/tests/028.phpt
+++ b/ext/mysqli/tests/028.phpt
@@ -20,5 +20,5 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt
index 9b8c720d3e..9360b4f3d4 100644
--- a/ext/mysqli/tests/031.phpt
+++ b/ext/mysqli/tests/031.phpt
@@ -25,6 +25,6 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-%unicode|string%(0) ""
-%unicode|string%(%d) "%s"
+string(0) ""
+string(%d) "%s"
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt
index 5fcd5484d2..d773defb26 100644
--- a/ext/mysqli/tests/032.phpt
+++ b/ext/mysqli/tests/032.phpt
@@ -38,5 +38,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test"))
 mysqli_close($link);
 ?>
 --EXPECTF--
-%unicode|string%(38) "Records: 3  Duplicates: 0  Warnings: 0"
+string(38) "Records: 3  Duplicates: 0  Warnings: 0"
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt
index b499bd71a6..7ed9ba7523 100644
--- a/ext/mysqli/tests/033.phpt
+++ b/ext/mysqli/tests/033.phpt
@@ -21,5 +21,5 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%s via %s"
+string(%d) "%s via %s"
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt
index 31f38f7651..2a324f7e40 100644
--- a/ext/mysqli/tests/042.phpt
+++ b/ext/mysqli/tests/042.phpt
@@ -61,19 +61,19 @@ mysqli_close($link);
 ?>
 --EXPECTF--
 object(stdClass)#%d (7) {
-  [%u|b%"c1"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"c2"]=>
-  %unicode|string%(5) "35999"
-  [%u|b%"c3"]=>
+  ["c1"]=>
+  string(1) "0"
+  ["c2"]=>
+  string(5) "35999"
+  ["c3"]=>
   NULL
-  [%u|b%"c4"]=>
-  %unicode|string%(4) "-500"
-  [%u|b%"c5"]=>
-  %unicode|string%(6) "-32768"
-  [%u|b%"c6"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"c7"]=>
-  %unicode|string%(1) "0"
+  ["c4"]=>
+  string(4) "-500"
+  ["c5"]=>
+  string(6) "-32768"
+  ["c6"]=>
+  string(1) "0"
+  ["c7"]=>
+  string(1) "0"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index 945483626e..5eff0b03bc 100644
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -41,8 +41,8 @@ mysqli_stmt_bind_result (SHOW)
 --EXPECTF--
 array(2) {
   [0]=>
-  %unicode|string%(4) "port"
+  string(4) "port"
   [1]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 done!
diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 178a1aeba8..064bb42bb3 100644
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -61,177 +61,177 @@ mysqli_close($link);
 array(2) {
   [0]=>
   object(stdClass)#5 (13) {
-    [%u|b%"name"]=>
-    %unicode|string%(3) "foo"
-    [%u|b%"orgname"]=>
-    %unicode|string%(3) "foo"
-    [%u|b%"table"]=>
-    %unicode|string%(13) "test_affected"
-    [%u|b%"orgtable"]=>
-    %unicode|string%(13) "test_affected"
-    [%u|b%"def"]=>
-    %unicode|string%(0) ""
-    [%u|b%"db"]=>
-    %unicode|string%(%d) "%s"
-    [%u|b%"catalog"]=>
-    %unicode|string%(%d) "%s"
-    [%u|b%"max_length"]=>
+    ["name"]=>
+    string(3) "foo"
+    ["orgname"]=>
+    string(3) "foo"
+    ["table"]=>
+    string(13) "test_affected"
+    ["orgtable"]=>
+    string(13) "test_affected"
+    ["def"]=>
+    string(0) ""
+    ["db"]=>
+    string(%d) "%s"
+    ["catalog"]=>
+    string(%d) "%s"
+    ["max_length"]=>
     int(0)
-    [%u|b%"length"]=>
+    ["length"]=>
     int(%d)
-    [%u|b%"charsetnr"]=>
+    ["charsetnr"]=>
     int(%d)
-    [%u|b%"flags"]=>
+    ["flags"]=>
     int(32768)
-    [%u|b%"type"]=>
+    ["type"]=>
     int(3)
-    [%u|b%"decimals"]=>
+    ["decimals"]=>
     int(0)
   }
   [1]=>
   object(stdClass)#6 (13) {
-    [%u|b%"name"]=>
-    %unicode|string%(3) "bar"
-    [%u|b%"orgname"]=>
-    %unicode|string%(3) "bar"
-    [%u|b%"table"]=>
-    %unicode|string%(13) "test_affected"
-    [%u|b%"orgtable"]=>
-    %unicode|string%(13) "test_affected"
-    [%u|b%"def"]=>
-    %unicode|string%(0) ""
-    [%u|b%"db"]=>
-    %unicode|string%(%d) "%s"
-    [%u|b%"catalog"]=>
-    %unicode|string%(%d) "%s"
-    [%u|b%"max_length"]=>
+    ["name"]=>
+    string(3) "bar"
+    ["orgname"]=>
+    string(3) "bar"
+    ["table"]=>
+    string(13) "test_affected"
+    ["orgtable"]=>
+    string(13) "test_affected"
+    ["def"]=>
+    string(0) ""
+    ["db"]=>
+    string(%d) "%s"
+    ["catalog"]=>
+    string(%d) "%s"
+    ["max_length"]=>
     int(0)
-    [%u|b%"length"]=>
+    ["length"]=>
     int(%d)
-    [%u|b%"charsetnr"]=>
+    ["charsetnr"]=>
     int(%d)
-    [%u|b%"flags"]=>
+    ["flags"]=>
     int(0)
-    [%u|b%"type"]=>
+    ["type"]=>
     int(253)
-    [%u|b%"decimals"]=>
+    ["decimals"]=>
     int(0)
   }
 }
 
 === fetch_field_direct ===
 object(stdClass)#6 (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(3) "foo"
-  [%u|b%"orgname"]=>
-  %unicode|string%(3) "foo"
-  [%u|b%"table"]=>
-  %unicode|string%(13) "test_affected"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(13) "test_affected"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(3) "foo"
+  ["orgname"]=>
+  string(3) "foo"
+  ["table"]=>
+  string(13) "test_affected"
+  ["orgtable"]=>
+  string(13) "test_affected"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(32768)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 object(stdClass)#6 (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"orgname"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"table"]=>
-  %unicode|string%(13) "test_affected"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(13) "test_affected"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(3) "bar"
+  ["orgname"]=>
+  string(3) "bar"
+  ["table"]=>
+  string(13) "test_affected"
+  ["orgtable"]=>
+  string(13) "test_affected"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(0)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(253)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 
 === fetch_field ===
 object(stdClass)#6 (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(3) "foo"
-  [%u|b%"orgname"]=>
-  %unicode|string%(3) "foo"
-  [%u|b%"table"]=>
-  %unicode|string%(13) "test_affected"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(13) "test_affected"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(3) "foo"
+  ["orgname"]=>
+  string(3) "foo"
+  ["table"]=>
+  string(13) "test_affected"
+  ["orgtable"]=>
+  string(13) "test_affected"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(32768)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 object(stdClass)#5 (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"orgname"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"table"]=>
-  %unicode|string%(13) "test_affected"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(13) "test_affected"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(3) "bar"
+  ["orgname"]=>
+  string(3) "bar"
+  ["table"]=>
+  string(13) "test_affected"
+  ["orgtable"]=>
+  string(13) "test_affected"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(0)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(253)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt
index afc0923577..bd2625ad61 100644
--- a/ext/mysqli/tests/048.phpt
+++ b/ext/mysqli/tests/048.phpt
@@ -72,8 +72,8 @@ array(11) {
   [8]=>
   NULL
   [9]=>
-  %unicode|string%(4) "foo1"
+  string(4) "foo1"
   [10]=>
-  %unicode|string%(4) "1000"
+  string(4) "1000"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt
index c87f369487..e91d8c26ef 100644
--- a/ext/mysqli/tests/049.phpt
+++ b/ext/mysqli/tests/049.phpt
@@ -28,6 +28,6 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 array(1) {
   [0]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index 7c7e2b7568..ed445f22de 100644
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -77,37 +77,37 @@ mysqli_close($link);
 bool(true)
 bool(true)
 object(mysqli_stmt)#%d (%d) {
-  [%u|b%"affected_rows"]=>
+  ["affected_rows"]=>
   int(%i)
-  [%u|b%"insert_id"]=>
+  ["insert_id"]=>
   int(0)
-  [%u|b%"num_rows"]=>
+  ["num_rows"]=>
   int(0)
-  [%u|b%"param_count"]=>
+  ["param_count"]=>
   int(0)
-  [%u|b%"field_count"]=>
+  ["field_count"]=>
   int(1)
-  [%u|b%"errno"]=>
+  ["errno"]=>
   int(0)
-  [%u|b%"error"]=>
-  %unicode|string%(0) ""
-  [%u|b%"error_list"]=>
+  ["error"]=>
+  string(0) ""
+  ["error_list"]=>
   array(0) {
   }
-  [%u|b%"sqlstate"]=>
-  %unicode|string%(5) "00000"
-  [%u|b%"id"]=>
+  ["sqlstate"]=>
+  string(5) "00000"
+  ["id"]=>
   int(3)
 }
 bool(true)
 bool(false)
-%unicode|string%(0) ""
+string(0) ""
 
 Warning: mysqli_stmt_reset() expects parameter 1 to be mysqli_stmt, boolean given in %s on line %d
 NULL
 Rows: 3
 array(1) {
   [0]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt
index 3d2eed7fbe..3d268749b9 100644
--- a/ext/mysqli/tests/058.phpt
+++ b/ext/mysqli/tests/058.phpt
@@ -64,10 +64,10 @@ array(4) {
   [0]=>
   int(1)
   [1]=>
-  %unicode|string%(3) "foo"
+  string(3) "foo"
   [2]=>
   int(2)
   [3]=>
-  %unicode|string%(3) "bar"
+  string(3) "bar"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt
index e4b6a0b9fe..d6e9d6ed55 100644
--- a/ext/mysqli/tests/059.phpt
+++ b/ext/mysqli/tests/059.phpt
@@ -53,5 +53,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind"))
 mysqli_close($link);
 ?>
 --EXPECTF--
-%unicode|string%(6) "foobar"
+string(6) "foobar"
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt
index 5d17f8f953..04d6c8a015 100644
--- a/ext/mysqli/tests/060.phpt
+++ b/ext/mysqli/tests/060.phpt
@@ -56,19 +56,19 @@ mysqli_close($link);
 --EXPECTF--
 test_class::__construct(1,2)
 object(test_class)#%d (7) {
-  [%u|b%"c1"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"c2"]=>
-  %unicode|string%(5) "35999"
-  [%u|b%"c3"]=>
+  ["c1"]=>
+  string(1) "0"
+  ["c2"]=>
+  string(5) "35999"
+  ["c3"]=>
   NULL
-  [%u|b%"c4"]=>
-  %unicode|string%(4) "-500"
-  [%u|b%"c5"]=>
-  %unicode|string%(6) "-32768"
-  [%u|b%"c6"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"c7"]=>
-  %unicode|string%(1) "0"
+  ["c4"]=>
+  string(4) "-500"
+  ["c5"]=>
+  string(6) "-32768"
+  ["c6"]=>
+  string(1) "0"
+  ["c7"]=>
+  string(1) "0"
 }
 Done
\ No newline at end of file
diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
index b2d67014ff..a6a0c4f205 100644
--- a/ext/mysqli/tests/061.phpt
+++ b/ext/mysqli/tests/061.phpt
@@ -72,7 +72,7 @@ mysqli_close($link);
 ?>
 --EXPECTF--
 foo-bar
-%unicode|string%-%unicode|string%
+string-string
 rab-oof
-%unicode|string%-%unicode|string%
+string-string
 done!
diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt
index bc6198c6a1..bfb7ea35bf 100644
--- a/ext/mysqli/tests/062.phpt
+++ b/ext/mysqli/tests/062.phpt
@@ -25,6 +25,6 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 array(1) {
   [0]=>
-  %unicode|string%(3) "foo"
+  string(3) "foo"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt
index b184d72eea..da6708c0ac 100644
--- a/ext/mysqli/tests/063.phpt
+++ b/ext/mysqli/tests/063.phpt
@@ -21,4 +21,4 @@ require_once('skipifconnectfailure.inc');
 	var_dump($foo);
 ?>
 --EXPECTF--
-%unicode|string%(3) "foo"
\ No newline at end of file
+string(3) "foo"
\ No newline at end of file
diff --git a/ext/mysqli/tests/068.phpt b/ext/mysqli/tests/068.phpt
index 57a4a2543a..78f710db8c 100644
--- a/ext/mysqli/tests/068.phpt
+++ b/ext/mysqli/tests/068.phpt
@@ -8,4 +8,4 @@ mysqli get_client_info
 	echo gettype($s);
 ?>
 --EXPECTF--
-%unicode|string%
\ No newline at end of file
+string
\ No newline at end of file
diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt
index ee76ca5c10..c83cbc3c16 100644
--- a/ext/mysqli/tests/069.phpt
+++ b/ext/mysqli/tests/069.phpt
@@ -29,10 +29,10 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 array(1) {
   [1]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
 array(1) {
   [2]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt
index a1e9983bf3..3aaef33c67 100644
--- a/ext/mysqli/tests/072.phpt
+++ b/ext/mysqli/tests/072.phpt
@@ -27,6 +27,6 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 int(1)
 int(1051)
-%unicode|string%(%d) "Unknown table %snot_exists%s"
-%unicode|string%(5) "HY000"
+string(%d) "Unknown table %snot_exists%s"
+string(5) "HY000"
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/073.phpt b/ext/mysqli/tests/073.phpt
index c70f7d9471..90fae8b7c6 100644
--- a/ext/mysqli/tests/073.phpt
+++ b/ext/mysqli/tests/073.phpt
@@ -17,7 +17,7 @@ mysqli_driver properties
 --EXPECTF--
 bool(%s)
 int(%d)
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 int(%d)
 bool(%s)
 int(%d)
diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt
index 7d9d01b3be..7b4590f99c 100644
--- a/ext/mysqli/tests/074.phpt
+++ b/ext/mysqli/tests/074.phpt
@@ -25,10 +25,10 @@ require_once('skipifconnectfailure.inc');
 bool(true)
 array(1) {
   [0]=>
-  %unicode|string%(1) "0"
+  string(1) "0"
 }
 bool(true)
 array(1) {
   [0]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
\ No newline at end of file
diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index 4fe87f4c00..43edfd7d50 100644
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -63,84 +63,84 @@ mysqli_close($link);
 ?>
 --EXPECTF--
 object(mysqli)#%d (%d) {
-  [%u|b%"affected_rows"]=>
+  ["affected_rows"]=>
   int(0)
-  [%u|b%"client_info"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"client_version"]=>
+  ["client_info"]=>
+  string(%d) "%s"
+  ["client_version"]=>
   int(%d)
-  [%u|b%"connect_errno"]=>
+  ["connect_errno"]=>
   int(0)
-  [%u|b%"connect_error"]=>
+  ["connect_error"]=>
   NULL
-  [%u|b%"errno"]=>
+  ["errno"]=>
   int(0)
-  [%u|b%"error"]=>
-  %unicode|string%(0) ""
-  [%u|b%"error_list"]=>
+  ["error"]=>
+  string(0) ""
+  ["error_list"]=>
   array(0) {
   }
-  [%u|b%"field_count"]=>
+  ["field_count"]=>
   int(0)
-  [%u|b%"host_info"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"info"]=>
+  ["host_info"]=>
+  string(%d) "%s"
+  ["info"]=>
   NULL
-  [%u|b%"insert_id"]=>
+  ["insert_id"]=>
   int(0)
-  [%u|b%"server_info"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"server_version"]=>
+  ["server_info"]=>
+  string(%d) "%s"
+  ["server_version"]=>
   int(%d)
-  [%u|b%"stat"]=>
+  ["stat"]=>
   string(%d) "Uptime: %d  Threads: %d  Questions: %d  Slow queries: %d  Opens: %d  Flush tables: %d  Open tables: %d  Queries per second avg: %d.%d"
-  [%u|b%"sqlstate"]=>
-  %unicode|string%(5) "00000"
-  [%u|b%"protocol_version"]=>
+  ["sqlstate"]=>
+  string(5) "00000"
+  ["protocol_version"]=>
   int(10)
-  [%u|b%"thread_id"]=>
+  ["thread_id"]=>
   int(%d)
-  [%u|b%"warning_count"]=>
+  ["warning_count"]=>
   int(0)
 }
 object(mysqli)#%d (%d) {
-  [%u|b%"affected_rows"]=>
+  ["affected_rows"]=>
   NULL
-  [%u|b%"client_info"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"client_version"]=>
+  ["client_info"]=>
+  string(%d) "%s"
+  ["client_version"]=>
   int(%d)
-  [%u|b%"connect_errno"]=>
+  ["connect_errno"]=>
   int(0)
-  [%u|b%"connect_error"]=>
+  ["connect_error"]=>
   NULL
-  [%u|b%"errno"]=>
+  ["errno"]=>
   int(0)
-  [%u|b%"error"]=>
-  %unicode|string%(0) ""
-  [%u|b%"error_list"]=>
+  ["error"]=>
+  string(0) ""
+  ["error_list"]=>
   NULL
-  [%u|b%"field_count"]=>
+  ["field_count"]=>
   NULL
-  [%u|b%"host_info"]=>
+  ["host_info"]=>
   NULL
-  [%u|b%"info"]=>
+  ["info"]=>
   NULL
-  [%u|b%"insert_id"]=>
+  ["insert_id"]=>
   NULL
-  [%u|b%"server_info"]=>
+  ["server_info"]=>
   NULL
-  [%u|b%"server_version"]=>
+  ["server_version"]=>
   NULL
-  [%u|b%"stat"]=>
+  ["stat"]=>
   NULL
-  [%u|b%"sqlstate"]=>
+  ["sqlstate"]=>
   NULL
-  [%u|b%"protocol_version"]=>
+  ["protocol_version"]=>
   NULL
-  [%u|b%"thread_id"]=>
+  ["thread_id"]=>
   NULL
-  [%u|b%"warning_count"]=>
+  ["warning_count"]=>
   NULL
 }
 Done
diff --git a/ext/mysqli/tests/bug45019.phpt b/ext/mysqli/tests/bug45019.phpt
index b8828c7428..b4c115d4cc 100644
--- a/ext/mysqli/tests/bug45019.phpt
+++ b/ext/mysqli/tests/bug45019.phpt
@@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 Using CAST('somestring' AS CHAR)...
-%unicode|string%(3) "one"
-%unicode|string%(5) "three"
-%unicode|string%(3) "two"
+string(3) "one"
+string(5) "three"
+string(3) "two"
 done!
diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt
index 35434bdd2d..55b74ce017 100644
--- a/ext/mysqli/tests/bug49027.phpt
+++ b/ext/mysqli/tests/bug49027.phpt
@@ -53,10 +53,10 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 array(1) {
   [0]=>
-  %unicode|string%(2) "42"
+  string(2) "42"
 }
 array(1) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
+  ["id"]=>
+  string(1) "1"
 }
 done!
diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt
index 54267451ee..dce7b33cb7 100644
--- a/ext/mysqli/tests/bug49442.phpt
+++ b/ext/mysqli/tests/bug49442.phpt
@@ -110,21 +110,21 @@ mysqli.max_persistent=1
 ?>
 --EXPECTF--
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(2) "97"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "x"
+  ["id"]=>
+  string(2) "97"
+  ["label"]=>
+  string(1) "x"
 }
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(2) "98"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "y"
+  ["id"]=>
+  string(2) "98"
+  ["label"]=>
+  string(1) "y"
 }
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(2) "99"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "z"
+  ["id"]=>
+  string(2) "99"
+  ["label"]=>
+  string(1) "z"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
index 7254929bbf..27d399be16 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
@@ -281,19 +281,19 @@ ok
 
 Magic, magic properties:
 mysqli->affected_rows = '%s'/integer ('%s'/integer)
-mysqli->client_info = '%s'/%unicode|string% ('%s'/%unicode|string%)
+mysqli->client_info = '%s'/string ('%s'/string)
 mysqli->client_version =  '%d'/integer ('%d'/integer)
 mysqli->errno = '0'/integer ('0'/integer)
-mysqli->error = ''/%unicode|string% (''/%unicode|string%)
+mysqli->error = ''/string (''/string)
 mysqli->field_count = '0'/integer ('0'/integer)
 mysqli->insert_id = '0'/integer ('0'/integer)
-mysqli->sqlstate = '00000'/%unicode|string% ('00000'/%unicode|string%)
+mysqli->sqlstate = '00000'/string ('00000'/string)
 mysqli->stat = 'Uptime: %d  Threads: %d  Questions: %d  Slow queries: %d  Opens: %d  Flush tables: %d  Open tables: %d  Queries per second avg: %d.%d'/string ('Uptime: %d  Threads: %d  Questions: %d  Slow queries: %d  Opens: %d  Flush tables: %d  Open tables: %d  Queries per second avg: %d.%d'/string)
-mysqli->host_info = '%s'/%unicode|string% ('%s'/%unicode|string%)
+mysqli->host_info = '%s'/string ('%s'/string)
 mysqli->info = ''/NULL (''/NULL)
 mysqli->thread_id = '%d'/integer ('%d'/integer)
 mysqli->protocol_version = '%d'/integer ('%d'/integer)
-mysqli->server_info = '%s'/%unicode|string% ('%s'/%unicode|string%)
+mysqli->server_info = '%s'/string ('%s'/string)
 mysqli->server_version = '%d'/integer ('%d'/integer)
 mysqli->warning_count = '0'/integer ('0'/integer)
 
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
index 4381805acd..544a6a3f22 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
@@ -187,7 +187,7 @@ mysqli_result->unknown = ''
 
 Constructor:
 
-Warning: mysqli_result::__construct() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: mysqli_result::__construct() expects parameter 2 to be integer, string given in %s on line %d
 
-Warning: mysqli_result::__construct() expects parameter 1 to be mysqli, %unicode_string_optional% given in %s on line %d
+Warning: mysqli_result::__construct() expects parameter 1 to be mysqli, string given in %s on line %d
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
index acf7379198..fd14154322 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
@@ -194,5 +194,5 @@ stmt->unknown = '13'
 
 Prepare using the constructor:
 
-Warning: mysqli_stmt::__construct() expects parameter 2 to be %binary_string_optional%, object given in %s on line %d
+Warning: mysqli_stmt::__construct() expects parameter 2 to be string, object given in %s on line %d
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt
index e14d88fe71..8b1c923304 100644
--- a/ext/mysqli/tests/mysqli_connect.phpt
+++ b/ext/mysqli/tests/mysqli_connect.phpt
@@ -151,25 +151,25 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 Warning: mysqli_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
 array(1) {
-  [%u|b%"testing"]=>
-  %unicode|string%(21) "mysqli.default_socket"
+  ["testing"]=>
+  string(21) "mysqli.default_socket"
 }
 array(1) {
-  [%u|b%"testing"]=>
-  %unicode|string%(19) "mysqli.default_port"
+  ["testing"]=>
+  string(19) "mysqli.default_port"
 }
 array(1) {
-  [%u|b%"testing"]=>
-  %unicode|string%(17) "mysqli.default_pw"
+  ["testing"]=>
+  string(17) "mysqli.default_pw"
 }
 array(2) {
   [0]=>
-  %unicode|string%(19) "mysqli.default_user"
-  [%u|b%"testing"]=>
-  %unicode|string%(19) "mysqli.default_user"
+  string(19) "mysqli.default_user"
+  ["testing"]=>
+  string(19) "mysqli.default_user"
 }
 array(1) {
   [0]=>
-  %unicode|string%(19) "mysqli.default_host"
+  string(19) "mysqli.default_host"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index 1855a20314..7f049b052f 100644
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -158,23 +158,23 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"testing"]=>
-  %unicode|string%(19) "mysqli.default_port"
+  ["testing"]=>
+  string(19) "mysqli.default_port"
 }
 array(1) {
-  [%u|b%"testing"]=>
-  %unicode|string%(17) "mysqli.default_pw"
+  ["testing"]=>
+  string(17) "mysqli.default_pw"
 }
 array(1) {
-  [%u|b%"testing"]=>
-  %unicode|string%(19) "mysqli.default_user"
+  ["testing"]=>
+  string(19) "mysqli.default_user"
 }
 array(1) {
-  [%u|b%"all_defaults"]=>
-  %unicode|string%(13) "have been set"
+  ["all_defaults"]=>
+  string(13) "have been set"
 }
 array(1) {
-  [%u|b%"all_defaults"]=>
-  %unicode|string%(13) "have been set"
+  ["all_defaults"]=>
+  string(13) "have been set"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt
index a9d5b7ec94..2809a3feda 100644
--- a/ext/mysqli/tests/mysqli_connect_twice.phpt
+++ b/ext/mysqli/tests/mysqli_connect_twice.phpt
@@ -74,11 +74,11 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"it_works"]=>
-  %unicode|string%(2) "ok"
+  ["it_works"]=>
+  string(2) "ok"
 }
 array(1) {
-  [%u|b%"syntax"]=>
-  %unicode|string%(18) "works also with oo"
+  ["syntax"]=>
+  string(18) "works also with oo"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt
index e6b5585a38..e6bf1c9bc7 100644
--- a/ext/mysqli/tests/mysqli_error_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_error_unicode.phpt
@@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-%unicode|string%(%d) "Table 'няма_такава_таблица' doesn't exist"
+string(%d) "Table 'няма_такава_таблица' doesn't exist"
 
 Warning: mysqli_error(): Couldn't fetch mysqli in %s on line %d
 NULL
diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt
index 854b8160f0..dce785af51 100644
--- a/ext/mysqli/tests/mysqli_fetch_all.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_all.phpt
@@ -331,16 +331,16 @@ array(2) {
   [0]=>
   array(2) {
     [0]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
     [1]=>
-    %unicode|string%(1) "a"
+    string(1) "a"
   }
   [1]=>
   array(2) {
     [0]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "b"
+    string(1) "b"
   }
 }
 [007]
@@ -348,16 +348,16 @@ array(2) {
   [0]=>
   array(2) {
     [0]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
     [1]=>
-    %unicode|string%(1) "a"
+    string(1) "a"
   }
   [1]=>
   array(2) {
     [0]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "b"
+    string(1) "b"
   }
 }
 [008]
@@ -365,41 +365,41 @@ array(2) {
   [0]=>
   array(4) {
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
+    ["id"]=>
+    string(1) "1"
     [1]=>
-    %unicode|string%(1) "a"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    string(1) "a"
+    ["label"]=>
+    string(1) "a"
   }
   [1]=>
   array(4) {
     [0]=>
-    %unicode|string%(1) "2"
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
+    ["id"]=>
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "b"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    string(1) "b"
+    ["label"]=>
+    string(1) "b"
   }
 }
 [010]
 array(2) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
   }
 }
 [011]
@@ -409,17 +409,17 @@ array(0) {
 array(2) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
   }
 }
 [016]
@@ -430,27 +430,27 @@ array(1) {
   [0]=>
   array(11) {
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"a"]=>
-    %unicode|string%(1) "2"
+    string(1) "1"
+    ["a"]=>
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
     [2]=>
-    %unicode|string%(1) "3"
-    [%u|b%"c"]=>
-    %unicode|string%(1) "3"
+    string(1) "3"
+    ["c"]=>
+    string(1) "3"
     [3]=>
-    %unicode|string%(1) "4"
-    [%u|b%"C"]=>
-    %unicode|string%(1) "4"
+    string(1) "4"
+    ["C"]=>
+    string(1) "4"
     [4]=>
     NULL
-    [%u|b%"d"]=>
+    ["d"]=>
     NULL
     [5]=>
-    %unicode|string%(1) "1"
-    [%u|b%"e"]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
+    ["e"]=>
+    string(1) "1"
   }
 }
 
diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
index 575f953969..450c67ecd9 100644
--- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
@@ -313,16 +313,16 @@ array(2) {
   [0]=>
   array(2) {
     [0]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
     [1]=>
-    %unicode|string%(1) "a"
+    string(1) "a"
   }
   [1]=>
   array(2) {
     [0]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "b"
+    string(1) "b"
   }
 }
 [007]
@@ -330,16 +330,16 @@ array(2) {
   [0]=>
   array(2) {
     [0]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
     [1]=>
-    %unicode|string%(1) "a"
+    string(1) "a"
   }
   [1]=>
   array(2) {
     [0]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "b"
+    string(1) "b"
   }
 }
 [008]
@@ -347,41 +347,41 @@ array(2) {
   [0]=>
   array(4) {
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
+    ["id"]=>
+    string(1) "1"
     [1]=>
-    %unicode|string%(1) "a"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    string(1) "a"
+    ["label"]=>
+    string(1) "a"
   }
   [1]=>
   array(4) {
     [0]=>
-    %unicode|string%(1) "2"
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
+    ["id"]=>
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "b"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    string(1) "b"
+    ["label"]=>
+    string(1) "b"
   }
 }
 [010]
 array(2) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
   }
 }
 [011]
@@ -390,17 +390,17 @@ NULL
 array(2) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
   }
 }
 [016]
@@ -410,27 +410,27 @@ array(1) {
   [0]=>
   array(11) {
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"a"]=>
-    %unicode|string%(1) "2"
+    string(1) "1"
+    ["a"]=>
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
     [2]=>
-    %unicode|string%(1) "3"
-    [%u|b%"c"]=>
-    %unicode|string%(1) "3"
+    string(1) "3"
+    ["c"]=>
+    string(1) "3"
     [3]=>
-    %unicode|string%(1) "4"
-    [%u|b%"C"]=>
-    %unicode|string%(1) "4"
+    string(1) "4"
+    ["C"]=>
+    string(1) "4"
     [4]=>
     NULL
-    [%u|b%"d"]=>
+    ["d"]=>
     NULL
     [5]=>
-    %unicode|string%(1) "1"
-    [%u|b%"e"]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
+    ["e"]=>
+    string(1) "1"
   }
 }
 
diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt
index aa19ff6eb3..e232898c7b 100644
--- a/ext/mysqli/tests/mysqli_fetch_array.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array.phpt
@@ -296,74 +296,74 @@ require_once('skipifconnectfailure.inc');
 [005]
 array(4) {
   [0]=>
-  %unicode|string%(1) "1"
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
+  ["id"]=>
+  string(1) "1"
   [1]=>
-  %unicode|string%(1) "a"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  string(1) "a"
+  ["label"]=>
+  string(1) "a"
 }
 [006]
 array(2) {
   [0]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
   [1]=>
-  %unicode|string%(1) "b"
+  string(1) "b"
 }
 [007]
 array(4) {
   [0]=>
-  %unicode|string%(1) "3"
-  [%u|b%"id"]=>
-  %unicode|string%(1) "3"
+  string(1) "3"
+  ["id"]=>
+  string(1) "3"
   [1]=>
-  %unicode|string%(1) "c"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "c"
+  string(1) "c"
+  ["label"]=>
+  string(1) "c"
 }
 [008]
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "4"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "d"
+  ["id"]=>
+  string(1) "4"
+  ["label"]=>
+  string(1) "d"
 }
 [009]
 array(4) {
   [0]=>
-  %unicode|string%(1) "5"
-  [%u|b%"id"]=>
-  %unicode|string%(1) "5"
+  string(1) "5"
+  ["id"]=>
+  string(1) "5"
   [1]=>
-  %unicode|string%(1) "e"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "e"
+  string(1) "e"
+  ["label"]=>
+  string(1) "e"
 }
 [011]
 array(11) {
   [0]=>
-  %unicode|string%(1) "1"
-  [%u|b%"a"]=>
-  %unicode|string%(1) "2"
+  string(1) "1"
+  ["a"]=>
+  string(1) "2"
   [1]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
   [2]=>
-  %unicode|string%(1) "3"
-  [%u|b%"c"]=>
-  %unicode|string%(1) "3"
+  string(1) "3"
+  ["c"]=>
+  string(1) "3"
   [3]=>
-  %unicode|string%(1) "4"
-  [%u|b%"C"]=>
-  %unicode|string%(1) "4"
+  string(1) "4"
+  ["C"]=>
+  string(1) "4"
   [4]=>
   NULL
-  [%u|b%"d"]=>
+  ["d"]=>
   NULL
   [5]=>
-  %unicode|string%(1) "1"
-  [%u|b%"e"]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
+  ["e"]=>
+  string(1) "1"
 }
 
 Warning: mysqli_fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
index 957ca12de9..2fb8281939 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
@@ -34,16 +34,16 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 [002]
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 [004]
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
index 21d78ae6fb..0fb1a72e93 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
@@ -284,74 +284,74 @@ require_once('skipifconnectfailure.inc');
 [005]
 array(4) {
   [0]=>
-  %unicode|string%(1) "1"
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
+  ["id"]=>
+  string(1) "1"
   [1]=>
-  %unicode|string%(1) "a"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  string(1) "a"
+  ["label"]=>
+  string(1) "a"
 }
 [006]
 array(2) {
   [0]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
   [1]=>
-  %unicode|string%(1) "b"
+  string(1) "b"
 }
 [007]
 array(4) {
   [0]=>
-  %unicode|string%(1) "3"
-  [%u|b%"id"]=>
-  %unicode|string%(1) "3"
+  string(1) "3"
+  ["id"]=>
+  string(1) "3"
   [1]=>
-  %unicode|string%(1) "c"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "c"
+  string(1) "c"
+  ["label"]=>
+  string(1) "c"
 }
 [008]
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "4"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "d"
+  ["id"]=>
+  string(1) "4"
+  ["label"]=>
+  string(1) "d"
 }
 [009]
 array(4) {
   [0]=>
-  %unicode|string%(1) "5"
-  [%u|b%"id"]=>
-  %unicode|string%(1) "5"
+  string(1) "5"
+  ["id"]=>
+  string(1) "5"
   [1]=>
-  %unicode|string%(1) "e"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "e"
+  string(1) "e"
+  ["label"]=>
+  string(1) "e"
 }
 [011]
 array(11) {
   [0]=>
-  %unicode|string%(1) "1"
-  [%u|b%"a"]=>
-  %unicode|string%(1) "2"
+  string(1) "1"
+  ["a"]=>
+  string(1) "2"
   [1]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
   [2]=>
-  %unicode|string%(1) "3"
-  [%u|b%"c"]=>
-  %unicode|string%(1) "3"
+  string(1) "3"
+  ["c"]=>
+  string(1) "3"
   [3]=>
-  %unicode|string%(1) "4"
-  [%u|b%"C"]=>
-  %unicode|string%(1) "4"
+  string(1) "4"
+  ["C"]=>
+  string(1) "4"
   [4]=>
   NULL
-  [%u|b%"d"]=>
+  ["d"]=>
   NULL
   [5]=>
-  %unicode|string%(1) "1"
-  [%u|b%"e"]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
+  ["e"]=>
+  string(1) "1"
 }
 
 Warning: mysqli_result::fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt
index edf143b726..0d721fd5c6 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt
@@ -74,45 +74,45 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 [005]
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 [006]
 NULL
 [008]
 array(15) {
-  [%u|b%"a"]=>
-  %unicode|string%(1) "2"
-  [%u|b%"c"]=>
-  %unicode|string%(1) "3"
-  [%u|b%"C"]=>
-  %unicode|string%(1) "4"
-  [%u|b%"d"]=>
+  ["a"]=>
+  string(1) "2"
+  ["c"]=>
+  string(1) "3"
+  ["C"]=>
+  string(1) "4"
+  ["d"]=>
   NULL
-  [%u|b%"e"]=>
-  %unicode|string%(1) "1"
+  ["e"]=>
+  string(1) "1"
   [-1]=>
-  %unicode|string%(1) "5"
+  string(1) "5"
   [-10]=>
-  %unicode|string%(1) "6"
+  string(1) "6"
   [-100]=>
-  %unicode|string%(1) "7"
+  string(1) "7"
   [-1000]=>
-  %unicode|string%(1) "8"
+  string(1) "8"
   [10000]=>
-  %unicode|string%(1) "9"
+  string(1) "9"
   [100000]=>
-  %unicode|string%(1) "a"
+  string(1) "a"
   [1000000]=>
-  %unicode|string%(1) "b"
+  string(1) "b"
   [9]=>
-  %unicode|string%(1) "d"
-  [%u|b%"01"]=>
-  %unicode|string%(1) "e"
-  [%u|b%"-02"]=>
-  %unicode|string%(1) "f"
+  string(1) "d"
+  ["01"]=>
+  string(1) "e"
+  ["-02"]=>
+  string(1) "f"
 }
 
 Warning: mysqli_fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
index a273b73aa9..e09e8b2cc3 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
@@ -86,57 +86,57 @@ require_once('skipifconnectfailure.inc');
 [002]
 array(2) {
   [1]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 [004]
 array(2) {
-  [%u|b%"a"]=>
-  %unicode|string%(1) "1"
+  ["a"]=>
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 [006]
 array(2) {
-  [%u|b%"a"]=>
-  %unicode|string%(1) "1"
+  ["a"]=>
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 [008]
 array(2) {
-  [%u|b%"a"]=>
-  %unicode|string%(1) "1"
+  ["a"]=>
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 [011]
 array(2) {
   [1]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 [014]
 array(2) {
-  [%u|b%"a"]=>
+  ["a"]=>
   %s(1) "1"
   [2]=>
   %s(1) "2"
 }
 [017]
 array(2) {
-  [%u|b%"a"]=>
-  %unicode|string%(1) "1"
+  ["a"]=>
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 [017]
 array(2) {
-  [%u|b%"a"]=>
-  %unicode|string%(1) "1"
+  ["a"]=>
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index ac2e7c0001..22aee90c49 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -81,84 +81,84 @@ mysqli_fetch_assoc() - utf8
 --EXPECTF--
 [003]
 array(3) {
-  [%u|b%"Андрей Христов"]=>
-  %unicode|string%(%r[1|3]%r) "1"
-  [%u|b%"Улф Вендел"]=>
-  %unicode|string%(1) "2"
-  [%u|b%"Георг Рихтер"]=>
-  %unicode|string%(1) "3"
+  ["Андрей Христов"]=>
+  string(%r[1|3]%r) "1"
+  ["Улф Вендел"]=>
+  string(1) "2"
+  ["Георг Рихтер"]=>
+  string(1) "3"
 }
 [009]
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "4"
-  [%u|b%"име"]=>
-  %unicode|string%(6) "Andrey"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(7) "Hristov"
+  ["id"]=>
+  string(1) "4"
+  ["име"]=>
+  string(6) "Andrey"
+  ["фамилия"]=>
+  string(7) "Hristov"
 }
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "7"
-  [%u|b%"име"]=>
-  %unicode|string%(9) "安德烈"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(7) "Hristov"
+  ["id"]=>
+  string(1) "7"
+  ["име"]=>
+  string(9) "安德烈"
+  ["фамилия"]=>
+  string(7) "Hristov"
 }
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "5"
-  [%u|b%"име"]=>
-  %unicode|string%(5) "Georg"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(7) "Richter"
+  ["id"]=>
+  string(1) "5"
+  ["име"]=>
+  string(5) "Georg"
+  ["фамилия"]=>
+  string(7) "Richter"
 }
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "8"
-  [%u|b%"име"]=>
-  %unicode|string%(9) "格奥尔"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(7) "Richter"
+  ["id"]=>
+  string(1) "8"
+  ["име"]=>
+  string(9) "格奥尔"
+  ["фамилия"]=>
+  string(7) "Richter"
 }
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "6"
-  [%u|b%"име"]=>
-  %unicode|string%(3) "Ulf"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(6) "Wendel"
+  ["id"]=>
+  string(1) "6"
+  ["име"]=>
+  string(3) "Ulf"
+  ["фамилия"]=>
+  string(6) "Wendel"
 }
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "9"
-  [%u|b%"име"]=>
-  %unicode|string%(9) "乌尔夫"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(6) "Wendel"
+  ["id"]=>
+  string(1) "9"
+  ["име"]=>
+  string(9) "乌尔夫"
+  ["фамилия"]=>
+  string(6) "Wendel"
 }
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "3"
-  [%u|b%"име"]=>
-  %unicode|string%(6) "Улф"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(12) "Вендел"
+  ["id"]=>
+  string(1) "3"
+  ["име"]=>
+  string(6) "Улф"
+  ["фамилия"]=>
+  string(12) "Вендел"
 }
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "2"
-  [%u|b%"име"]=>
-  %unicode|string%(10) "Георг"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(12) "Рихтер"
+  ["id"]=>
+  string(1) "2"
+  ["име"]=>
+  string(10) "Георг"
+  ["фамилия"]=>
+  string(12) "Рихтер"
 }
 array(3) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"име"]=>
-  %unicode|string%(12) "Андрей"
-  [%u|b%"фамилия"]=>
-  %unicode|string%(14) "Христов"
+  ["id"]=>
+  string(1) "1"
+  ["име"]=>
+  string(12) "Андрей"
+  ["фамилия"]=>
+  string(14) "Христов"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
index 8a71fa740c..026252b504 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
@@ -61,25 +61,25 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 [005]
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 [006]
 NULL
 [008]
 array(5) {
-  [%u|b%"a"]=>
-  %unicode|string%(1) "2"
-  [%u|b%"c"]=>
-  %unicode|string%(1) "3"
-  [%u|b%"C"]=>
-  %unicode|string%(1) "4"
-  [%u|b%"d"]=>
+  ["a"]=>
+  string(1) "2"
+  ["c"]=>
+  string(1) "3"
+  ["C"]=>
+  string(1) "4"
+  ["d"]=>
   NULL
-  [%u|b%"e"]=>
-  %unicode|string%(1) "1"
+  ["e"]=>
+  string(1) "1"
 }
 
 Warning: mysqli_result::fetch_assoc(): Couldn't fetch mysqli_result in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt
index 2b9108072b..f1d6db0599 100644
--- a/ext/mysqli/tests/mysqli_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field.phpt
@@ -88,94 +88,94 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "ID"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "TEST"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "ID"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "TEST"
+  ["orgtable"]=>
+  string(%d) "%s"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(1)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(49155)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"orgname"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "TEST"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(5) "label"
+  ["orgname"]=>
+  string(5) "label"
+  ["table"]=>
+  string(4) "TEST"
+  ["orgtable"]=>
+  string(%d) "%s"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(%d)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(0)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(254)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 bool(false)
 
 Warning: mysqli_fetch_field(): Couldn't fetch mysqli_result in %s on line %d
 array(1) {
-  [%u|b%"_default_test"]=>
-  %unicode|string%(1) "2"
+  ["_default_test"]=>
+  string(1) "2"
 }
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(13) "_default_test"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(13) "_default_test"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(%d) "%s"
+  ["orgtable"]=>
+  string(%d) "%s"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(1)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(32769)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 done!
diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
index fb34e44a6a..d17eb7506f 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
@@ -48,31 +48,31 @@ require_once('skipifconnectfailure.inc');
 Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in %s on line %d
 bool(false)
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "ID"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "TEST"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "ID"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "TEST"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(%d)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(%d)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(%d)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(%d)
 }
 
diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
index 9d511aa900..4ac84d580a 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
@@ -57,31 +57,31 @@ require_once('skipifconnectfailure.inc');
 Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for resultset in %s on line %d
 bool(false)
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "ID"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "TEST"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "ID"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "TEST"
+  ["orgtable"]=>
+  string(%d) "%s"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(%d)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(%d)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(%d)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(%d)
 }
 
diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
index 8c5609b163..039d2b4e31 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
@@ -71,59 +71,59 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "ID"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "TEST"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "ID"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "TEST"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(1)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(49155)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"orgname"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "TEST"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(5) "label"
+  ["orgname"]=>
+  string(5) "label"
+  ["table"]=>
+  string(4) "TEST"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(%d)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(0)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(254)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 bool(false)
diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt
index 6b66d6f231..854af23302 100644
--- a/ext/mysqli/tests/mysqli_fetch_fields.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt
@@ -67,59 +67,59 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "ID"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "TEST"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "ID"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "TEST"
+  ["orgtable"]=>
+  string(%d) "%s"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(1)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(49155)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"orgname"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "TEST"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(5) "label"
+  ["orgname"]=>
+  string(5) "label"
+  ["table"]=>
+  string(4) "TEST"
+  ["orgtable"]=>
+  string(%d) "%s"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(1)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(0)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(254)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 
diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
index 3a047a50fc..cb9f98cfa6 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
@@ -51,9 +51,9 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 No exception with PHP:
 object(mysqli_fetch_object_test)#%d (%d) {
-  [%u|b%"a"]=>
+  ["a"]=>
   NULL
-  [%u|b%"b"]=>
+  ["b"]=>
   NULL
 }
 
diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt
index e0359e058e..59f6cbae3b 100644
--- a/ext/mysqli/tests/mysqli_fetch_row.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_row.phpt
@@ -45,11 +45,11 @@ require_once('skipifconnectfailure.inc');
 [004]
 array(3) {
   [0]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [1]=>
-  %unicode|string%(1) "a"
+  string(1) "a"
   [2]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
 [005]
 NULL
diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt
index 952c5056b7..b30b11cd27 100644
--- a/ext/mysqli/tests/mysqli_field_seek.phpt
+++ b/ext/mysqli/tests/mysqli_field_seek.phpt
@@ -127,89 +127,89 @@ require_once('skipifconnectfailure.inc');
 Warning: mysqli_field_seek(): Invalid field offset in %s on line %d
 bool(false)
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "id"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "test"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(49155)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 bool(true)
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "id"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "test"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(49155)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 bool(true)
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"orgname"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(5) "label"
+  ["orgname"]=>
+  string(5) "label"
+  ["table"]=>
+  string(4) "test"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(%d)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(0)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(254)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 int(2)
@@ -222,31 +222,31 @@ Warning: mysqli_field_seek() expects parameter 2 to be integer, float given in %
 NULL
 bool(true)
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "_null"
-  [%u|b%"orgname"]=>
-  %unicode|string%(0) ""
-  [%u|b%"table"]=>
-  %unicode|string%(0) ""
-  [%u|b%"orgtable"]=>
-  %unicode|string%(0) ""
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(0) ""
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(5) "_null"
+  ["orgname"]=>
+  string(0) ""
+  ["table"]=>
+  string(0) ""
+  ["orgtable"]=>
+  string(0) ""
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(0) ""
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(0)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(32896)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(6)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 
diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt
index cac2001acf..0a89e45914 100644
--- a/ext/mysqli/tests/mysqli_field_tell.phpt
+++ b/ext/mysqli/tests/mysqli_field_tell.phpt
@@ -65,31 +65,31 @@ Warning: mysqli_field_seek() expects exactly 2 parameters, 1 given in %s on line
 NULL
 int(0)
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "id"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "test"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(49155)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 bool(false)
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index 6ebcf3ef06..29f8b430de 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -129,7 +129,7 @@ mysqlnd.collect_memory_statistics=1
 	mysqli_get_client_stats_assert_eq('copy_on_write_saved', $new_info, $info, $test_counter);
 	mysqli_get_client_stats_assert_eq('copy_on_write_performed', $new_info, $info, $test_counter);
 	mysqli_get_client_stats_assert_eq('command_buffer_too_small', $new_info, $info, $test_counter);
-	// This is not a mistake that I use %unicode|string%(1) "1" here! Andrey did not go for int to avoid any
+	// This is not a mistake that I use string(1) "1" here! Andrey did not go for int to avoid any
 	// issues for very large numbers and 32 vs. 64bit systems
 	mysqli_get_client_stats_assert_eq('connect_success', $new_info, "1", $test_counter);
 	mysqli_get_client_stats_assert_eq('connect_failure', $new_info, $info, $test_counter);
@@ -958,332 +958,332 @@ mysqli_close($link);
 ?>
 --EXPECTF--
 array(163) {
-  [%u|b%"bytes_sent"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_sent"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_received"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"protocol_overhead_in"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"protocol_overhead_out"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_ok_packet"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_eof_packet"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_rset_header_packet"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_rset_field_meta_packet"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_rset_row_packet"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_prepare_response_packet"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_change_user_packet"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_sent_command"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_received_ok"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_received_eof"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_received_rset_header"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_received_rset_field_meta"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_received_rset_row"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_received_prepare_response"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"packets_received_change_user"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"result_set_queries"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"non_result_set_queries"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"no_index_used"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bad_index_used"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"slow_queries"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"buffered_sets"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"unbuffered_sets"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"ps_buffered_sets"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"ps_unbuffered_sets"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"flushed_normal_sets"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"flushed_ps_sets"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"ps_prepared_never_executed"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"ps_prepared_once_executed"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_fetched_from_server_normal"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_fetched_from_server_ps"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_buffered_from_client_normal"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_buffered_from_client_ps"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_fetched_from_client_normal_buffered"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_fetched_from_client_normal_unbuffered"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_fetched_from_client_ps_buffered"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_fetched_from_client_ps_unbuffered"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_fetched_from_client_ps_cursor"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_affected_normal"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_affected_ps"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_skipped_normal"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"rows_skipped_ps"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"copy_on_write_saved"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"copy_on_write_performed"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"command_buffer_too_small"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"connect_success"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"connect_failure"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"connection_reused"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"reconnect"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"pconnect_success"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"active_connections"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"active_persistent_connections"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"explicit_close"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"implicit_close"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"disconnect_close"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"in_middle_of_command_close"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"explicit_free_result"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"implicit_free_result"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"explicit_stmt_close"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"implicit_stmt_close"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_emalloc_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_emalloc_amount"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_ecalloc_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_ecalloc_amount"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_erealloc_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_erealloc_amount"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_efree_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_efree_amount"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_malloc_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_malloc_amount"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_calloc_count"]=>
-  %unicode|string%(%d) "%d"
-  [%u|b%"mem_calloc_amount"]=>
-  %unicode|string%(%d) "%d"
-  [%u|b%"mem_realloc_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_realloc_amount"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_free_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_free_amount"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_estrndup_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_strndup_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_estrdup_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_strdup_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_edupl_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"mem_dupl_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_null"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_bit"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_tinyint"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_short"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_int24"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_int"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_bigint"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_decimal"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_float"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_double"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_date"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_year"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_time"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_datetime"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_timestamp"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_string"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_blob"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_enum"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_set"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_geometry"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_text_fetched_other"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_null"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_bit"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_tinyint"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_short"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_int24"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_int"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_bigint"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_decimal"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_float"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_double"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_date"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_year"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_time"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_datetime"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_timestamp"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_string"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_json"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_blob"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_enum"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_set"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_geometry"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"proto_binary_fetched_other"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"init_command_executed_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"init_command_failed_count"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_quit"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_init_db"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_query"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_field_list"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_create_db"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_drop_db"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_refresh"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_shutdown"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_statistics"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_process_info"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_connect"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_process_kill"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_debug"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_ping"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_time"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_delayed_insert"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_change_user"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_binlog_dump"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_table_dump"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_connect_out"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_register_slave"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_stmt_prepare"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_stmt_execute"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_stmt_send_long_data"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_stmt_close"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_stmt_reset"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_stmt_set_option"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_stmt_fetch"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"com_deamon"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_real_data_normal"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"bytes_received_real_data_ps"]=>
-  %unicode|string%(1) "0"
+  ["bytes_sent"]=>
+  string(1) "0"
+  ["bytes_received"]=>
+  string(1) "0"
+  ["packets_sent"]=>
+  string(1) "0"
+  ["packets_received"]=>
+  string(1) "0"
+  ["protocol_overhead_in"]=>
+  string(1) "0"
+  ["protocol_overhead_out"]=>
+  string(1) "0"
+  ["bytes_received_ok_packet"]=>
+  string(1) "0"
+  ["bytes_received_eof_packet"]=>
+  string(1) "0"
+  ["bytes_received_rset_header_packet"]=>
+  string(1) "0"
+  ["bytes_received_rset_field_meta_packet"]=>
+  string(1) "0"
+  ["bytes_received_rset_row_packet"]=>
+  string(1) "0"
+  ["bytes_received_prepare_response_packet"]=>
+  string(1) "0"
+  ["bytes_received_change_user_packet"]=>
+  string(1) "0"
+  ["packets_sent_command"]=>
+  string(1) "0"
+  ["packets_received_ok"]=>
+  string(1) "0"
+  ["packets_received_eof"]=>
+  string(1) "0"
+  ["packets_received_rset_header"]=>
+  string(1) "0"
+  ["packets_received_rset_field_meta"]=>
+  string(1) "0"
+  ["packets_received_rset_row"]=>
+  string(1) "0"
+  ["packets_received_prepare_response"]=>
+  string(1) "0"
+  ["packets_received_change_user"]=>
+  string(1) "0"
+  ["result_set_queries"]=>
+  string(1) "0"
+  ["non_result_set_queries"]=>
+  string(1) "0"
+  ["no_index_used"]=>
+  string(1) "0"
+  ["bad_index_used"]=>
+  string(1) "0"
+  ["slow_queries"]=>
+  string(1) "0"
+  ["buffered_sets"]=>
+  string(1) "0"
+  ["unbuffered_sets"]=>
+  string(1) "0"
+  ["ps_buffered_sets"]=>
+  string(1) "0"
+  ["ps_unbuffered_sets"]=>
+  string(1) "0"
+  ["flushed_normal_sets"]=>
+  string(1) "0"
+  ["flushed_ps_sets"]=>
+  string(1) "0"
+  ["ps_prepared_never_executed"]=>
+  string(1) "0"
+  ["ps_prepared_once_executed"]=>
+  string(1) "0"
+  ["rows_fetched_from_server_normal"]=>
+  string(1) "0"
+  ["rows_fetched_from_server_ps"]=>
+  string(1) "0"
+  ["rows_buffered_from_client_normal"]=>
+  string(1) "0"
+  ["rows_buffered_from_client_ps"]=>
+  string(1) "0"
+  ["rows_fetched_from_client_normal_buffered"]=>
+  string(1) "0"
+  ["rows_fetched_from_client_normal_unbuffered"]=>
+  string(1) "0"
+  ["rows_fetched_from_client_ps_buffered"]=>
+  string(1) "0"
+  ["rows_fetched_from_client_ps_unbuffered"]=>
+  string(1) "0"
+  ["rows_fetched_from_client_ps_cursor"]=>
+  string(1) "0"
+  ["rows_affected_normal"]=>
+  string(1) "0"
+  ["rows_affected_ps"]=>
+  string(1) "0"
+  ["rows_skipped_normal"]=>
+  string(1) "0"
+  ["rows_skipped_ps"]=>
+  string(1) "0"
+  ["copy_on_write_saved"]=>
+  string(1) "0"
+  ["copy_on_write_performed"]=>
+  string(1) "0"
+  ["command_buffer_too_small"]=>
+  string(1) "0"
+  ["connect_success"]=>
+  string(1) "0"
+  ["connect_failure"]=>
+  string(1) "0"
+  ["connection_reused"]=>
+  string(1) "0"
+  ["reconnect"]=>
+  string(1) "0"
+  ["pconnect_success"]=>
+  string(1) "0"
+  ["active_connections"]=>
+  string(1) "0"
+  ["active_persistent_connections"]=>
+  string(1) "0"
+  ["explicit_close"]=>
+  string(1) "0"
+  ["implicit_close"]=>
+  string(1) "0"
+  ["disconnect_close"]=>
+  string(1) "0"
+  ["in_middle_of_command_close"]=>
+  string(1) "0"
+  ["explicit_free_result"]=>
+  string(1) "0"
+  ["implicit_free_result"]=>
+  string(1) "0"
+  ["explicit_stmt_close"]=>
+  string(1) "0"
+  ["implicit_stmt_close"]=>
+  string(1) "0"
+  ["mem_emalloc_count"]=>
+  string(1) "0"
+  ["mem_emalloc_amount"]=>
+  string(1) "0"
+  ["mem_ecalloc_count"]=>
+  string(1) "0"
+  ["mem_ecalloc_amount"]=>
+  string(1) "0"
+  ["mem_erealloc_count"]=>
+  string(1) "0"
+  ["mem_erealloc_amount"]=>
+  string(1) "0"
+  ["mem_efree_count"]=>
+  string(1) "0"
+  ["mem_efree_amount"]=>
+  string(1) "0"
+  ["mem_malloc_count"]=>
+  string(1) "0"
+  ["mem_malloc_amount"]=>
+  string(1) "0"
+  ["mem_calloc_count"]=>
+  string(%d) "%d"
+  ["mem_calloc_amount"]=>
+  string(%d) "%d"
+  ["mem_realloc_count"]=>
+  string(1) "0"
+  ["mem_realloc_amount"]=>
+  string(1) "0"
+  ["mem_free_count"]=>
+  string(1) "0"
+  ["mem_free_amount"]=>
+  string(1) "0"
+  ["mem_estrndup_count"]=>
+  string(1) "0"
+  ["mem_strndup_count"]=>
+  string(1) "0"
+  ["mem_estrdup_count"]=>
+  string(1) "0"
+  ["mem_strdup_count"]=>
+  string(1) "0"
+  ["mem_edupl_count"]=>
+  string(1) "0"
+  ["mem_dupl_count"]=>
+  string(1) "0"
+  ["proto_text_fetched_null"]=>
+  string(1) "0"
+  ["proto_text_fetched_bit"]=>
+  string(1) "0"
+  ["proto_text_fetched_tinyint"]=>
+  string(1) "0"
+  ["proto_text_fetched_short"]=>
+  string(1) "0"
+  ["proto_text_fetched_int24"]=>
+  string(1) "0"
+  ["proto_text_fetched_int"]=>
+  string(1) "0"
+  ["proto_text_fetched_bigint"]=>
+  string(1) "0"
+  ["proto_text_fetched_decimal"]=>
+  string(1) "0"
+  ["proto_text_fetched_float"]=>
+  string(1) "0"
+  ["proto_text_fetched_double"]=>
+  string(1) "0"
+  ["proto_text_fetched_date"]=>
+  string(1) "0"
+  ["proto_text_fetched_year"]=>
+  string(1) "0"
+  ["proto_text_fetched_time"]=>
+  string(1) "0"
+  ["proto_text_fetched_datetime"]=>
+  string(1) "0"
+  ["proto_text_fetched_timestamp"]=>
+  string(1) "0"
+  ["proto_text_fetched_string"]=>
+  string(1) "0"
+  ["proto_text_fetched_blob"]=>
+  string(1) "0"
+  ["proto_text_fetched_enum"]=>
+  string(1) "0"
+  ["proto_text_fetched_set"]=>
+  string(1) "0"
+  ["proto_text_fetched_geometry"]=>
+  string(1) "0"
+  ["proto_text_fetched_other"]=>
+  string(1) "0"
+  ["proto_binary_fetched_null"]=>
+  string(1) "0"
+  ["proto_binary_fetched_bit"]=>
+  string(1) "0"
+  ["proto_binary_fetched_tinyint"]=>
+  string(1) "0"
+  ["proto_binary_fetched_short"]=>
+  string(1) "0"
+  ["proto_binary_fetched_int24"]=>
+  string(1) "0"
+  ["proto_binary_fetched_int"]=>
+  string(1) "0"
+  ["proto_binary_fetched_bigint"]=>
+  string(1) "0"
+  ["proto_binary_fetched_decimal"]=>
+  string(1) "0"
+  ["proto_binary_fetched_float"]=>
+  string(1) "0"
+  ["proto_binary_fetched_double"]=>
+  string(1) "0"
+  ["proto_binary_fetched_date"]=>
+  string(1) "0"
+  ["proto_binary_fetched_year"]=>
+  string(1) "0"
+  ["proto_binary_fetched_time"]=>
+  string(1) "0"
+  ["proto_binary_fetched_datetime"]=>
+  string(1) "0"
+  ["proto_binary_fetched_timestamp"]=>
+  string(1) "0"
+  ["proto_binary_fetched_string"]=>
+  string(1) "0"
+  ["proto_binary_fetched_json"]=>
+  string(1) "0"
+  ["proto_binary_fetched_blob"]=>
+  string(1) "0"
+  ["proto_binary_fetched_enum"]=>
+  string(1) "0"
+  ["proto_binary_fetched_set"]=>
+  string(1) "0"
+  ["proto_binary_fetched_geometry"]=>
+  string(1) "0"
+  ["proto_binary_fetched_other"]=>
+  string(1) "0"
+  ["init_command_executed_count"]=>
+  string(1) "0"
+  ["init_command_failed_count"]=>
+  string(1) "0"
+  ["com_quit"]=>
+  string(1) "0"
+  ["com_init_db"]=>
+  string(1) "0"
+  ["com_query"]=>
+  string(1) "0"
+  ["com_field_list"]=>
+  string(1) "0"
+  ["com_create_db"]=>
+  string(1) "0"
+  ["com_drop_db"]=>
+  string(1) "0"
+  ["com_refresh"]=>
+  string(1) "0"
+  ["com_shutdown"]=>
+  string(1) "0"
+  ["com_statistics"]=>
+  string(1) "0"
+  ["com_process_info"]=>
+  string(1) "0"
+  ["com_connect"]=>
+  string(1) "0"
+  ["com_process_kill"]=>
+  string(1) "0"
+  ["com_debug"]=>
+  string(1) "0"
+  ["com_ping"]=>
+  string(1) "0"
+  ["com_time"]=>
+  string(1) "0"
+  ["com_delayed_insert"]=>
+  string(1) "0"
+  ["com_change_user"]=>
+  string(1) "0"
+  ["com_binlog_dump"]=>
+  string(1) "0"
+  ["com_table_dump"]=>
+  string(1) "0"
+  ["com_connect_out"]=>
+  string(1) "0"
+  ["com_register_slave"]=>
+  string(1) "0"
+  ["com_stmt_prepare"]=>
+  string(1) "0"
+  ["com_stmt_execute"]=>
+  string(1) "0"
+  ["com_stmt_send_long_data"]=>
+  string(1) "0"
+  ["com_stmt_close"]=>
+  string(1) "0"
+  ["com_stmt_reset"]=>
+  string(1) "0"
+  ["com_stmt_set_option"]=>
+  string(1) "0"
+  ["com_stmt_fetch"]=>
+  string(1) "0"
+  ["com_deamon"]=>
+  string(1) "0"
+  ["bytes_received_real_data_normal"]=>
+  string(1) "0"
+  ["bytes_received_real_data_ps"]=>
+  string(1) "0"
 }
 Testing buffered normal...
 Testing buffered normal... - SELECT id, label FROM test
diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt
index 94e4e8f2e0..1059c3554f 100644
--- a/ext/mysqli/tests/mysqli_kill.phpt
+++ b/ext/mysqli/tests/mysqli_kill.phpt
@@ -82,63 +82,63 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 Warning: mysqli_kill(): processid should have positive value in %s on line %d
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 bool(false)
 object(mysqli)#%d (%d) {
-  [%u|b%"affected_rows"]=>
+  ["affected_rows"]=>
   int(-1)
-  [%u|b%"client_info"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"client_version"]=>
+  ["client_info"]=>
+  string(%d) "%s"
+  ["client_version"]=>
   int(%d)
-  [%u|b%"connect_errno"]=>
+  ["connect_errno"]=>
   int(0)
-  [%u|b%"connect_error"]=>
+  ["connect_error"]=>
   NULL
-  [%u|b%"errno"]=>
+  ["errno"]=>
   int(2006)
-  [%u|b%"error"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"error_list"]=>
+  ["error"]=>
+  string(%d) "%s"
+  ["error_list"]=>
   array(1) {
     [0]=>
     array(3) {
-      [%u|b%"errno"]=>
+      ["errno"]=>
       int(2006)
-      [%u|b%"sqlstate"]=>
-      %unicode|string%(5) "%s"
-      [%u|b%"error"]=>
-      %unicode|string%(%d) "%s"
+      ["sqlstate"]=>
+      string(5) "%s"
+      ["error"]=>
+      string(%d) "%s"
     }
   }
-  [%u|b%"field_count"]=>
+  ["field_count"]=>
   int(0)
-  [%u|b%"host_info"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"info"]=>
+  ["host_info"]=>
+  string(%d) "%s"
+  ["info"]=>
   %s
-  [%u|b%"insert_id"]=>
+  ["insert_id"]=>
   int(0)
-  [%u|b%"server_info"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"server_version"]=>
+  ["server_info"]=>
+  string(%d) "%s"
+  ["server_version"]=>
   int(%d)
-  [%u|b%"stat"]=>
+  ["stat"]=>
   %s
-  [%u|b%"sqlstate"]=>
-  %unicode|string%(5) "HY000"
-  [%u|b%"protocol_version"]=>
+  ["sqlstate"]=>
+  string(5) "HY000"
+  ["protocol_version"]=>
   int(10)
-  [%u|b%"thread_id"]=>
+  ["thread_id"]=>
   int(%d)
-  [%u|b%"warning_count"]=>
+  ["warning_count"]=>
   int(0)
 }
 
 Warning: mysqli_kill(): processid should have positive value in %s on line %d
 array(1) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
+  ["id"]=>
+  string(1) "1"
 }
 
 Warning: mysqli_kill(): processid should have positive value in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
index fcbf4e652e..e42d3b31f3 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
@@ -42,7 +42,7 @@ max_execution_time=12
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"SLEEP(6)"]=>
-  %unicode|string%(1) "0"
+  ["SLEEP(6)"]=>
+  string(1) "0"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
index eb4c431e7d..1d1b3c917f 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
@@ -41,7 +41,7 @@ mysqlnd.net_read_timeout=0
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"SLEEP(2)"]=>
-  %unicode|string%(1) "0"
+  ["SLEEP(2)"]=>
+  string(1) "0"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
index adc267131c..1453d663ba 100644
--- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
@@ -142,20 +142,20 @@ mysqli.max_links=-1
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"it_works"]=>
-  %unicode|string%(2) "ok"
+  ["it_works"]=>
+  string(2) "ok"
 }
 array(1) {
-  [%u|b%"syntax"]=>
-  %unicode|string%(18) "works also with oo"
+  ["syntax"]=>
+  string(18) "works also with oo"
 }
 Flipping phost/host order
 array(1) {
-  [%u|b%"it_works"]=>
-  %unicode|string%(2) "ok"
+  ["it_works"]=>
+  string(2) "ok"
 }
 array(1) {
-  [%u|b%"syntax"]=>
-  %unicode|string%(18) "works also with oo"
+  ["syntax"]=>
+  string(18) "works also with oo"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt
index 5630d4e973..c550f0f495 100644
--- a/ext/mysqli/tests/mysqli_pconn_twice.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt
@@ -67,11 +67,11 @@ mysqli.max_links=-1
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"it_works"]=>
-  %unicode|string%(2) "ok"
+  ["it_works"]=>
+  string(2) "ok"
 }
 array(1) {
-  [%u|b%"syntax"]=>
-  %unicode|string%(18) "works also with oo"
+  ["syntax"]=>
+  string(18) "works also with oo"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_poll_kill.phpt b/ext/mysqli/tests/mysqli_poll_kill.phpt
index c69a251111..84cd0f68b9 100644
--- a/ext/mysqli/tests/mysqli_poll_kill.phpt
+++ b/ext/mysqli/tests/mysqli_poll_kill.phpt
@@ -186,13 +186,13 @@ if (!$IS_MYSQLND)
 To be fixed later. Minor issue about fetching error message from killed line
 --EXPECTF--
 array(1) {
-  [%u|b%"processed before killed"]=>
-  %unicode|string%(1) "1"
+  ["processed before killed"]=>
+  string(1) "1"
 }
 Fetching from thread %d...
 array(1) {
   [1]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
 
 Warning: mysqli_reap_async_query(): Premature end of data (mysqlnd_wireprotocol.c:%d) in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
index 9068f6f708..9d9ef64d91 100644
--- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
+++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
@@ -179,10 +179,10 @@ mysqli_close($link);
 [003] 'UPDATE test SET id = 101 WHERE id > 3' caused 1062
 [003] 'UPDATE_FIX test SET id = 101 WHERE id > 3' caused 1064
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(3) "100"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "z"
+  ["id"]=>
+  string(3) "100"
+  ["label"]=>
+  string(1) "z"
 }
 [009] [2014] %s
 done!
diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt
index a4659c4267..730dc8403b 100644
--- a/ext/mysqli/tests/mysqli_ps_select_union.phpt
+++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt
@@ -253,23 +253,23 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 Using CAST('somestring' AS CHAR)...
-%unicode|string%(3) "one"
-%unicode|string%(5) "three"
-%unicode|string%(3) "two"
+string(3) "one"
+string(5) "three"
+string(3) "two"
 Mixing CAST('somestring'AS CHAR), integer and CAST(integer AS CHAR)...
-%unicode|string%(1) "1"
-%unicode|string%(5) "three"
-%unicode|string%(1) "2"
+string(1) "1"
+string(5) "three"
+string(1) "2"
 Using integer only...
 int(1)
 int(303)
 int(2)
 Testing bind_param(), strings only...
-%unicode|string%(3) "one"
-%unicode|string%(5) "three"
-%unicode|string%(3) "two"
+string(3) "one"
+string(5) "three"
+string(3) "two"
 Testing bind_param(), strings only, with CAST AS CHAR...
-%unicode|string%(3) "one"
-%unicode|string%(32) "three beers are more than enough"
-%unicode|string%(3) "two"
+string(3) "one"
+string(32) "three beers are more than enough"
+string(3) "two"
 done!
diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt
index 73bebe107c..4b1988b631 100644
--- a/ext/mysqli/tests/mysqli_query.phpt
+++ b/ext/mysqli/tests/mysqli_query.phpt
@@ -128,14 +128,14 @@ mysqli_close($link);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"valid"]=>
-  %unicode|string%(30) "this is sql but with semicolon"
+  ["valid"]=>
+  string(30) "this is sql but with semicolon"
 }
 array(1) {
-  [%u|b%""]=>
-  %unicode|string%(1) "a"
+  [""]=>
+  string(1) "a"
 }
-%unicode|string%(1) "a"
+string(1) "a"
 
 Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
index 10bf86bf48..4f4e671f3b 100644
--- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
@@ -165,31 +165,31 @@ mysqli_close($link);
 ?>
 --EXPECTF--
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 array(1) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
+  ["id"]=>
+  string(1) "1"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt
index 5487a1423c..a7540c5426 100644
--- a/ext/mysqli/tests/mysqli_query_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_query_unicode.phpt
@@ -94,8 +94,8 @@ mysqli_close($link);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"правилен"]=>
-  %unicode|string%(%d) "това ескюел, но с точка и запетая"
+  ["правилен"]=>
+  string(%d) "това ескюел, но с точка и запетая"
 }
 
 Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt
index 5477ea1745..a678399838 100644
--- a/ext/mysqli/tests/mysqli_real_connect.phpt
+++ b/ext/mysqli/tests/mysqli_real_connect.phpt
@@ -177,43 +177,43 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 Warning: mysqli_real_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
 object(mysqli)#%d (%d) {
-  [%u|b%"affected_rows"]=>
+  ["affected_rows"]=>
   NULL
-  [%u|b%"client_info"]=>
+  ["client_info"]=>
   %s
-  [%u|b%"client_version"]=>
+  ["client_version"]=>
   int(%d)
-  [%u|b%"connect_errno"]=>
+  ["connect_errno"]=>
   int(%d)
-  [%u|b%"connect_error"]=>
+  ["connect_error"]=>
   NULL
-  [%u|b%"errno"]=>
+  ["errno"]=>
   %s
-  [%u|b%"error"]=>
+  ["error"]=>
   %s
-  [%u|b%"error_list"]=>
+  ["error_list"]=>
   NULL
-  [%u|b%"field_count"]=>
+  ["field_count"]=>
   NULL
-  [%u|b%"host_info"]=>
+  ["host_info"]=>
   NULL
-  [%u|b%"info"]=>
+  ["info"]=>
   NULL
-  [%u|b%"insert_id"]=>
+  ["insert_id"]=>
   NULL
-  [%u|b%"server_info"]=>
+  ["server_info"]=>
   NULL
-  [%u|b%"server_version"]=>
+  ["server_version"]=>
   NULL
-  [%u|b%"stat"]=>
+  ["stat"]=>
   NULL
-  [%u|b%"sqlstate"]=>
+  ["sqlstate"]=>
   NULL
-  [%u|b%"protocol_version"]=>
+  ["protocol_version"]=>
   NULL
-  [%u|b%"thread_id"]=>
+  ["thread_id"]=>
   NULL
-  [%u|b%"warning_count"]=>
+  ["warning_count"]=>
   NULL
 }
 
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
index db1acb4816..a121d5fb8f 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
@@ -59,7 +59,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"label"]=>
-  %unicode|string%(1) "\"
+  ["label"]=>
+  string(1) "\"
 }
 done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt
index 866ad6a9d4..efc3eaa29f 100644
--- a/ext/mysqli/tests/mysqli_real_query.phpt
+++ b/ext/mysqli/tests/mysqli_real_query.phpt
@@ -105,8 +105,8 @@ mysqli_close($link);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"valid"]=>
-  %unicode|string%(30) "this is sql but with semicolon"
+  ["valid"]=>
+  string(30) "this is sql but with semicolon"
 }
 
 Warning: mysqli_real_query(): Couldn't fetch mysqli in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt
index 8cf759cce6..e565e184ee 100644
--- a/ext/mysqli/tests/mysqli_result_references.phpt
+++ b/ext/mysqli/tests/mysqli_result_references.phpt
@@ -84,71 +84,71 @@ require_once('skipifconnectfailure.inc');
 array(7) refcount(2){
   [0]=>
   array(2) refcount(1){
-    [%u|b%"id"]=>
+    ["id"]=>
     int(1)
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a" refcount(%d)
+    ["label"]=>
+    string(1) "a" refcount(%d)
   }
   [1]=>
   array(2) refcount(1){
-    [%u|b%"id"]=>
+    ["id"]=>
     int(2)
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b" refcount(%d)
+    ["label"]=>
+    string(1) "b" refcount(%d)
   }
   [2]=>
   array(2) refcount(1){
-    [%u|b%"id"]=>
+    ["id"]=>
     int(1)
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a" refcount(%d)
+    ["label"]=>
+    string(1) "a" refcount(%d)
   }
   [3]=>
   array(2) refcount(1){
-    [%u|b%"id"]=>
+    ["id"]=>
     int(2)
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b" refcount(%d)
+    ["label"]=>
+    string(1) "b" refcount(%d)
   }
   [4]=>
   array(3) refcount(1){
-    [%u|b%"id"]=>
+    ["id"]=>
     &int(3)
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a" refcount(%d)
-    [%u|b%"id2"]=>
+    ["label"]=>
+    string(1) "a" refcount(%d)
+    ["id2"]=>
     &int(3)
   }
   [5]=>
   array(3) refcount(1){
-    [%u|b%"id"]=>
+    ["id"]=>
     &int(4)
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b" refcount(%d)
-    [%u|b%"id2"]=>
+    ["label"]=>
+    string(1) "b" refcount(%d)
+    ["id2"]=>
     &int(4)
   }
   [6]=>
   &object(mysqli_result)#%d (5) refcount(%d){
-    [%u|b%"current_field"]=>
+    ["current_field"]=>
     NULL
-    [%u|b%"field_count"]=>
+    ["field_count"]=>
     NULL
-    [%u|b%"lengths"]=>
+    ["lengths"]=>
     NULL
-    [%u|b%"num_rows"]=>
+    ["num_rows"]=>
     NULL
-    [%u|b%"type"]=>
+    ["type"]=>
     NULL
   }
 }
 array(1) refcount(2){
   [0]=>
   array(2) refcount(1){
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1" refcount(%d)
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a" refcount(%d)
+    ["id"]=>
+    string(1) "1" refcount(%d)
+    ["label"]=>
+    string(1) "a" refcount(%d)
   }
 }
 done!
diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
index 8de065bffc..7f0a0896d7 100644
--- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
+++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
@@ -56,59 +56,59 @@ if (!$IS_MYSQLND)
 array(1) refcount(%d){
   [0]=>
   array(4) refcount(%d){
-    [%u|b%"row_ref"]=>
+    ["row_ref"]=>
     &NULL
-    [%u|b%"row_copy"]=>
+    ["row_copy"]=>
     array(2) refcount(1){
-      [%u|b%"id"]=>
-      %unicode|string%(1) "1" refcount(%d)
-      [%u|b%"label"]=>
-      %unicode|string%(1) "a" refcount(%d)
+      ["id"]=>
+      string(1) "1" refcount(%d)
+      ["label"]=>
+      string(1) "a" refcount(%d)
     }
-    [%u|b%"id_ref"]=>
-    %unicode|string%(1) "1" refcount(%d)
-    [%u|b%"id_copy"]=>
-    %unicode|string%(1) "1" refcount(%d)
+    ["id_ref"]=>
+    string(1) "1" refcount(%d)
+    ["id_copy"]=>
+    string(1) "1" refcount(%d)
   }
 }
 array(2) refcount(%d){
   [0]=>
   array(4) refcount(%d){
-    [%u|b%"row_ref"]=>
+    ["row_ref"]=>
     &NULL
-    [%u|b%"row_copy"]=>
+    ["row_copy"]=>
     array(2) refcount(%d){
-      [%u|b%"id"]=>
-      %unicode|string%(1) "1" refcount(%d)
-      [%u|b%"label"]=>
-      %unicode|string%(1) "a" refcount(%d)
+      ["id"]=>
+      string(1) "1" refcount(%d)
+      ["label"]=>
+      string(1) "a" refcount(%d)
     }
-    [%u|b%"id_ref"]=>
-    %unicode|string%(1) "1" refcount(%d)
-    [%u|b%"id_copy"]=>
-    %unicode|string%(1) "1" refcount(%d)
+    ["id_ref"]=>
+    string(1) "1" refcount(%d)
+    ["id_copy"]=>
+    string(1) "1" refcount(%d)
   }
   [1]=>
   array(5) refcount(%d){
-    [%u|b%"row_ref"]=>
+    ["row_ref"]=>
     &array(2) refcount(%d){
-      [%u|b%"id"]=>
-      &%unicode|string%(1) "2" refcount(%d)
-      [%u|b%"label"]=>
-      %unicode|string%(1) "b" refcount(%d)
+      ["id"]=>
+      &string(1) "2" refcount(%d)
+      ["label"]=>
+      string(1) "b" refcount(%d)
     }
-    [%u|b%"row_copy"]=>
+    ["row_copy"]=>
     array(2) refcount(%d){
-      [%u|b%"id"]=>
-      %unicode|string%(1) "2" refcount(%d)
-      [%u|b%"label"]=>
-      %unicode|string%(1) "b" refcount(%d)
+      ["id"]=>
+      string(1) "2" refcount(%d)
+      ["label"]=>
+      string(1) "b" refcount(%d)
     }
-    [%u|b%"id_ref"]=>
-    &%unicode|string%(1) "2" refcount(%d)
-    [%u|b%"id_copy"]=>
-    %unicode|string%(1) "2" refcount(%d)
-    [%u|b%"id_copy_mod"]=>
+    ["id_ref"]=>
+    &string(1) "2" refcount(%d)
+    ["id_copy"]=>
+    string(1) "2" refcount(%d)
+    ["id_copy_mod"]=>
     int(2)
   }
 }
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
index 6416e63002..97b15242dc 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
@@ -331,32 +331,32 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 Regular, procedural, using variables
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, procedural, using references for everything
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, object oriented, using references for everything
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, object oriented, using variable for types. using references for bound parameter
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, object oriented, using constant for types. using references for bound parameter
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, procedural, using references for everything but using variable for types
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, procedural, using references for bound parameter, using variables for resource and types
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, procedural, using references for bound parameter, using variables for resource and types
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, procedural, using references for bound parameter, using variable for resource, using constant for types
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 Call user func, procedural, using references for bound parameter, using variable for resource, using constant for types, array
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
index e7bce112af..bc189dea3f 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
@@ -69,41 +69,41 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 Test 1:
 object(foo)#%d (1) {
-  [%u|b%"bar"]=>
-  %unicode|string%(%d) "фубар"
+  ["bar"]=>
+  string(%d) "фубар"
 }
 object(foo)#%d (1) {
-  [%u|b%"bar"]=>
-  &%unicode|string%(%d) "фубар"
+  ["bar"]=>
+  &string(%d) "фубар"
 }
 фубар
 
 Test 2:
 object(foo)#%d (1) {
-  [%u|b%"bar"]=>
-  %unicode|string%(%d) "фубар"
+  ["bar"]=>
+  string(%d) "фубар"
 }
 ---
 object(foo)#%d (1) {
-  [%u|b%"bar"]=>
-  &%unicode|string%(%d) "фубар"
+  ["bar"]=>
+  &string(%d) "фубар"
 }
 ---
 object(foo)#%d (1) {
-  [%u|b%"bar"]=>
-  &%unicode|string%(%d) "фубар"
+  ["bar"]=>
+  &string(%d) "фубар"
 }
 ---
 фубар - 0
 
 Test 3:
 object(foo)#%d (1) {
-  [%u|b%"bar"]=>
-  %unicode|string%(%d) "фубар"
+  ["bar"]=>
+  string(%d) "фубар"
 }
 object(foo)#%d (1) {
-  [%u|b%"bar"]=>
-  &%unicode|string%(%d) "фубар"
+  ["bar"]=>
+  &string(%d) "фубар"
 }
 0 - фубар
 
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
index b8efec5eca..fec6a3f8df 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
@@ -248,67 +248,67 @@ require_once('skipifconnectfailure.inc');
 --EXPECTF--
 plain vanilla...
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 reference, one level...
 int(1)
 int(1)
-%unicode|string%(1) "a"
-%unicode|string%(1) "a"
+string(1) "a"
+string(1) "a"
 reference, two levels...
 int(1)
 int(1)
 int(1)
-%unicode|string%(1) "a"
-%unicode|string%(1) "a"
-%unicode|string%(1) "a"
+string(1) "a"
+string(1) "a"
+string(1) "a"
 reference, $GLOBALS...
 int(1)
 int(1)
-%unicode|string%(1) "a"
-%unicode|string%(1) "a"
+string(1) "a"
+string(1) "a"
 reference, same target...
-%unicode|string%(1) "a"
-%unicode|string%(1) "a"
+string(1) "a"
+string(1) "a"
 reference, simple object...
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 reference, simple object w reference...
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 reference, simple object w reference, change after bind...
 int(1)
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 int(1)
 reference, one level, change after bind...
 int(1)
 int(1)
-%unicode|string%(1) "a"
-%unicode|string%(1) "a"
+string(1) "a"
+string(1) "a"
 reference, circle...
 int(1)
-%unicode|string%(1) "a"
-%unicode|string%(1) "a"
+string(1) "a"
+string(1) "a"
 reference, object, forward declaration...
 int(1)
 object(bar)#%d (2) {
-  [%u|b%"bar"]=>
-  &%unicode|string%(1) "a"
-  [%u|b%"foo"]=>
-  &%unicode|string%(1) "a"
+  ["bar"]=>
+  &string(1) "a"
+  ["foo"]=>
+  &string(1) "a"
 }
-%unicode|string%(1) "a"
+string(1) "a"
 references, object, private...
 int(1)
-%unicode|string%(1) "a"
+string(1) "a"
 object(mega_bar)#5 (4) {
   [%s]=>
   &int(1)
-  [%u|b%"id_ref"]=>
+  ["id_ref"]=>
   &int(1)
-  [%u|b%"bar"]=>
-  &%unicode|string%(1) "a"
-  [%u|b%"foo"]=>
-  &%unicode|string%(1) "a"
+  ["bar"]=>
+  &string(1) "a"
+  ["foo"]=>
+  &string(1) "a"
 }
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
index b23f94d81e..3380f0edbb 100644
--- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
@@ -81,7 +81,7 @@ NULL
 ALTER
 bool(true)
 bool(false)
-%unicode|string%(34) "Unknown column 'a' in 'field list'"
+string(34) "Unknown column 'a' in 'field list'"
 ---- Row 1
 bool(false)
 int(2)
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
index fe18be40c3..58d7c2fa72 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
@@ -171,15 +171,15 @@ Warning: mysqli_stmt_get_result(): invalid object or resource mysqli_stmt
 [038] [2014] [Commands out of sync; you can't run this command now]
 [039] [0] []
 array(2) {
-  [%u|b%"id"]=>
+  ["id"]=>
   int(1)
-  [%u|b%"label"]=>
+  ["label"]=>
   %s(1) "a"
 }
 array(2) {
-  [%u|b%"id"]=>
+  ["id"]=>
   int(2)
-  [%u|b%"label"]=>
+  ["label"]=>
   %s(1) "b"
 }
 
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
index 8c2aad1f12..48f7ed8f30 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
@@ -157,17 +157,17 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --EXPECTF--
 array(2) {
-  [%u|b%"id"]=>
+  ["id"]=>
   int(1)
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["label"]=>
+  string(1) "a"
 }
 NULL
 array(2) {
-  [%u|b%"id"]=>
+  ["id"]=>
   int(1)
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["label"]=>
+  string(1) "a"
 }
 NULL
 [017] [2014] Commands out of sync; you can't run this command now
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
index 86898807ad..879e87f0d8 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
@@ -211,10 +211,10 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --EXPECTF--
 array(2) {
-  [%u|b%"id"]=>
+  ["id"]=>
   int(1)
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["label"]=>
+  string(1) "a"
 }
 NULL
 bool(false)
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
index 739bf56ea1..5481db04f4 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
@@ -67,115 +67,115 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --EXPECTF--
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "id"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "test"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(49155)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"orgname"]=>
-  %unicode|string%(5) "label"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(5) "label"
+  ["orgname"]=>
+  string(5) "label"
+  ["table"]=>
+  string(4) "test"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(%d)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(0)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(254)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(3) "_id"
-  [%u|b%"orgname"]=>
-  %unicode|string%(0) ""
-  [%u|b%"table"]=>
-  %unicode|string%(0) ""
-  [%u|b%"orgtable"]=>
-  %unicode|string%(0) ""
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(0) ""
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(3) "_id"
+  ["orgname"]=>
+  string(0) ""
+  ["table"]=>
+  string(0) ""
+  ["orgtable"]=>
+  string(0) ""
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(0) ""
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(32897)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(8)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 object(stdClass)#%d (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(8) "___label"
-  [%u|b%"orgname"]=>
-  %unicode|string%(0) ""
-  [%u|b%"table"]=>
-  %unicode|string%(0) ""
-  [%u|b%"orgtable"]=>
-  %unicode|string%(0) ""
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(0) ""
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(8) "___label"
+  ["orgname"]=>
+  string(0) ""
+  ["table"]=>
+  string(0) ""
+  ["orgtable"]=>
+  string(0) ""
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(0) ""
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(%d)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(%d)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(%d)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(0)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(253)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(31)
 }
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
index a38706f1a1..5fd76a2628 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
@@ -102,31 +102,31 @@ require_once('skipifconnectfailure.inc');
 Warning: mysqli_stmt_result_metadata(): invalid object or resource mysqli_stmt
  in %s on line %d
 object(stdClass)#5 (13) {
-  [%u|b%"name"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"orgname"]=>
-  %unicode|string%(2) "id"
-  [%u|b%"table"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"orgtable"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"def"]=>
-  %unicode|string%(0) ""
-  [%u|b%"db"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"catalog"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"max_length"]=>
+  ["name"]=>
+  string(2) "id"
+  ["orgname"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "test"
+  ["orgtable"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["db"]=>
+  string(%d) "%s"
+  ["catalog"]=>
+  string(%d) "%s"
+  ["max_length"]=>
   int(0)
-  [%u|b%"length"]=>
+  ["length"]=>
   int(11)
-  [%u|b%"charsetnr"]=>
+  ["charsetnr"]=>
   int(63)
-  [%u|b%"flags"]=>
+  ["flags"]=>
   int(49155)
-  [%u|b%"type"]=>
+  ["type"]=>
   int(3)
-  [%u|b%"decimals"]=>
+  ["decimals"]=>
   int(0)
 }
 
diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
index af069af533..dfdddf88c0 100644
--- a/ext/odbc/tests/odbc_exec_001.phpt
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -28,11 +28,11 @@ odbc_exec($conn, NULL);
 
 ?>
 --EXPECTF--
-Warning: odbc_exec() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: odbc_exec() expects parameter 3 to be integer, string given in %s on line %d
 
 Warning: odbc_exec(): SQL error: %s in %s on line %d
 
-Warning: odbc_exec() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: odbc_exec() expects parameter 3 to be integer, string given in %s on line %d
 
 Warning: odbc_exec(): SQL error: %s in %s on line %d
 
diff --git a/ext/pdo/tests/pdo_036.phpt b/ext/pdo/tests/pdo_036.phpt
index 1bf369b33b..21c8241c99 100644
--- a/ext/pdo/tests/pdo_036.phpt
+++ b/ext/pdo/tests/pdo_036.phpt
@@ -16,7 +16,7 @@ var_dump($x);
 ?>
 --EXPECTF--
 object(PDOStatement)#%d (1) {
-  [%u|b%"queryString"]=>
+  ["queryString"]=>
   NULL
 }
 
diff --git a/ext/pdo_mysql/tests/bug44327.phpt b/ext/pdo_mysql/tests/bug44327.phpt
index f82c4302d8..1952cce050 100644
--- a/ext/pdo_mysql/tests/bug44327.phpt
+++ b/ext/pdo_mysql/tests/bug44327.phpt
@@ -42,22 +42,22 @@ $db = MySQLPDOTest::factory();
 ?>
 --EXPECTF--
 object(PDORow)#%d (2) {
-  [%u|b%"queryString"]=>
-  %unicode|string%(17) "SELECT 1 AS "one""
-  [%u|b%"one"]=>
-  %unicode|string%(1) "1"
+  ["queryString"]=>
+  string(17) "SELECT 1 AS "one""
+  ["one"]=>
+  string(1) "1"
 }
-%unicode|string%(1) "1"
-%unicode|string%(1) "1"
-%unicode|string%(17) "SELECT 1 AS "one""
+string(1) "1"
+string(1) "1"
+string(17) "SELECT 1 AS "one""
 ----------------------------------
 object(PDORow)#%d (2) {
-  [%u|b%"queryString"]=>
-  %unicode|string%(19) "SELECT id FROM test"
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
+  ["queryString"]=>
+  string(19) "SELECT id FROM test"
+  ["id"]=>
+  string(1) "1"
 }
-%unicode|string%(19) "SELECT id FROM test"
+string(19) "SELECT id FROM test"
 ----------------------------------
 
 Notice: Trying to get property of non-object in %s on line %d
diff --git a/ext/pdo_mysql/tests/bug46292.phpt b/ext/pdo_mysql/tests/bug46292.phpt
index 249345f0c2..6a430a4dfb 100644
--- a/ext/pdo_mysql/tests/bug46292.phpt
+++ b/ext/pdo_mysql/tests/bug46292.phpt
@@ -59,24 +59,24 @@ $db->exec('DROP TABLE IF EXISTS testz');
 bool(true)
 myclass::__construct()
 object(myclass)#%d (1) {
-  [%u|b%"value"]=>
-  %unicode|string%(1) "1"
+  ["value"]=>
+  string(1) "1"
 }
 myclass::__construct()
 object(myclass2)#%d (1) {
-  [%u|b%"value"]=>
-  %unicode|string%(1) "2"
+  ["value"]=>
+  string(1) "2"
 }
 myclass::__construct()
 array(2) {
   [0]=>
   object(myclass)#%d (1) {
-    [%u|b%"value"]=>
+    ["value"]=>
     NULL
   }
   [1]=>
   object(stdClass)#%d (1) {
-    [%u|b%"value"]=>
+    ["value"]=>
     NULL
   }
 }
diff --git a/ext/pdo_mysql/tests/bug_33689.phpt b/ext/pdo_mysql/tests/bug_33689.phpt
index 5969cae6a6..bd193fa9ac 100644
--- a/ext/pdo_mysql/tests/bug_33689.phpt
+++ b/ext/pdo_mysql/tests/bug_33689.phpt
@@ -41,8 +41,8 @@ MySQLPDOTest::dropTestTable();
 ?>
 --EXPECTF--
 object(PDOStatement)#%d (1) {
-  [%u|b%"queryString"]=>
-  %unicode|string%(18) "SELECT * from test"
+  ["queryString"]=>
+  string(18) "SELECT * from test"
 }
 Array
 (
diff --git a/ext/pdo_mysql/tests/bug_39858.phpt b/ext/pdo_mysql/tests/bug_39858.phpt
index cb9cafd9f5..896519f8ab 100644
--- a/ext/pdo_mysql/tests/bug_39858.phpt
+++ b/ext/pdo_mysql/tests/bug_39858.phpt
@@ -75,30 +75,30 @@ Emulated Prepared Statements...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"2 * 2"]=>
-    %unicode|string%(1) "4"
+    ["2 * 2"]=>
+    string(1) "4"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"2 * 2"]=>
-    %unicode|string%(1) "4"
+    ["2 * 2"]=>
+    string(1) "4"
   }
 }
 Native Prepared Statements...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"2 * 2"]=>
-    %unicode|string%(1) "4"
+    ["2 * 2"]=>
+    string(1) "4"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"2 * 2"]=>
-    %unicode|string%(1) "4"
+    ["2 * 2"]=>
+    string(1) "4"
   }
 }
 done!
diff --git a/ext/pdo_mysql/tests/bug_41698.phpt b/ext/pdo_mysql/tests/bug_41698.phpt
index 890ba77617..e23aac2a55 100644
--- a/ext/pdo_mysql/tests/bug_41698.phpt
+++ b/ext/pdo_mysql/tests/bug_41698.phpt
@@ -26,12 +26,12 @@ var_dump($db->query('SELECT * from test')->fetchAll(PDO::FETCH_ASSOC));
 array(2) {
   [0]=>
   array(1) {
-    [%u|b%"floatval"]=>
-    %unicode|string%(8) "2.340000"
+    ["floatval"]=>
+    string(8) "2.340000"
   }
   [1]=>
   array(1) {
-    [%u|b%"floatval"]=>
-    %unicode|string%(8) "4.560000"
+    ["floatval"]=>
+    string(8) "4.560000"
   }
 }
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt
index 56cbe4b087..f001eec7d0 100644
--- a/ext/pdo_mysql/tests/bug_41997.phpt
+++ b/ext/pdo_mysql/tests/bug_41997.phpt
@@ -42,13 +42,13 @@ print "done!";
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"one"]=>
-    %unicode|string%(1) "1"
+    ["one"]=>
+    string(1) "1"
   }
 }
 array(3) {
   [0]=>
-  %unicode|string%(5) "00000"
+  string(5) "00000"
   [1]=>
   NULL
   [2]=>
@@ -57,13 +57,13 @@ array(3) {
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"two"]=>
-    %unicode|string%(1) "2"
+    ["two"]=>
+    string(1) "2"
   }
 }
 array(3) {
   [0]=>
-  %unicode|string%(5) "00000"
+  string(5) "00000"
   [1]=>
   NULL
   [2]=>
diff --git a/ext/pdo_mysql/tests/bug_42499.phpt b/ext/pdo_mysql/tests/bug_42499.phpt
index 4ce497ebf9..e218e0c14e 100644
--- a/ext/pdo_mysql/tests/bug_42499.phpt
+++ b/ext/pdo_mysql/tests/bug_42499.phpt
@@ -61,8 +61,8 @@ Emulated Prepared Statements...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_id"]=>
-    %unicode|string%(1) "a"
+    ["_id"]=>
+    string(1) "a"
   }
 }
 
@@ -71,8 +71,8 @@ Native Prepared Statements...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_id"]=>
-    %unicode|string%(1) "a"
+    ["_id"]=>
+    string(1) "a"
   }
 }
 
diff --git a/ext/pdo_mysql/tests/bug_44707.phpt b/ext/pdo_mysql/tests/bug_44707.phpt
index 18c81040fe..90dc4c20f4 100644
--- a/ext/pdo_mysql/tests/bug_44707.phpt
+++ b/ext/pdo_mysql/tests/bug_44707.phpt
@@ -83,10 +83,10 @@ array(0) {
 array(1) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"mybool"]=>
-    %unicode|string%(1) "0"
+    ["id"]=>
+    string(1) "1"
+    ["mybool"]=>
+    string(1) "0"
   }
 }
 done!
diff --git a/ext/pdo_mysql/tests/bug_pecl_12925.phpt b/ext/pdo_mysql/tests/bug_pecl_12925.phpt
index dc6933d4b9..25281fe31c 100644
--- a/ext/pdo_mysql/tests/bug_pecl_12925.phpt
+++ b/ext/pdo_mysql/tests/bug_pecl_12925.phpt
@@ -47,16 +47,16 @@ Emulated...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "c"
+    ["id"]=>
+    string(1) "c"
   }
 }
 Native...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "c"
+    ["id"]=>
+    string(1) "c"
   }
 }
 done!
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/bug_pecl_7976.phpt b/ext/pdo_mysql/tests/bug_pecl_7976.phpt
index 5f585bd013..9efba0d537 100644
--- a/ext/pdo_mysql/tests/bug_pecl_7976.phpt
+++ b/ext/pdo_mysql/tests/bug_pecl_7976.phpt
@@ -63,30 +63,30 @@ Emulated...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_one"]=>
-    %unicode|string%(1) "1"
+    ["_one"]=>
+    string(1) "1"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_one"]=>
-    %unicode|string%(1) "1"
+    ["_one"]=>
+    string(1) "1"
   }
 }
 Native...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_one"]=>
-    %unicode|string%(1) "1"
+    ["_one"]=>
+    string(1) "1"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_one"]=>
-    %unicode|string%(1) "1"
+    ["_one"]=>
+    string(1) "1"
   }
 }
 done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
index 8ce8af4a85..cdbc02b645 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
@@ -90,82 +90,82 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc';
 MySQLPDOTest::dropTestTable();
 ?>
 --EXPECTF--
-%unicode|string%(15) "PDO::CASE_LOWER"
+string(15) "PDO::CASE_LOWER"
 array(2) {
   [0]=>
   array(6) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"id_upper"]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
+    ["id_upper"]=>
+    string(1) "1"
     [1]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
     [2]=>
-    %unicode|string%(1) "a"
+    string(1) "a"
   }
   [1]=>
   array(6) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    ["id"]=>
+    string(1) "2"
     [0]=>
-    %unicode|string%(1) "2"
-    [%u|b%"id_upper"]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
+    ["id_upper"]=>
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
     [2]=>
-    %unicode|string%(1) "b"
+    string(1) "b"
   }
 }
 array(2) {
   [0]=>
   array(10) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"id_upper"]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
+    ["id_upper"]=>
+    string(1) "1"
     [1]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
     [2]=>
-    %unicode|string%(1) "a"
-    [%u|b%"mixed"]=>
+    string(1) "a"
+    ["mixed"]=>
     NULL
     [3]=>
     NULL
-    [%u|b%"myupper"]=>
+    ["myupper"]=>
     NULL
     [4]=>
     NULL
   }
   [1]=>
   array(10) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    ["id"]=>
+    string(1) "2"
     [0]=>
-    %unicode|string%(1) "2"
-    [%u|b%"id_upper"]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
+    ["id_upper"]=>
+    string(1) "2"
     [1]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
     [2]=>
-    %unicode|string%(1) "b"
-    [%u|b%"mixed"]=>
+    string(1) "b"
+    ["mixed"]=>
     NULL
     [3]=>
     NULL
-    [%u|b%"myupper"]=>
+    ["myupper"]=>
     NULL
     [4]=>
     NULL
@@ -174,23 +174,23 @@ array(2) {
 array(1) {
   [0]=>
   array(10) {
-    [%u|b%"ID"]=>
-    %unicode|string%(1) "1"
+    ["ID"]=>
+    string(1) "1"
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"LABEL"]=>
-    %unicode|string%(1) "a"
+    string(1) "1"
+    ["LABEL"]=>
+    string(1) "a"
     [1]=>
-    %unicode|string%(1) "a"
-    [%u|b%"MIXED"]=>
+    string(1) "a"
+    ["MIXED"]=>
     NULL
     [2]=>
     NULL
-    [%u|b%"MYUPPER"]=>
+    ["MYUPPER"]=>
     NULL
     [3]=>
     NULL
-    [%u|b%"LOWER"]=>
+    ["LOWER"]=>
     NULL
     [4]=>
     NULL
@@ -199,26 +199,26 @@ array(1) {
 array(1) {
   [0]=>
   array(10) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
     [1]=>
-    %unicode|string%(1) "a"
-    [%u|b%"MiXeD"]=>
+    string(1) "a"
+    ["MiXeD"]=>
     NULL
     [2]=>
     NULL
-    [%u|b%"MYUPPER"]=>
+    ["MYUPPER"]=>
     NULL
     [3]=>
     NULL
-    [%u|b%"ID"]=>
-    %unicode|string%(1) "1"
+    ["ID"]=>
+    string(1) "1"
     [4]=>
-    %unicode|string%(1) "1"
+    string(1) "1"
   }
 }
 done!
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
index 8661dda597..108a7c3984 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
@@ -27,5 +27,5 @@ $db = MySQLPDOTest::factory();
 	print "done!";
 ?>
 --EXPECTF--
-%unicode|string%(5) "mysql"
+string(5) "mysql"
 done!
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt
index b9a4fc934d..cc13ec03d3 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt
@@ -28,15 +28,15 @@ MySQLPDOTest::skip();
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"test.label"]=>
-    %unicode|string%(1) "a"
+    ["test.label"]=>
+    string(1) "a"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["label"]=>
+    string(1) "a"
   }
 }
 done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
index 89e6f386e5..4ef6e52976 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
@@ -36,13 +36,13 @@ error_reporting=E_ALL
 	print "done!";
 ?>
 --EXPECTF--
-%unicode|string%(58) "CREATE TABLE test_%s(id INT)"
-%unicode|string%(5) "00000"
+string(58) "CREATE TABLE test_%s(id INT)"
+string(5) "00000"
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
   }
 }
 done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
index 182080440b..cc8dab5a14 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
@@ -87,35 +87,35 @@ MySQLPDOTest::skip();
 array(1) {
   [0]=>
   array(6) {
-    [%u|b%"z"]=>
+    ["z"]=>
     NULL
-    [%u|b%"a"]=>
+    ["a"]=>
     NULL
-    [%u|b%"b"]=>
-    %unicode|string%(1) " "
-    [%u|b%"c"]=>
+    ["b"]=>
+    string(1) " "
+    ["c"]=>
     NULL
-    [%u|b%"d"]=>
-    %unicode|string%(2) " d"
-    [%u|b%"e"]=>
-    %unicode|string%(3) "%se"
+    ["d"]=>
+    string(2) " d"
+    ["e"]=>
+    string(3) "%se"
   }
 }
 array(1) {
   [0]=>
   array(6) {
-    [%u|b%"z"]=>
+    ["z"]=>
     NULL
-    [%u|b%"a"]=>
-    %unicode|string%(0) ""
-    [%u|b%"b"]=>
-    %unicode|string%(1) " "
-    [%u|b%"c"]=>
-    %unicode|string%(0) ""
-    [%u|b%"d"]=>
-    %unicode|string%(2) " d"
-    [%u|b%"e"]=>
-    %unicode|string%(3) "%se"
+    ["a"]=>
+    string(0) ""
+    ["b"]=>
+    string(1) " "
+    ["c"]=>
+    string(0) ""
+    ["d"]=>
+    string(2) " d"
+    ["e"]=>
+    string(3) "%se"
   }
 }
 done!
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
index fb336ba627..6955e0a173 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
@@ -110,7 +110,7 @@ $db = MySQLPDOTest::factory();
 --EXPECTF--
 array(1) {
   [0]=>
-  %unicode|string%(12) "PDOStatement"
+  string(12) "PDOStatement"
 }
 
 Warning: PDO::setAttribute(): SQLSTATE[HY000]: General error: PDO::ATTR_STATEMENT_CLASS requires format array(classname, array(ctor_args)); the classname must be a string specifying an existing class in %s on line %d
@@ -126,29 +126,29 @@ Warning: PDO::setAttribute(): SQLSTATE[HY000]: General error: user-supplied stat
 Warning: PDO::setAttribute(): SQLSTATE[HY000]: General error in %s on line %d
 array(2) {
   [0]=>
-  %unicode|string%(12) "mystatement4"
+  string(12) "mystatement4"
   [1]=>
   array(1) {
     [0]=>
-    %unicode|string%(6) "param1"
+    string(6) "param1"
   }
 }
 mystatement4
-%unicode|string%(6) "param1"
+string(6) "param1"
 mystatement5
-%unicode|string%(12) "mystatement5"
-%unicode|string%(10) "no data :)"
+string(12) "mystatement5"
+string(10) "no data :)"
 array(1) {
   [0]=>
   array(4) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
     [0]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
     [1]=>
-    %unicode|string%(1) "a"
+    string(1) "a"
   }
 }
 
diff --git a/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt b/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
index ac9f8a3114..3fd9827ff2 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
@@ -188,19 +188,19 @@ MySQLPDOTest::dropTestTable();
 ?>
 --EXPECTF--
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "a"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
 }
 bool(false)
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(1) "1"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "z"
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "z"
 }
 [026] Autocommit mode of the MySQL Server should be off, got '1', [0] 00000
 [028] I'm confused, how can autocommit be on? Didn't I say I want to manually control transactions?
-%unicode|string%(5) "00000"
+string(5) "00000"
 done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
index 899231a217..587ac9f2e2 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
@@ -55,10 +55,10 @@ $db->exec('DROP TABLE IF EXISTS test');
 ?>
 --EXPECTF--
 array(2) {
-  [%u|b%"id"]=>
-  %unicode|string%(2) "20"
-  [%u|b%"label"]=>
-  %unicode|string%(1) "1"
+  ["id"]=>
+  string(2) "20"
+  ["label"]=>
+  string(1) "1"
 }
 int(1)
 done!
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt b/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
index da886390c0..a508459e55 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
@@ -62,27 +62,27 @@ $db = MySQLPDOTest::factory();
 [002] Suspicious FETCH_BOTH result, dumping
 array(2) {
   [0]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [1]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
 array(2) {
   [1]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
 [002] Expected differes from returned data, dumping
 array(2) {
   [0]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [1]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
 array(2) {
   [1]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
   [2]=>
-  %unicode|string%(1) "1"
+  string(1) "1"
 }
 done!
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt
index b2db0d9eed..f8340f7753 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt
@@ -329,91 +329,91 @@ PDO's PS parser has some problems with invalid SQL and crashes from time to time
 (check with valgrind...)
 --EXPECTF--
 array(1) {
-  [%u|b%"one"]=>
-  %unicode|string%(1) "1"
+  ["one"]=>
+  string(1) "1"
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(12) ":placeholder"
+    ["label"]=>
+    string(12) ":placeholder"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(12) ":placeholder"
+    ["label"]=>
+    string(12) ":placeholder"
   }
 }
 array(2) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(9) "first row"
+    ["label"]=>
+    string(9) "first row"
   }
   [1]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(10) "second row"
+    ["label"]=>
+    string(10) "second row"
   }
 }
 array(2) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(3) "row"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(3) "row"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(3) "row"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(3) "row"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(1) "?"
+    ["label"]=>
+    string(1) "?"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(1) "?"
+    ["label"]=>
+    string(1) "?"
   }
 }
 array(2) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(9) "first row"
+    ["label"]=>
+    string(9) "first row"
   }
   [1]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(10) "second row"
+    ["label"]=>
+    string(10) "second row"
   }
 }
 array(2) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(3) "row"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(3) "row"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(3) "row"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(3) "row"
   }
 }
 done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt
index c6b299e076..0ac614e4cc 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt
@@ -68,10 +68,10 @@ $db->exec('DROP TABLE IF EXISTS test');
 array(1) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "?"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "?"
   }
 }
 now the same with native PS
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt
index 9028f0b49f..9254568db0 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt
@@ -68,7 +68,7 @@ MySQLPDOTest::dropTestTable();
 Testing emulated PS...
 array(3) {
   [0]=>
-  %unicode|string%(0) ""
+  string(0) ""
   [1]=>
   NULL
   [2]=>
@@ -78,26 +78,26 @@ array(3) {
 Warning: PDOStatement::execute(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.ihopeitdoesnotexist' doesn't exist in %s on line %d
 array(3) {
   [0]=>
-  %unicode|string%(5) "42S02"
+  string(5) "42S02"
   [1]=>
   int(1146)
   [2]=>
-  %unicode|string%(%d) "Table '%s.ihopeitdoesnotexist' doesn't exist"
+  string(%d) "Table '%s.ihopeitdoesnotexist' doesn't exist"
 }
 
 Warning: PDOStatement::execute(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.test' doesn't exist in %s on line %d
 bool(false)
 array(3) {
   [0]=>
-  %unicode|string%(5) "42S02"
+  string(5) "42S02"
   [1]=>
   int(1146)
   [2]=>
-  %unicode|string%(%d) "Table '%s.test' doesn't exist"
+  string(%d) "Table '%s.test' doesn't exist"
 }
 array(3) {
   [0]=>
-  %unicode|string%(5) "00000"
+  string(5) "00000"
   [1]=>
   NULL
   [2]=>
@@ -109,7 +109,7 @@ Warning: PDO::prepare(): SQLSTATE[42S02]: Base table or view not found: 1146 Tab
 bool(false)
 array(3) {
   [0]=>
-  %unicode|string%(0) ""
+  string(0) ""
   [1]=>
   NULL
   [2]=>
@@ -119,15 +119,15 @@ array(3) {
 Warning: PDOStatement::execute(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.test' doesn't exist in %s on line %d
 array(3) {
   [0]=>
-  %unicode|string%(5) "42S02"
+  string(5) "42S02"
   [1]=>
   int(1146)
   [2]=>
-  %unicode|string%(%d) "Table '%s.test' doesn't exist"
+  string(%d) "Table '%s.test' doesn't exist"
 }
 array(3) {
   [0]=>
-  %unicode|string%(5) "00000"
+  string(5) "00000"
   [1]=>
   NULL
   [2]=>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
index f098ba15f5..f23f9572c1 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
@@ -128,24 +128,24 @@ myclass::serialize()
 Unserializing the previously serialized object...
 myclass::unserialize('Data from serialize')
 object(myclass)#4 (1) {
-  [%u|b%"myprotected":protected]=>
-  %unicode|string%(19) "a protected propery"
+  ["myprotected":protected]=>
+  string(19) "a protected propery"
 }
 
 Using PDO::FETCH_CLASS|PDO::FETCH_SERIALIZE to fetch the object from DB and unserialize it...
 myclass::unserialize('C:7:"myclass":19:{Data from serialize}')
 object(myclass)#%d (1) {
-  [%u|b%"myprotected":protected]=>
-  %unicode|string%(19) "a protected propery"
+  ["myprotected":protected]=>
+  string(19) "a protected propery"
 }
 
 Using PDO::FETCH_CLASS to fetch the object from DB and unserialize it...
 myclass::__set(myobj, 'C:7:"myclass":19:{Data from serialize}')
 myclass::__construct(PDO shall call __construct())
 object(myclass)#%d (2) {
-  [%u|b%"myprotected":protected]=>
-  %unicode|string%(19) "a protected propery"
-  [%u|b%"myobj"]=>
-  %unicode|string%(38) "C:7:"myclass":19:{Data from serialize}"
+  ["myprotected":protected]=>
+  string(19) "a protected propery"
+  ["myobj"]=>
+  string(38) "C:7:"myclass":19:{Data from serialize}"
 }
 done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
index 2e278b1afb..e35f95a86f 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
@@ -97,13 +97,13 @@ myclass::__set(null, -NULL-) 3
 myclass::__set(, -''-) 4
 myclass::__construct(2, 3): 12 / 4
 object(myclass)#%d (4) {
-  [%u|b%"set_calls":"myclass":private]=>
+  ["set_calls":"myclass":private]=>
   int(4)
-  [%u|b%"grp":protected]=>
+  ["grp":protected]=>
   NULL
-  [%u|b%"id"]=>
-  %unicode|string%(1) "3"
-  [%u|b%"null"]=>
+  ["id"]=>
+  string(1) "3"
+  ["null"]=>
   NULL
 }
 done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
index db92e40a93..65989898fd 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -60,7 +60,7 @@ MySQLPDOTest::dropTestTable();
 Emulated Prepared Statements...
 array(3) {
   [0]=>
-  %unicode|string%(5) "00000"
+  string(5) "00000"
   [1]=>
   NULL
   [2]=>
@@ -69,13 +69,13 @@ array(3) {
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["label"]=>
+    string(1) "a"
   }
 }
 array(3) {
   [0]=>
-  %unicode|string%(5) "00000"
+  string(5) "00000"
   [1]=>
   NULL
   [2]=>
@@ -84,15 +84,15 @@ array(3) {
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["label"]=>
+    string(1) "a"
   }
 }
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["label"]=>
+    string(1) "a"
   }
 }
 Native Prepared Statements...
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
index 9165e70551..e971ce9513 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
@@ -118,98 +118,98 @@ Emulated PS...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_version"]=>
-    %unicode|string%(%d) "%s"
+    ["_version"]=>
+    string(%d) "%s"
   }
 }
 bool(false)
 array(3) {
   [0]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
   }
   [1]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    ["id"]=>
+    string(1) "2"
   }
   [2]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "3"
+    ["id"]=>
+    string(1) "3"
   }
 }
 array(3) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "3"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "c"
+    ["id"]=>
+    string(1) "3"
+    ["label"]=>
+    string(1) "c"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
   }
   [2]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 bool(false)
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_version"]=>
-    %unicode|string%(%d) "%s"
+    ["_version"]=>
+    string(%d) "%s"
   }
 }
 bool(false)
 array(3) {
   [0]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
   }
   [1]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    ["id"]=>
+    string(1) "2"
   }
   [2]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "3"
+    ["id"]=>
+    string(1) "3"
   }
 }
 array(3) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "3"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "c"
+    ["id"]=>
+    string(1) "3"
+    ["label"]=>
+    string(1) "c"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
   }
   [2]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 bool(false)
@@ -217,98 +217,98 @@ Native PS...
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_version"]=>
-    %unicode|string%(%d) "%s"
+    ["_version"]=>
+    string(%d) "%s"
   }
 }
 bool(false)
 array(3) {
   [0]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
   }
   [1]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    ["id"]=>
+    string(1) "2"
   }
   [2]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "3"
+    ["id"]=>
+    string(1) "3"
   }
 }
 array(3) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "3"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "c"
+    ["id"]=>
+    string(1) "3"
+    ["label"]=>
+    string(1) "c"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
   }
   [2]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 bool(false)
 array(1) {
   [0]=>
   array(1) {
-    [%u|b%"_version"]=>
-    %unicode|string%(%d) "%s"
+    ["_version"]=>
+    string(%d) "%s"
   }
 }
 bool(false)
 array(3) {
   [0]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
   }
   [1]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    ["id"]=>
+    string(1) "2"
   }
   [2]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "3"
+    ["id"]=>
+    string(1) "3"
   }
 }
 array(3) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "3"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "c"
+    ["id"]=>
+    string(1) "3"
+    ["label"]=>
+    string(1) "c"
   }
   [1]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "b"
+    ["id"]=>
+    string(1) "2"
+    ["label"]=>
+    string(1) "b"
   }
   [2]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 bool(false)
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
index f051403d82..4c4148d5bb 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
@@ -121,19 +121,19 @@ Buffered...
 array(1) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 array(1) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 Unbuffered...
@@ -148,37 +148,37 @@ array(0) {
 array(1) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 array(1) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 array(1) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 array(1) {
   [0]=>
   array(2) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
-    [%u|b%"label"]=>
-    %unicode|string%(1) "a"
+    ["id"]=>
+    string(1) "1"
+    ["label"]=>
+    string(1) "a"
   }
 }
 done!
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt b/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt
index a717a0b13f..773537b12c 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt
@@ -87,13 +87,13 @@ query('SELECT * FROM test ORDER BY id ASC')
 array(2) {
   [0]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "1"
+    ["id"]=>
+    string(1) "1"
   }
   [1]=>
   array(1) {
-    [%u|b%"id"]=>
-    %unicode|string%(1) "2"
+    ["id"]=>
+    string(1) "2"
   }
 }
 bool(false)
diff --git a/ext/pdo_mysql/tests/pecl_bug_5780.phpt b/ext/pdo_mysql/tests/pecl_bug_5780.phpt
index 59842846d3..3f3bf966b9 100644
--- a/ext/pdo_mysql/tests/pecl_bug_5780.phpt
+++ b/ext/pdo_mysql/tests/pecl_bug_5780.phpt
@@ -36,14 +36,14 @@ $db->exec('DROP TABLE IF EXISTS test2');
 --EXPECTF--
 array(2) {
   [0]=>
-  %unicode|string%(7) "testing"
+  string(7) "testing"
   [1]=>
-  %unicode|string%(7) "testing"
+  string(7) "testing"
 }
 bool(true)
 array(2) {
   [0]=>
-  %unicode|string%(5) "00000"
+  string(5) "00000"
   [1]=>
   NULL
 }
diff --git a/ext/pdo_mysql/tests/pecl_bug_5802.phpt b/ext/pdo_mysql/tests/pecl_bug_5802.phpt
index 04aa2c9552..088b4ed5e1 100644
--- a/ext/pdo_mysql/tests/pecl_bug_5802.phpt
+++ b/ext/pdo_mysql/tests/pecl_bug_5802.phpt
@@ -44,18 +44,18 @@ $db->exec('DROP TABLE IF EXISTS test');
 array(3) {
   [0]=>
   array(1) {
-    [%u|b%"bar"]=>
-    %unicode|string%(3) "foo"
+    ["bar"]=>
+    string(3) "foo"
   }
   [1]=>
   array(1) {
-    [%u|b%"bar"]=>
+    ["bar"]=>
     NULL
   }
   [2]=>
   array(1) {
-    [%u|b%"bar"]=>
-    %unicode|string%(3) "qaz"
+    ["bar"]=>
+    string(3) "qaz"
   }
 }
 done!
\ No newline at end of file
diff --git a/ext/pdo_sqlite/tests/bug48773.phpt b/ext/pdo_sqlite/tests/bug48773.phpt
index b8bdea9185..c9a2f64bef 100644
--- a/ext/pdo_sqlite/tests/bug48773.phpt
+++ b/ext/pdo_sqlite/tests/bug48773.phpt
@@ -29,6 +29,6 @@ var_dump($stmt);
 ?>
 --EXPECTF--
 object(bar)#%d (1) {
-  [%u|b%"queryString"]=>
-  %unicode|string%(8) "SELECT 1"
+  ["queryString"]=>
+  string(8) "SELECT 1"
 }
diff --git a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
index c8cdee6f69..ea6f22c054 100644
--- a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
+++ b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
@@ -74,12 +74,12 @@ var_dump($st->fetchAll(PDO::FETCH_FUNC, array('bar', 'inexistent')));
 ?>
 --EXPECTF--
 object(PDOStatement)#%d (1) {
-  [%u|b%"queryString"]=>
+  ["queryString"]=>
   %string|unicode%(21) "SELECT * FROM testing"
 }
 data: 1, php
 object(PDOStatement)#%d (1) {
-  [%u|b%"queryString"]=>
+  ["queryString"]=>
   %string|unicode%(21) "SELECT * FROM testing"
 }
 data: 2, 
diff --git a/ext/phar/tests/cache_list/frontcontroller21.phpt b/ext/phar/tests/cache_list/frontcontroller21.phpt
index 0b5953acf0..9766b6e771 100644
--- a/ext/phar/tests/cache_list/frontcontroller21.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller21.phpt
@@ -16,7 +16,7 @@ files/frontcontroller12.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-%unicode|string%(10) "/index.php"
+string(10) "/index.php"
 string(10) "/index.php"
 string(%d) "phar://%sfrontcontroller21.php/index.php"
 string(18) "/index.php?test=hi"
diff --git a/ext/phar/tests/frontcontroller21.phpt b/ext/phar/tests/frontcontroller21.phpt
index 6520abecae..2dad6cae0d 100644
--- a/ext/phar/tests/frontcontroller21.phpt
+++ b/ext/phar/tests/frontcontroller21.phpt
@@ -15,7 +15,7 @@ files/frontcontroller12.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-%unicode|string%(10) "/index.php"
+string(10) "/index.php"
 string(10) "/index.php"
 string(%d) "phar://%sfrontcontroller21.php/index.php"
 string(18) "/index.php?test=hi"
diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt
index b85c1eb497..827c5688c7 100644
--- a/ext/phar/tests/frontcontroller22.phpt
+++ b/ext/phar/tests/frontcontroller22.phpt
@@ -13,8 +13,8 @@ files/frontcontroller13.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-%unicode|string%(4) "test"
-%unicode|string%(12) "oof/test.php"
+string(4) "test"
+string(12) "oof/test.php"
 
 Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d
 
diff --git a/ext/phar/tests/ini_set.phpt b/ext/phar/tests/ini_set.phpt
index 13ec88ab11..4ddc9794f9 100644
--- a/ext/phar/tests/ini_set.phpt
+++ b/ext/phar/tests/ini_set.phpt
@@ -20,11 +20,11 @@ var_dump(ini_get('phar.readonly'));
 __HALT_COMPILER();
 ?>
 --EXPECTF--
-%unicode|string%(1) "1"
-%unicode|string%(1) "1"
-%unicode|string%(1) "1"
-%unicode|string%(1) "1"
+string(1) "1"
+string(1) "1"
+string(1) "1"
+string(1) "1"
 bool(false)
 bool(false)
-%unicode|string%(1) "1"
-%unicode|string%(1) "1"
+string(1) "1"
+string(1) "1"
diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt
index 0fb3db8cda..556123a853 100644
--- a/ext/phar/tests/phar_bz2.phpt
+++ b/ext/phar/tests/phar_bz2.phpt
@@ -55,8 +55,8 @@ echo $e->getMessage(),"\n";
 @unlink(dirname(__FILE__) . '/phar_bz2.2.phar');
 ?>
 --EXPECTF--
-%unicode|string%(9) "it worked"
-%unicode|string%(%d) "phar://%sphar_bz2.phar/tar_004.php"
+string(9) "it worked"
+string(%d) "phar://%sphar_bz2.phar/tar_004.php"
 bool(true)
 bool(true)
 
diff --git a/ext/phar/tests/tar/frontcontroller21.phar.phpt b/ext/phar/tests/tar/frontcontroller21.phar.phpt
index 31bb61edab..a067de7835 100644
--- a/ext/phar/tests/tar/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller21.phar.phpt
@@ -15,7 +15,7 @@ files/frontcontroller12.phar.tar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-%unicode|string%(10) "/index.php"
+string(10) "/index.php"
 string(10) "/index.php"
 string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
 string(18) "/index.php?test=hi"
diff --git a/ext/phar/tests/zip/frontcontroller21.phar.phpt b/ext/phar/tests/zip/frontcontroller21.phar.phpt
index 143b83659a..eb1c7861f7 100644
--- a/ext/phar/tests/zip/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller21.phar.phpt
@@ -16,7 +16,7 @@ files/frontcontroller12.phar.zip
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-%unicode|string%(10) "/index.php"
+string(10) "/index.php"
 string(10) "/index.php"
 string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
 string(18) "/index.php?test=hi"
diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt
index 833fed4aa5..cbd7319731 100644
--- a/ext/reflection/tests/002.phpt
+++ b/ext/reflection/tests/002.phpt
@@ -50,14 +50,14 @@ var_dump($r->bar);
 ===DONE===
 --EXPECTF--
 ReflectionMethodEx::__construct
-%unicode|string%(26) "ReflectionFunctionAbstract"
-%unicode|string%(7) "getName"
-%unicode|string%(3) "xyz"
+string(26) "ReflectionFunctionAbstract"
+string(7) "getName"
+string(3) "xyz"
 NULL
 Cannot set read-only property ReflectionMethodEx::$class
 Cannot set read-only property ReflectionMethodEx::$name
-%unicode|string%(26) "ReflectionFunctionAbstract"
-%unicode|string%(7) "getName"
-%unicode|string%(3) "bar"
-%unicode|string%(3) "baz"
+string(26) "ReflectionFunctionAbstract"
+string(7) "getName"
+string(3) "bar"
+string(3) "baz"
 ===DONE===
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
index 2f2d790f68..780b558cc7 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
@@ -48,121 +48,121 @@ foreach($classes as $class) {
 --EXPECTF--
 Reflecting on class pubf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class subpubf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class protf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class subprotf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class privf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class subprivf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "f"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "f"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
index 1e11dee2f3..7d4b6774c2 100644
--- a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
@@ -40,101 +40,101 @@ Reflecting on class pubf:
 array(2) {
   [0]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "f"
-    [%u|b%"class"]=>
-    %unicode|string%(4) "pubf"
+    ["name"]=>
+    string(1) "f"
+    ["class"]=>
+    string(4) "pubf"
   }
   [1]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(4) "pubf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(4) "pubf"
   }
 }
 Reflecting on class subpubf: 
 array(2) {
   [0]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "f"
-    [%u|b%"class"]=>
-    %unicode|string%(4) "pubf"
+    ["name"]=>
+    string(1) "f"
+    ["class"]=>
+    string(4) "pubf"
   }
   [1]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(4) "pubf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(4) "pubf"
   }
 }
 Reflecting on class protf: 
 array(2) {
   [0]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "f"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "protf"
+    ["name"]=>
+    string(1) "f"
+    ["class"]=>
+    string(5) "protf"
   }
   [1]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "protf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(5) "protf"
   }
 }
 Reflecting on class subprotf: 
 array(2) {
   [0]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "f"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "protf"
+    ["name"]=>
+    string(1) "f"
+    ["class"]=>
+    string(5) "protf"
   }
   [1]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "protf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(5) "protf"
   }
 }
 Reflecting on class privf: 
 array(2) {
   [0]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "f"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "privf"
+    ["name"]=>
+    string(1) "f"
+    ["class"]=>
+    string(5) "privf"
   }
   [1]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "privf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(5) "privf"
   }
 }
 Reflecting on class subprivf: 
 array(2) {
   [0]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "f"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "privf"
+    ["name"]=>
+    string(1) "f"
+    ["class"]=>
+    string(5) "privf"
   }
   [1]=>
   object(ReflectionMethod)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "privf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(5) "privf"
   }
 }
diff --git a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
index cd4a29d450..ed0b160b93 100644
--- a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
@@ -40,85 +40,85 @@ Reflecting on class pubf:
 array(2) {
   [0]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "a"
-    [%u|b%"class"]=>
-    %unicode|string%(4) "pubf"
+    ["name"]=>
+    string(1) "a"
+    ["class"]=>
+    string(4) "pubf"
   }
   [1]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(4) "pubf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(4) "pubf"
   }
 }
 Reflecting on class subpubf: 
 array(2) {
   [0]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "a"
-    [%u|b%"class"]=>
-    %unicode|string%(4) "pubf"
+    ["name"]=>
+    string(1) "a"
+    ["class"]=>
+    string(4) "pubf"
   }
   [1]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(4) "pubf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(4) "pubf"
   }
 }
 Reflecting on class protf: 
 array(2) {
   [0]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "a"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "protf"
+    ["name"]=>
+    string(1) "a"
+    ["class"]=>
+    string(5) "protf"
   }
   [1]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "protf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(5) "protf"
   }
 }
 Reflecting on class subprotf: 
 array(2) {
   [0]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "a"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "protf"
+    ["name"]=>
+    string(1) "a"
+    ["class"]=>
+    string(5) "protf"
   }
   [1]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "protf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(5) "protf"
   }
 }
 Reflecting on class privf: 
 array(2) {
   [0]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "a"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "privf"
+    ["name"]=>
+    string(1) "a"
+    ["class"]=>
+    string(5) "privf"
   }
   [1]=>
   object(ReflectionProperty)#%d (2) {
-    [%u|b%"name"]=>
-    %unicode|string%(1) "s"
-    [%u|b%"class"]=>
-    %unicode|string%(5) "privf"
+    ["name"]=>
+    string(1) "s"
+    ["class"]=>
+    string(5) "privf"
   }
 }
 Reflecting on class subprivf: 
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
index 9e174b749e..fca68ed30f 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
@@ -61,85 +61,85 @@ foreach($classes as $class) {
 --EXPECTF--
 Reflecting on class pubf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "a"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "a"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class subpubf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "a"
-  [%u|b%"class"]=>
-  %unicode|string%(4) "pubf"
+  ["name"]=>
+  string(1) "a"
+  ["class"]=>
+  string(4) "pubf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class protf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "a"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "a"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class subprotf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "a"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "protf"
+  ["name"]=>
+  string(1) "a"
+  ["class"]=>
+  string(5) "protf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class privf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "a"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "a"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class subprivf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(1) "s"
-  [%u|b%"class"]=>
-  %unicode|string%(5) "privf"
+  ["name"]=>
+  string(1) "s"
+  ["class"]=>
+  string(5) "privf"
 }
   --> Check for a: Property a does not exist
   --> Check for A: Property A does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
index 515d9860ba..16c0c306ba 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
@@ -97,146 +97,146 @@ showInfo("doesntexist::doesntExist");
 --EXPECTF--
 --- (Reflecting on pubA) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubA"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(4) "pubA"
+  ["class"]=>
+  string(1) "A"
 }
-%unicode|string%(9) "pubA in A"
+string(9) "pubA in A"
 --- (Reflecting on protA) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protA"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(5) "protA"
+  ["class"]=>
+  string(1) "A"
 }
 Cannot access non-public member C::protA
 --- (Reflecting on privA) ---
 Property privA does not exist
 --- (Reflecting on pubB) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubB"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(4) "pubB"
+  ["class"]=>
+  string(1) "B"
 }
-%unicode|string%(9) "pubB in B"
+string(9) "pubB in B"
 --- (Reflecting on protB) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protB"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(5) "protB"
+  ["class"]=>
+  string(1) "B"
 }
 Cannot access non-public member C::protB
 --- (Reflecting on privB) ---
 Property privB does not exist
 --- (Reflecting on pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "C"
 }
-%unicode|string%(9) "pubC in C"
+string(9) "pubC in C"
 --- (Reflecting on protC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(5) "protC"
+  ["class"]=>
+  string(1) "C"
 }
 Cannot access non-public member C::protC
 --- (Reflecting on privC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "privC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(5) "privC"
+  ["class"]=>
+  string(1) "C"
 }
 Cannot access non-public member C::privC
 --- (Reflecting on doesntExist) ---
 Property doesntExist does not exist
 --- (Reflecting on A::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "A"
 }
-%unicode|string%(9) "pubC in A"
+string(9) "pubC in A"
 --- (Reflecting on A::protC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(5) "protC"
+  ["class"]=>
+  string(1) "A"
 }
 Cannot access non-public member A::protC
 --- (Reflecting on A::privC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "privC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(5) "privC"
+  ["class"]=>
+  string(1) "A"
 }
 Cannot access non-public member A::privC
 --- (Reflecting on B::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "B"
 }
-%unicode|string%(9) "pubC in B"
+string(9) "pubC in B"
 --- (Reflecting on B::protC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(5) "protC"
+  ["class"]=>
+  string(1) "B"
 }
 Cannot access non-public member B::protC
 --- (Reflecting on B::privC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "privC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(5) "privC"
+  ["class"]=>
+  string(1) "B"
 }
 Cannot access non-public member B::privC
 --- (Reflecting on c::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "C"
 }
-%unicode|string%(9) "pubC in C"
+string(9) "pubC in C"
 --- (Reflecting on c::PUBC) ---
 Property PUBC does not exist
 --- (Reflecting on C::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "C"
 }
-%unicode|string%(9) "pubC in C"
+string(9) "pubC in C"
 --- (Reflecting on C::protC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(5) "protC"
+  ["class"]=>
+  string(1) "C"
 }
 Cannot access non-public member C::protC
 --- (Reflecting on C::privC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "privC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(5) "privC"
+  ["class"]=>
+  string(1) "C"
 }
 Cannot access non-public member C::privC
 --- (Reflecting on X::pubC) ---
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
index 1070d57ce4..89335f42c4 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
@@ -97,146 +97,146 @@ showInfo("doesntexist::doesntExist");
 --EXPECTF--
 --- (Reflecting on pubA) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubA"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(4) "pubA"
+  ["class"]=>
+  string(1) "A"
 }
-%unicode|string%(9) "pubA in A"
+string(9) "pubA in A"
 --- (Reflecting on protA) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protA"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(5) "protA"
+  ["class"]=>
+  string(1) "A"
 }
 Cannot access non-public member C::protA
 --- (Reflecting on privA) ---
 Property privA does not exist
 --- (Reflecting on pubB) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubB"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(4) "pubB"
+  ["class"]=>
+  string(1) "B"
 }
-%unicode|string%(9) "pubB in B"
+string(9) "pubB in B"
 --- (Reflecting on protB) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protB"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(5) "protB"
+  ["class"]=>
+  string(1) "B"
 }
 Cannot access non-public member C::protB
 --- (Reflecting on privB) ---
 Property privB does not exist
 --- (Reflecting on pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "C"
 }
-%unicode|string%(9) "pubC in C"
+string(9) "pubC in C"
 --- (Reflecting on protC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(5) "protC"
+  ["class"]=>
+  string(1) "C"
 }
 Cannot access non-public member C::protC
 --- (Reflecting on privC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "privC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(5) "privC"
+  ["class"]=>
+  string(1) "C"
 }
 Cannot access non-public member C::privC
 --- (Reflecting on doesntExist) ---
 Property doesntExist does not exist
 --- (Reflecting on A::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "A"
 }
-%unicode|string%(9) "pubC in C"
+string(9) "pubC in C"
 --- (Reflecting on A::protC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(5) "protC"
+  ["class"]=>
+  string(1) "A"
 }
 Cannot access non-public member A::protC
 --- (Reflecting on A::privC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "privC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "A"
+  ["name"]=>
+  string(5) "privC"
+  ["class"]=>
+  string(1) "A"
 }
 Cannot access non-public member A::privC
 --- (Reflecting on B::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "B"
 }
-%unicode|string%(9) "pubC in C"
+string(9) "pubC in C"
 --- (Reflecting on B::protC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(5) "protC"
+  ["class"]=>
+  string(1) "B"
 }
 Cannot access non-public member B::protC
 --- (Reflecting on B::privC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "privC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "B"
+  ["name"]=>
+  string(5) "privC"
+  ["class"]=>
+  string(1) "B"
 }
 Cannot access non-public member B::privC
 --- (Reflecting on c::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "C"
 }
-%unicode|string%(9) "pubC in C"
+string(9) "pubC in C"
 --- (Reflecting on c::PUBC) ---
 Property PUBC does not exist
 --- (Reflecting on C::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(4) "pubC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(4) "pubC"
+  ["class"]=>
+  string(1) "C"
 }
-%unicode|string%(9) "pubC in C"
+string(9) "pubC in C"
 --- (Reflecting on C::protC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "protC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(5) "protC"
+  ["class"]=>
+  string(1) "C"
 }
 Cannot access non-public member C::protC
 --- (Reflecting on C::privC) ---
 object(ReflectionProperty)#%d (2) {
-  [%u|b%"name"]=>
-  %unicode|string%(5) "privC"
-  [%u|b%"class"]=>
-  %unicode|string%(1) "C"
+  ["name"]=>
+  string(5) "privC"
+  ["class"]=>
+  string(1) "C"
 }
 Cannot access non-public member C::privC
 --- (Reflecting on X::pubC) ---
diff --git a/ext/session/tests/rfc1867.phpt b/ext/session/tests/rfc1867.phpt
index 6b14bcb4ef..b194c63e86 100644
--- a/ext/session/tests/rfc1867.phpt
+++ b/ext/session/tests/rfc1867.phpt
@@ -54,76 +54,76 @@ session_destroy();
 string(%d) "rfc1867-tests"
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(5) {
-  [%u|b%"start_time"]=>
+  ["start_time"]=>
   int(%d)
-  [%u|b%"content_length"]=>
+  ["content_length"]=>
   int(%d)
-  [%u|b%"bytes_processed"]=>
+  ["bytes_processed"]=>
   int(%d)
-  [%u|b%"done"]=>
+  ["done"]=>
   bool(true)
-  [%u|b%"files"]=>
+  ["files"]=>
   array(2) {
     [0]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file1"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file1.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file1"
+      ["name"]=>
+      string(9) "file1.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
     [1]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file2"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file2.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file2"
+      ["name"]=>
+      string(9) "file2.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
   }
diff --git a/ext/session/tests/rfc1867_cleanup.phpt b/ext/session/tests/rfc1867_cleanup.phpt
index f84385bada..69922be2f8 100644
--- a/ext/session/tests/rfc1867_cleanup.phpt
+++ b/ext/session/tests/rfc1867_cleanup.phpt
@@ -54,30 +54,30 @@ session_destroy();
 string(%d) "rfc1867-tests"
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/ext/session/tests/rfc1867_disabled.phpt b/ext/session/tests/rfc1867_disabled.phpt
index 550ee3a7a2..d894758142 100644
--- a/ext/session/tests/rfc1867_disabled.phpt
+++ b/ext/session/tests/rfc1867_disabled.phpt
@@ -47,30 +47,30 @@ session_destroy();
 --EXPECTF--
 string(%d) "rfc1867-tests"
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/ext/session/tests/rfc1867_disabled_2.phpt b/ext/session/tests/rfc1867_disabled_2.phpt
index 83e97eeed1..b26736742f 100644
--- a/ext/session/tests/rfc1867_disabled_2.phpt
+++ b/ext/session/tests/rfc1867_disabled_2.phpt
@@ -47,30 +47,30 @@ session_destroy();
 --EXPECTF--
 string(%d) "rfc1867-tests"
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/ext/session/tests/rfc1867_inter.phpt b/ext/session/tests/rfc1867_inter.phpt
index 4d9b262230..2385f00132 100644
--- a/ext/session/tests/rfc1867_inter.phpt
+++ b/ext/session/tests/rfc1867_inter.phpt
@@ -57,76 +57,76 @@ session_destroy();
 --EXPECTF--
 string(%d) "rfc1867-tests"
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(5) {
-  [%u|b%"start_time"]=>
+  ["start_time"]=>
   int(%d)
-  [%u|b%"content_length"]=>
+  ["content_length"]=>
   int(%d)
-  [%u|b%"bytes_processed"]=>
+  ["bytes_processed"]=>
   int(%d)
-  [%u|b%"done"]=>
+  ["done"]=>
   bool(true)
-  [%u|b%"files"]=>
+  ["files"]=>
   array(2) {
     [0]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file1"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file1.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file1"
+      ["name"]=>
+      string(9) "file1.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
     [1]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file2"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file2.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file2"
+      ["name"]=>
+      string(9) "file2.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
   }
diff --git a/ext/session/tests/rfc1867_no_name.phpt b/ext/session/tests/rfc1867_no_name.phpt
index d68a61d929..0b1d36e491 100644
--- a/ext/session/tests/rfc1867_no_name.phpt
+++ b/ext/session/tests/rfc1867_no_name.phpt
@@ -47,30 +47,30 @@ session_destroy();
 --EXPECTF--
 string(%d) "rfc1867-tests"
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/ext/session/tests/rfc1867_sid_cookie.phpt b/ext/session/tests/rfc1867_sid_cookie.phpt
index 2864799335..542d1b8c65 100644
--- a/ext/session/tests/rfc1867_sid_cookie.phpt
+++ b/ext/session/tests/rfc1867_sid_cookie.phpt
@@ -53,76 +53,76 @@ session_destroy();
 string(%d) "rfc1867-tests"
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(5) {
-  [%u|b%"start_time"]=>
+  ["start_time"]=>
   int(%d)
-  [%u|b%"content_length"]=>
+  ["content_length"]=>
   int(%d)
-  [%u|b%"bytes_processed"]=>
+  ["bytes_processed"]=>
   int(%d)
-  [%u|b%"done"]=>
+  ["done"]=>
   bool(true)
-  [%u|b%"files"]=>
+  ["files"]=>
   array(2) {
     [0]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file1"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file1.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file1"
+      ["name"]=>
+      string(9) "file1.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
     [1]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file2"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file2.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file2"
+      ["name"]=>
+      string(9) "file2.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
   }
diff --git a/ext/session/tests/rfc1867_sid_get.phpt b/ext/session/tests/rfc1867_sid_get.phpt
index e3a48a1c13..f9c489699a 100644
--- a/ext/session/tests/rfc1867_sid_get.phpt
+++ b/ext/session/tests/rfc1867_sid_get.phpt
@@ -51,76 +51,76 @@ session_destroy();
 string(%d) "rfc1867-tests"
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(5) {
-  [%u|b%"start_time"]=>
+  ["start_time"]=>
   int(%d)
-  [%u|b%"content_length"]=>
+  ["content_length"]=>
   int(%d)
-  [%u|b%"bytes_processed"]=>
+  ["bytes_processed"]=>
   int(%d)
-  [%u|b%"done"]=>
+  ["done"]=>
   bool(true)
-  [%u|b%"files"]=>
+  ["files"]=>
   array(2) {
     [0]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file1"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file1.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file1"
+      ["name"]=>
+      string(9) "file1.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
     [1]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file2"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file2.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file2"
+      ["name"]=>
+      string(9) "file2.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
   }
diff --git a/ext/session/tests/rfc1867_sid_get_2.phpt b/ext/session/tests/rfc1867_sid_get_2.phpt
index e21ca4ca2b..f5e4acd9a3 100644
--- a/ext/session/tests/rfc1867_sid_get_2.phpt
+++ b/ext/session/tests/rfc1867_sid_get_2.phpt
@@ -53,76 +53,76 @@ session_destroy();
 string(%d) "rfc1867-tests"
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(5) {
-  [%u|b%"start_time"]=>
+  ["start_time"]=>
   int(%d)
-  [%u|b%"content_length"]=>
+  ["content_length"]=>
   int(%d)
-  [%u|b%"bytes_processed"]=>
+  ["bytes_processed"]=>
   int(%d)
-  [%u|b%"done"]=>
+  ["done"]=>
   bool(true)
-  [%u|b%"files"]=>
+  ["files"]=>
   array(2) {
     [0]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file1"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file1.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file1"
+      ["name"]=>
+      string(9) "file1.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
     [1]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file2"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file2.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file2"
+      ["name"]=>
+      string(9) "file2.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
   }
diff --git a/ext/session/tests/rfc1867_sid_invalid.phpt b/ext/session/tests/rfc1867_sid_invalid.phpt
index 5f337dba0c..60abd270f9 100644
--- a/ext/session/tests/rfc1867_sid_invalid.phpt
+++ b/ext/session/tests/rfc1867_sid_invalid.phpt
@@ -61,30 +61,30 @@ Warning: Unknown: Failed to write session data (files). Please verify that the c
 string(%d) ""
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/ext/session/tests/rfc1867_sid_only_cookie.phpt b/ext/session/tests/rfc1867_sid_only_cookie.phpt
index 41f6761fb9..1254f8e64f 100644
--- a/ext/session/tests/rfc1867_sid_only_cookie.phpt
+++ b/ext/session/tests/rfc1867_sid_only_cookie.phpt
@@ -53,76 +53,76 @@ session_destroy();
 string(%d) "rfc1867-tests"
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(5) {
-  [%u|b%"start_time"]=>
+  ["start_time"]=>
   int(%d)
-  [%u|b%"content_length"]=>
+  ["content_length"]=>
   int(%d)
-  [%u|b%"bytes_processed"]=>
+  ["bytes_processed"]=>
   int(%d)
-  [%u|b%"done"]=>
+  ["done"]=>
   bool(true)
-  [%u|b%"files"]=>
+  ["files"]=>
   array(2) {
     [0]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file1"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file1.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file1"
+      ["name"]=>
+      string(9) "file1.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
     [1]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file2"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file2.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file2"
+      ["name"]=>
+      string(9) "file2.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
   }
diff --git a/ext/session/tests/rfc1867_sid_only_cookie_2.phpt b/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
index e705314d69..8b7d710f37 100644
--- a/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
+++ b/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
@@ -50,30 +50,30 @@ session_destroy();
 string(%d) "%s"
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/ext/session/tests/rfc1867_sid_post.phpt b/ext/session/tests/rfc1867_sid_post.phpt
index 107957f8db..eaa9e1813a 100644
--- a/ext/session/tests/rfc1867_sid_post.phpt
+++ b/ext/session/tests/rfc1867_sid_post.phpt
@@ -49,76 +49,76 @@ session_destroy();
 string(%d) "rfc1867-tests"
 bool(true)
 array(2) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(5) {
-  [%u|b%"start_time"]=>
+  ["start_time"]=>
   int(%d)
-  [%u|b%"content_length"]=>
+  ["content_length"]=>
   int(%d)
-  [%u|b%"bytes_processed"]=>
+  ["bytes_processed"]=>
   int(%d)
-  [%u|b%"done"]=>
+  ["done"]=>
   bool(true)
-  [%u|b%"files"]=>
+  ["files"]=>
   array(2) {
     [0]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file1"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file1.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file1"
+      ["name"]=>
+      string(9) "file1.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
     [1]=>
     array(7) {
-      [%u|b%"field_name"]=>
-      %unicode|string%(5) "file2"
-      [%u|b%"name"]=>
-      %unicode|string%(9) "file2.txt"
-      [%u|b%"tmp_name"]=>
-      %unicode|string%(%d) "%s"
-      [%u|b%"error"]=>
+      ["field_name"]=>
+      string(5) "file2"
+      ["name"]=>
+      string(9) "file2.txt"
+      ["tmp_name"]=>
+      string(%d) "%s"
+      ["error"]=>
       int(0)
-      [%u|b%"done"]=>
+      ["done"]=>
       bool(true)
-      [%u|b%"start_time"]=>
+      ["start_time"]=>
       int(%d)
-      [%u|b%"bytes_processed"]=>
+      ["bytes_processed"]=>
       int(1)
     }
   }
diff --git a/ext/snmp/tests/bug64124.phpt b/ext/snmp/tests/bug64124.phpt
index 454b06dcf1..8b29a38c59 100644
--- a/ext/snmp/tests/bug64124.phpt
+++ b/ext/snmp/tests/bug64124.phpt
@@ -32,9 +32,9 @@ var_dump(snmpget($checkvar, $community, '.1.3.6.1.2.1.1.1.0'));
 var_dump(($checkvar === $hostname6_port));
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 bool(true)
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 bool(true)
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 bool(true)
diff --git a/ext/snmp/tests/ipv6.phpt b/ext/snmp/tests/ipv6.phpt
index f5239e1178..aaa3304e87 100644
--- a/ext/snmp/tests/ipv6.phpt
+++ b/ext/snmp/tests/ipv6.phpt
@@ -23,7 +23,7 @@ var_dump(snmpget($hostname6_port, $community, '.1.3.6.1.2.1.1.1.0'));
 var_dump(snmpget('[dead:beef::', $community, '.1.3.6.1.2.1.1.1.0'));
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 
 Warning: snmpget(): malformed IPv6 address, closing square bracket missing in %s on line %d
 bool(false)
\ No newline at end of file
diff --git a/ext/snmp/tests/snmp2_get.phpt b/ext/snmp/tests/snmp2_get.phpt
index e50f9aff03..1463d94901 100644
--- a/ext/snmp/tests/snmp2_get.phpt
+++ b/ext/snmp/tests/snmp2_get.phpt
@@ -60,18 +60,18 @@ Warning: snmp2_get(): Got empty OID array in %s on line %d
 bool(false)
 Checking working
 Single OID
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID in array
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 Multiple OID
 array(2) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   ["%s"]=>
-  %unicode|string%(%d) "%d"
+  string(%d) "%d"
 }
 More error handling
 Single OID
@@ -100,5 +100,5 @@ Multiple OID
 Warning: snmp2_get(): Error in packet at 'SNMPv2-MIB::sysUpTime.220': No Such Instance currently exists at this OID in %s on line %d
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
diff --git a/ext/snmp/tests/snmp2_getnext.phpt b/ext/snmp/tests/snmp2_getnext.phpt
index 5c5abf428e..45701cbd13 100644
--- a/ext/snmp/tests/snmp2_getnext.phpt
+++ b/ext/snmp/tests/snmp2_getnext.phpt
@@ -24,16 +24,16 @@ var_dump(snmp2_getnext($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.
 ?>
 --EXPECTF--
 Single OID
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID in array
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 Multiple OID
 array(2) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   ["%s"]=>
-  %unicode|string%(%d) "%d"
+  string(%d) "%d"
 }
diff --git a/ext/snmp/tests/snmp2_real_walk.phpt b/ext/snmp/tests/snmp2_real_walk.phpt
index e9159d6429..a255a763f2 100644
--- a/ext/snmp/tests/snmp2_real_walk.phpt
+++ b/ext/snmp/tests/snmp2_real_walk.phpt
@@ -59,12 +59,12 @@ Warning: snmp2_real_walk() expects parameter 5 to be integer, %s given in %s on
 bool(false)
 Checking working
 Single OID
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
 string(%d) "%s"
 string(%d) "%s"
 Single OID in array
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
 string(%d) "%s"
 string(%d) "%s"
diff --git a/ext/snmp/tests/snmp2_walk.phpt b/ext/snmp/tests/snmp2_walk.phpt
index 1d2195688c..6d03693dac 100644
--- a/ext/snmp/tests/snmp2_walk.phpt
+++ b/ext/snmp/tests/snmp2_walk.phpt
@@ -67,16 +67,16 @@ Warning: snmp2_walk() expects parameter 5 to be integer, %s given in %s on line
 bool(false)
 Checking working
 Single OID
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
-%unicode|string%(6) "string"
-%unicode|string%(6) "string"
+string(6) "string"
+string(6) "string"
 Single OID in array
-%unicode|string%(5) "array"
-%unicode|string%(6) "string"
+string(5) "array"
+string(6) "string"
 Default OID
-%unicode|string%(5) "array"
-%unicode|string%(6) "string"
+string(5) "array"
+string(6) "string"
 More error handling
 Single incorrect OID
 
diff --git a/ext/snmp/tests/snmpget.phpt b/ext/snmp/tests/snmpget.phpt
index 7bbb64ed0c..576bef14e0 100644
--- a/ext/snmp/tests/snmpget.phpt
+++ b/ext/snmp/tests/snmpget.phpt
@@ -58,22 +58,22 @@ Warning: snmpget() expects parameter 5 to be integer,%s given in %s on line %d
 bool(false)
 Checking working
 Single OID, default timeout and retries
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID, default retries
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID in array
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 Multiple OID
 array(2) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   ["%s"]=>
-  %unicode|string%(%d) "%d"
+  string(%d) "%d"
 }
 More error handling
 Single OID
@@ -102,5 +102,5 @@ Multiple OID
 Warning: snmpget(): Error in packet at 'SNMPv2-MIB::sysUpTime.220': (noSuchName) There is no such variable name in this MIB. in %s on line %d
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
diff --git a/ext/snmp/tests/snmpgetnext.phpt b/ext/snmp/tests/snmpgetnext.phpt
index af92d56c7c..2c868bfcd1 100644
--- a/ext/snmp/tests/snmpgetnext.phpt
+++ b/ext/snmp/tests/snmpgetnext.phpt
@@ -24,16 +24,16 @@ var_dump(snmpgetnext($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.
 ?>
 --EXPECTF--
 Single OID
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID in array
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 Multiple OID
 array(2) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   ["%s"]=>
-  %unicode|string%(%d) "%d"
+  string(%d) "%d"
 }
diff --git a/ext/snmp/tests/snmprealwalk.phpt b/ext/snmp/tests/snmprealwalk.phpt
index 97d56ef70b..e3827ab1c7 100644
--- a/ext/snmp/tests/snmprealwalk.phpt
+++ b/ext/snmp/tests/snmprealwalk.phpt
@@ -59,12 +59,12 @@ Warning: snmprealwalk() expects parameter 5 to be integer, %s given in %s on lin
 bool(false)
 Checking working
 Single OID
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
 string(%d) "%s"
 string(%d) "%s"
 Single OID in array
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
 string(%d) "%s"
 string(%d) "%s"
diff --git a/ext/snmp/tests/snmpwalk.phpt b/ext/snmp/tests/snmpwalk.phpt
index d71a014dab..12544eebd6 100644
--- a/ext/snmp/tests/snmpwalk.phpt
+++ b/ext/snmp/tests/snmpwalk.phpt
@@ -67,16 +67,16 @@ Warning: snmpwalk() expects parameter 5 to be integer, %s given in %s on line %d
 bool(false)
 Checking working
 Single OID
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
-%unicode|string%(6) "string"
-%unicode|string%(6) "string"
+string(6) "string"
+string(6) "string"
 Single OID in array
-%unicode|string%(5) "array"
-%unicode|string%(6) "string"
+string(5) "array"
+string(6) "string"
 Default OID
-%unicode|string%(5) "array"
-%unicode|string%(6) "string"
+string(5) "array"
+string(6) "string"
 More error handling
 Single incorrect OID
 
diff --git a/ext/soap/tests/bug48557.phpt b/ext/soap/tests/bug48557.phpt
index 07245793db..e98c6d13b9 100644
--- a/ext/soap/tests/bug48557.phpt
+++ b/ext/soap/tests/bug48557.phpt
@@ -64,7 +64,7 @@ array(6) {
   float(123.5)
   [-2000]=>
   float(123.5)
-  [%u|b%"011"]=>
+  ["011"]=>
   float(123.5)
   [12]=>
   float(123.5)
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
index 1691496772..70d314181b 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -24,7 +24,7 @@ var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
 Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
 NULL
 
-Warning: socket_create_pair() expects parameter 1 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: socket_create_pair() expects parameter 1 to be integer, string given in %s on line %d
 NULL
 bool(true)
 
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 5286f3a91f..37e3338be3 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -24,7 +24,7 @@ var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
 Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
 NULL
 
-Warning: socket_create_pair() expects parameter 1 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: socket_create_pair() expects parameter 1 to be integer, string given in %s on line %d
 NULL
 
 Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
diff --git a/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt b/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt
index ef13520237..ce754d398d 100644
--- a/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt
+++ b/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt
@@ -20,4 +20,4 @@ PHPNW Testfest 2009 - Adrian Hardy
    rmdir($targetDir);
 ?>
 --EXPECTF--
-Warning: DirectoryIterator::getBasename() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: DirectoryIterator::getBasename() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt b/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
index 4dce4db8de..3e09df8487 100644
--- a/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
+++ b/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
@@ -13,9 +13,9 @@ var_dump($list);
 ?>
 --EXPECTF--
 object(SplDoublyLinkedList)#1 (2) {
-  [%u|b%"flags":%u|b%"SplDoublyLinkedList":private]=>
+  ["flags":"SplDoublyLinkedList":private]=>
   int(0)
-  [%u|b%"dllist":%u|b%"SplDoublyLinkedList":private]=>
+  ["dllist":"SplDoublyLinkedList":private]=>
   array(2) {
     [0]=>
     %string|unicode%(3) "hai"
diff --git a/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt b/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
index 0f5dac19f9..a3482b319b 100644
--- a/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
+++ b/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
@@ -13,9 +13,9 @@ var_dump($list);
 ?>
 --EXPECTF--
 object(SplDoublyLinkedList)#1 (2) {
-  [%u|b%"flags":%u|b%"SplDoublyLinkedList":private]=>
+  ["flags":"SplDoublyLinkedList":private]=>
   int(0)
-  [%u|b%"dllist":%u|b%"SplDoublyLinkedList":private]=>
+  ["dllist":"SplDoublyLinkedList":private]=>
   array(2) {
     [0]=>
     %string|unicode%(2) "oh"
diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
index d30fc691c6..744a9cf775 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, %unicode_string_optional% given
+Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
diff --git a/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt b/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt
index ba81428aff..a0747451a0 100644
--- a/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt
+++ b/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt
@@ -7,4 +7,4 @@ PHPNW Testfest 2009 - Lorna Mitchell
 echo SplFixedArray::fromArray('hello');
 ?>
 --EXPECTF--
-Warning: SplFixedArray::fromArray() expects parameter 1 to be array, %unicode_string_optional% given in %s on line %d
+Warning: SplFixedArray::fromArray() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
index c3f73c4bd1..25d472c30f 100644
--- a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
index 7e065952b8..9942ff3fd1 100644
--- a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: SplObjectStorage::contains() expects parameter 1 to be object, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::contains() expects parameter 1 to be object, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::contains() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::contains() expects parameter 1 to be object, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
index 0841dfc1c9..fa75a07368 100644
--- a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: SplObjectStorage::detach() expects parameter 1 to be object, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::detach() expects parameter 1 to be object, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::detach() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::detach() expects parameter 1 to be object, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
index 4b495a0c44..374d3d11fd 100644
--- a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
@@ -31,7 +31,7 @@ NULL
 Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
index 8ffb0e6721..69d35a1a22 100644
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
@@ -30,7 +30,7 @@ NULL
 Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
index a0c48aac75..2a66f1eae8 100644
--- a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
index dcf43e21f2..c8254e74c6 100644
--- a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
+++ b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
@@ -19,9 +19,9 @@ foreach($data_provider as $input) {
 
 ?>
 --EXPECTF--
-Warning: SplObjectStorage::unserialize() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: SplObjectStorage::unserialize() expects parameter 1 to be string, array given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::unserialize() expects parameter 1 to be %binary_string_optional%, object given in %s on line %d
+Warning: SplObjectStorage::unserialize() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
diff --git a/ext/spl/tests/bug45622.phpt b/ext/spl/tests/bug45622.phpt
index a8fe2c4641..c8d16804c0 100644
--- a/ext/spl/tests/bug45622.phpt
+++ b/ext/spl/tests/bug45622.phpt
@@ -33,11 +33,11 @@ var_dump($ao->p);
 
 --> Access the real property:
 bool(true)
-%unicode|string%(15) "object property"
+string(15) "object property"
 
 --> Remove the real property and access the array element:
 bool(true)
-%unicode|string%(13) "array element"
+string(13) "array element"
 
 --> Remove the array element and try access again:
 bool(false)
@@ -47,5 +47,5 @@ NULL
 
 --> Re-add the real property:
 bool(true)
-%unicode|string%(15) "object property"
+string(15) "object property"
 
diff --git a/ext/spl/tests/bug46051.phpt b/ext/spl/tests/bug46051.phpt
index 49a58247c0..e993951ffa 100644
--- a/ext/spl/tests/bug46051.phpt
+++ b/ext/spl/tests/bug46051.phpt
@@ -11,4 +11,4 @@ $x->openFile(NULL, NULL, NULL);
 
 var_dump($x->getPathName());
 --EXPECTF--
-%unicode|string%(%d) "%sbug46051.php"
+string(%d) "%sbug46051.php"
diff --git a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
index 32bc574433..bbd283f96c 100644
--- a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
@@ -28,5 +28,5 @@ Warning: RecursiveTreeIterator::setPrefixPart() expects exactly 2 parameters, 1
 
 Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 1 to be integer, object given in %s on line %d
 
-Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 2 to be %binary_string_optional%, object given in %s on line %d
+Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 2 to be string, object given in %s on line %d
 ===DONE===
diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
index a7b84c4bcc..b114a9022d 100644
--- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
@@ -18,7 +18,7 @@ var_dump(get_class($iterator->getSubIterator()));
 var_dump($iterator->getSubIterator()->getArrayCopy());
 ?>
 --EXPECTF--
-%unicode|string%(22) "RecursiveArrayIterator"
+string(22) "RecursiveArrayIterator"
 array(3) {
   [0]=>
   int(1)
@@ -32,7 +32,7 @@ array(3) {
     int(4)
   }
 }
-%unicode|string%(22) "RecursiveArrayIterator"
+string(22) "RecursiveArrayIterator"
 array(2) {
   [0]=>
   int(3)
diff --git a/ext/spl/tests/spl_heap_iteration_error.phpt b/ext/spl/tests/spl_heap_iteration_error.phpt
index 62e462f553..1202856c7b 100644
--- a/ext/spl/tests/spl_heap_iteration_error.phpt
+++ b/ext/spl/tests/spl_heap_iteration_error.phpt
@@ -31,23 +31,23 @@ var_dump($h);
 ?>
 --EXPECTF--
 object(ext_heap)#%d (4) {
-  [%u|b%"fail"]=>
+  ["fail"]=>
   bool(true)
-  [%u|b%"flags":%u|b%"SplHeap":private]=>
+  ["flags":"SplHeap":private]=>
   int(0)
-  [%u|b%"isCorrupted":%u|b%"SplHeap":private]=>
+  ["isCorrupted":"SplHeap":private]=>
   bool(true)
-  [%u|b%"heap":%u|b%"SplHeap":private]=>
+  ["heap":"SplHeap":private]=>
   array(2) {
     [0]=>
     array(1) {
       [0]=>
-      %unicode|string%(7) "foobar2"
+      string(7) "foobar2"
     }
     [1]=>
     array(1) {
       [0]=>
-      %unicode|string%(7) "foobar1"
+      string(7) "foobar1"
     }
   }
 }
diff --git a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
index 1262ec0d65..a34b5577d9 100644
--- a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
+++ b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
@@ -16,18 +16,18 @@ TestFest London May 2009
 ?>
 --EXPECTF--
 one=>1
-%unicode|string%(3) "one"
+string(3) "one"
 two=>2
-%unicode|string%(3) "two"
+string(3) "two"
 four=>4
-%unicode|string%(4) "four"
+string(4) "four"
 five=>5
-%unicode|string%(4) "five"
+string(4) "five"
 seven=>7
-%unicode|string%(5) "seven"
+string(5) "seven"
 eight=>8
-%unicode|string%(5) "eight"
+string(5) "eight"
 -100=>10
 int(-100)
 =>null
-%unicode|string%(0) ""
+string(0) ""
diff --git a/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt b/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt
index d3f90642c9..5138b87663 100644
--- a/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt
+++ b/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt
@@ -12,7 +12,7 @@ var_dump($db->loadExtension(array()));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: SQLite3::loadExtension() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: SQLite3::loadExtension() expects parameter 1 to be string, array given in %s on line %d
 NULL
 Done
 
diff --git a/ext/sqlite3/tests/sqlite3_query_error.phpt b/ext/sqlite3/tests/sqlite3_query_error.phpt
index f5d64fd837..3a90a83e61 100644
--- a/ext/sqlite3/tests/sqlite3_query_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_query_error.phpt
@@ -26,7 +26,7 @@ Testing SQLite3 query without parameters
 Warning: SQLite3::query() expects exactly 1 parameter, 0 given in %s on line %d
 Testing SQLite3 query with one array parameter
 
-Warning: SQLite3::query() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: SQLite3::query() expects parameter 1 to be string, array given in %s on line %d
 Testing SQLite3 qeury with empty string parameter
 bool(false)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_querysingle_error.phpt b/ext/sqlite3/tests/sqlite3_querysingle_error.phpt
index 9d19dbea7d..e91537676e 100644
--- a/ext/sqlite3/tests/sqlite3_querysingle_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_querysingle_error.phpt
@@ -25,7 +25,7 @@ Testing SQLite3 querySingle without parameters
 Warning: SQLite3::querySingle() expects at least 1 parameter, 0 given in %s on line %d
 Testing SQLite3 querySingle with one array parameter
 
-Warning: SQLite3::querySingle() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: SQLite3::querySingle() expects parameter 1 to be string, array given in %s on line %d
 Testing SQLite3 qeurySingle with empty string parameter
 bool(false)
 Done
diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt
index 4ffafc4539..3b263df474 100644
--- a/ext/standard/tests/array/array_key_exists_object1.phpt
+++ b/ext/standard/tests/array/array_key_exists_object1.phpt
@@ -57,11 +57,11 @@ $key = var3:
 bool(true)
 $class1:
 object(myClass)#1 (3) {
-  [%b|u%"var1"]=>
-  %unicode|string%(1) "a"
-  [%b|u%"var2"]=>
-  %unicode|string%(1) "b"
-  [%b|u%"var3"]=>
+  ["var1"]=>
+  string(1) "a"
+  ["var2"]=>
+  string(1) "b"
+  ["var3"]=>
   NULL
 }
 
@@ -70,11 +70,11 @@ $key = var3:
 bool(true)
 $class2:
 object(myClass)#2 (3) {
-  [%b|u%"var1"]=>
-  %unicode|string%(1) "x"
-  [%b|u%"var2"]=>
-  %unicode|string%(1) "y"
-  [%b|u%"var3"]=>
-  %unicode|string%(1) "z"
+  ["var1"]=>
+  string(1) "x"
+  ["var2"]=>
+  string(1) "y"
+  ["var3"]=>
+  string(1) "z"
 }
 Done
diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt
index 39bb129e39..4a790e9d37 100644
--- a/ext/standard/tests/array/array_key_exists_object2.phpt
+++ b/ext/standard/tests/array/array_key_exists_object2.phpt
@@ -61,11 +61,11 @@ $key = var3:
 bool(false)
 $class1:
 object(myClass)#1 (3) {
-  [%b|u%"var1"]=>
-  %unicode|string%(1) "a"
-  [%b|u%"var2":protected]=>
-  %unicode|string%(1) "b"
-  [%b|u%"var3":%b|u%"myClass":private]=>
+  ["var1"]=>
+  string(1) "a"
+  ["var2":protected]=>
+  string(1) "b"
+  ["var3":"myClass":private]=>
   NULL
 }
 
@@ -74,11 +74,11 @@ $key = var3:
 bool(false)
 $class2:
 object(myClass)#2 (3) {
-  [%b|u%"var1"]=>
-  %unicode|string%(1) "x"
-  [%b|u%"var2":protected]=>
-  %unicode|string%(1) "y"
-  [%b|u%"var3":%b|u%"myClass":private]=>
-  %unicode|string%(1) "z"
+  ["var1"]=>
+  string(1) "x"
+  ["var2":protected]=>
+  string(1) "y"
+  ["var3":"myClass":private]=>
+  string(1) "z"
 }
 Done
diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt
index 757dd6e057..62dfab4568 100644
--- a/ext/standard/tests/array/array_unique_variation2.phpt
+++ b/ext/standard/tests/array/array_unique_variation2.phpt
@@ -114,37 +114,37 @@ array(1) {
 -- Iteration 6 --
 array(4) {
   [0]=>
-  %unicode|string%(3) "a"
+  string(3) "a"
   [1]=>
-  %unicode|string%(5) "aaaa
"
+  string(5) "aaaa
"
   [2]=>
-  %unicode|string%(1) "b"
+  string(1) "b"
   [4]=>
-  %unicode|string%(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}"
+  string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}"
 }
 -- Iteration 7 --
 array(4) {
   [0]=>
-  %unicode|string%(5) "a\v\f"
+  string(5) "a\v\f"
   [1]=>
-  %unicode|string%(6) "aaaa\r"
+  string(6) "aaaa\r"
   [2]=>
-  %unicode|string%(1) "b"
+  string(1) "b"
   [4]=>
-  %unicode|string%(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}"
+  string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}"
 }
 -- Iteration 8 --
 array(3) {
-  [%b|u%"h1"]=>
-  %unicode|string%(1) "
+  ["h1"]=>
+  string(1) "
 "
-  [%b|u%"h2"]=>
-  %unicode|string%(88) "hello world
+  ["h2"]=>
+  string(88) "hello world
 The quick brown fox jumped over;
 the lazy dog
 This is a double quoted string"
-  [%b|u%"h3"]=>
-  %unicode|string%(88) "hello
 world	
+  ["h3"]=>
+  string(88) "hello
 world	
 1111		 != 2222
 heredoc
 double quoted string. withdifferentwhitespaces"
@@ -152,15 +152,15 @@ double quoted string. withdifferentwhitespaces"
 -- Iteration 9 --
 array(2) {
   [1]=>
-  %unicode|string%(3) "one"
+  string(3) "one"
   [2]=>
-  %unicode|string%(3) "two"
+  string(3) "two"
 }
 -- Iteration 10 --
 array(2) {
-  [%b|u%"one"]=>
+  ["one"]=>
   int(1)
-  [%b|u%"two"]=>
+  ["two"]=>
   int(2)
 }
 -- Iteration 11 --
@@ -174,55 +174,55 @@ array(3) {
 }
 -- Iteration 12 --
 array(2) {
-  [%b|u%"one"]=>
-  %unicode|string%(3) "ten"
-  [%b|u%"two"]=>
-  %unicode|string%(6) "twenty"
+  ["one"]=>
+  string(3) "ten"
+  ["two"]=>
+  string(6) "twenty"
 }
 -- Iteration 13 --
 array(3) {
-  [%b|u%"one"]=>
+  ["one"]=>
   int(1)
   [2]=>
-  %unicode|string%(3) "two"
+  string(3) "two"
   [4]=>
-  %unicode|string%(4) "four"
+  string(4) "four"
 }
 -- Iteration 14 --
 array(2) {
-  [%b|u%""]=>
-  %unicode|string%(4) "null"
-  [%b|u%"NULL"]=>
+  [""]=>
+  string(4) "null"
+  ["NULL"]=>
   NULL
 }
 -- Iteration 15 --
 array(4) {
   [1]=>
-  %unicode|string%(4) "true"
+  string(4) "true"
   [0]=>
-  %unicode|string%(5) "false"
-  [%b|u%"false"]=>
+  string(5) "false"
+  ["false"]=>
   bool(false)
-  [%b|u%"true"]=>
+  ["true"]=>
   bool(true)
 }
 -- Iteration 16 --
 array(2) {
-  [%b|u%""]=>
-  %unicode|string%(6) "emptys"
-  [%b|u%"emptyd"]=>
-  %unicode|string%(0) ""
+  [""]=>
+  string(6) "emptys"
+  ["emptyd"]=>
+  string(0) ""
 }
 -- Iteration 17 --
 array(2) {
   [1]=>
-  %unicode|string%(0) ""
+  string(0) ""
   [6]=>
   bool(true)
 }
 -- Iteration 18 --
 array(3) {
-  [%b|u%""]=>
+  [""]=>
   int(4)
   [0]=>
   int(5)
diff --git a/ext/standard/tests/array/array_unique_variation6.phpt b/ext/standard/tests/array/array_unique_variation6.phpt
index 82442bdfad..15a46518b7 100644
--- a/ext/standard/tests/array/array_unique_variation6.phpt
+++ b/ext/standard/tests/array/array_unique_variation6.phpt
@@ -39,6 +39,6 @@ array(2) {
   [0]=>
   int(0)
   [1]=>
-  &%unicode|string%(5) "hello"
+  &string(5) "hello"
 }
 Done
diff --git a/ext/standard/tests/array/array_walk_object1.phpt b/ext/standard/tests/array/array_walk_object1.phpt
index 342e760ce8..3bd83fdab2 100644
--- a/ext/standard/tests/array/array_walk_object1.phpt
+++ b/ext/standard/tests/array/array_walk_object1.phpt
@@ -51,15 +51,15 @@ echo "Done"
 ?>
 --EXPECTF--
 *** Testing array_walk() : object functionality ***
-%unicode|string%(18) "%r\0%rMyClass%r\0%rpri_value"
+string(18) "%r\0%rMyClass%r\0%rpri_value"
 int(10)
 int(1)
 
-%unicode|string%(9) "pub_value"
+string(9) "pub_value"
 int(10)
 int(1)
 
-%unicode|string%(12) "%r\0%r*%r\0%rpro_value"
+string(12) "%r\0%r*%r\0%rpro_value"
 int(10)
 int(1)
 
diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt
index 506d1cafcf..f9214d25a5 100644
--- a/ext/standard/tests/array/array_walk_objects.phpt
+++ b/ext/standard/tests/array/array_walk_objects.phpt
@@ -29,16 +29,16 @@ array_walk($var, "walk");
 echo "Done\n";
 ?>
 --EXPECTF--	
-%unicode|string%(3) "foo"
-%unicode|string%(3) "foo"
-%unicode|string%(3) "bar"
-%unicode|string%(3) "bar"
-%unicode|string%(13) "%r\0%rtest%r\0%rvar_pri"
-%unicode|string%(12) "test_private"
-%unicode|string%(10) "%r\0%r*%r\0%rvar_pro"
-%unicode|string%(14) "test_protected"
-%unicode|string%(7) "var_pub"
-%unicode|string%(11) "test_public"
+string(3) "foo"
+string(3) "foo"
+string(3) "bar"
+string(3) "bar"
+string(13) "%r\0%rtest%r\0%rvar_pri"
+string(12) "test_private"
+string(10) "%r\0%r*%r\0%rvar_pro"
+string(14) "test_protected"
+string(7) "var_pub"
+string(11) "test_public"
 
-Warning: array_walk() expects parameter 1 to be array, %unicode_string_optional% given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, string given in %s on line %d
 Done
diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt
index bbd30f37f0..d2fa9b86eb 100644
--- a/ext/standard/tests/array/array_walk_rec_objects.phpt
+++ b/ext/standard/tests/array/array_walk_rec_objects.phpt
@@ -29,16 +29,16 @@ array_walk_recursive($var, "walk");
 echo "Done\n";
 ?>
 --EXPECTF--	
-%unicode|string%(3) "foo"
-%unicode|string%(3) "foo"
-%unicode|string%(3) "bar"
-%unicode|string%(3) "bar"
-%unicode|string%(13) "%r\0%rtest%r\0%rvar_pri"
-%unicode|string%(12) "test_private"
-%unicode|string%(10) "%r\0%r*%r\0%rvar_pro"
-%unicode|string%(14) "test_protected"
-%unicode|string%(7) "var_pub"
-%unicode|string%(11) "test_public"
+string(3) "foo"
+string(3) "foo"
+string(3) "bar"
+string(3) "bar"
+string(13) "%r\0%rtest%r\0%rvar_pri"
+string(12) "test_private"
+string(10) "%r\0%r*%r\0%rvar_pro"
+string(14) "test_protected"
+string(7) "var_pub"
+string(11) "test_public"
 
-Warning: array_walk_recursive() expects parameter 1 to be array, %unicode_string_optional% given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, string given in %s on line %d
 Done
diff --git a/ext/standard/tests/array/array_walk_recursive_object1.phpt b/ext/standard/tests/array/array_walk_recursive_object1.phpt
index 7ddced7766..5c01c55817 100644
--- a/ext/standard/tests/array/array_walk_recursive_object1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_object1.phpt
@@ -49,15 +49,15 @@ echo "Done"
 ?>
 --EXPECTF--
 *** Testing array_walk_recursive() : object functionality ***
-%unicode|string%(18) "%r\0%rMyClass%r\0%rpri_value"
+string(18) "%r\0%rMyClass%r\0%rpri_value"
 int(10)
 int(1)
 
-%unicode|string%(9) "pub_value"
+string(9) "pub_value"
 int(10)
 int(1)
 
-%unicode|string%(12) "%r\0%r*%r\0%rpro_value"
+string(12) "%r\0%r*%r\0%rpro_value"
 int(10)
 int(1)
 
diff --git a/ext/standard/tests/array/bug48854.phpt b/ext/standard/tests/array/bug48854.phpt
index 0908637503..7aaade03a4 100644
--- a/ext/standard/tests/array/bug48854.phpt
+++ b/ext/standard/tests/array/bug48854.phpt
@@ -24,20 +24,20 @@ var_dump($array1, $array2);
 ?>
 --EXPECTF--
 array(2) {
-  [%u|b%"friends"]=>
+  ["friends"]=>
   int(5)
-  [%u|b%"children"]=>
+  ["children"]=>
   array(1) {
-    [%u|b%"dogs"]=>
+    ["dogs"]=>
     int(0)
   }
 }
 array(2) {
-  [%u|b%"friends"]=>
+  ["friends"]=>
   int(10)
-  [%u|b%"children"]=>
+  ["children"]=>
   array(1) {
-    [%u|b%"cats"]=>
+    ["cats"]=>
     int(5)
   }
 }
diff --git a/ext/standard/tests/array/extract_variation10.phpt b/ext/standard/tests/array/extract_variation10.phpt
index d520be775e..6e4565dc8c 100644
--- a/ext/standard/tests/array/extract_variation10.phpt
+++ b/ext/standard/tests/array/extract_variation10.phpt
@@ -10,4 +10,4 @@ $a['foo'] = 'changed.foo';
 var_dump($nonref);
 ?>
 --EXPECTF--
-%unicode|string%(12) "original.foo"
+string(12) "original.foo"
diff --git a/ext/standard/tests/array/extract_variation11.phpt b/ext/standard/tests/array/extract_variation11.phpt
index 7f6e08c982..dfab4ddbba 100644
--- a/ext/standard/tests/array/extract_variation11.phpt
+++ b/ext/standard/tests/array/extract_variation11.phpt
@@ -10,4 +10,4 @@ $foo = 'changed.foo';
 var_dump($a['foo']);
 ?>
 --EXPECTF--
-%unicode|string%(11) "changed.foo"
+string(11) "changed.foo"
diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt
index 53f8d92167..9364a3e0a5 100644
--- a/ext/standard/tests/assert/assert04.phpt
+++ b/ext/standard/tests/assert/assert04.phpt
@@ -40,7 +40,7 @@ Warning: assert() expects at most 2 parameters, 3 given in %s on line %d
 
 Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d
 
-Warning: assert_options() expects parameter 1 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: assert_options() expects parameter 1 to be integer, string given in %s on line %d
 
 Warning: assert(): assert(0) failed in %s on line %d
 
diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt
index 6174933df5..960ee03e91 100644
--- a/ext/standard/tests/file/007_variation15.phpt
+++ b/ext/standard/tests/file/007_variation15.phpt
@@ -45,14 +45,14 @@ unlink(dirname(__FILE__)."/007_variation15.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'xt' mode ***
 resource(%d) of type (stream)
-%unicode|string%(6) "stream"
+string(6) "stream"
 int(0)
 int(37)
 int(37)
 string(0) ""
 int(0)
 bool(true)
-%unicode|string%(7) "Unknown"
+string(7) "Unknown"
 
 Warning: fopen(%s): failed to open stream: File exists in %s on line %s
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt
index 8820dbc7d5..3d1634de29 100644
--- a/ext/standard/tests/file/007_variation23.phpt
+++ b/ext/standard/tests/file/007_variation23.phpt
@@ -45,14 +45,14 @@ unlink(dirname(__FILE__)."/007_variation23.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'xb' mode ***
 resource(%d) of type (stream)
-%unicode|string%(6) "stream"
+string(6) "stream"
 int(0)
 int(37)
 int(37)
 string(0) ""
 int(0)
 bool(true)
-%unicode|string%(7) "Unknown"
+string(7) "Unknown"
 
 Warning: fopen(%s): failed to open stream: File exists in %s on line %s
 *** Done ***
diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt
index 541e5a0d1d..69f9a731cf 100644
--- a/ext/standard/tests/file/007_variation7.phpt
+++ b/ext/standard/tests/file/007_variation7.phpt
@@ -45,14 +45,14 @@ unlink(dirname(__FILE__)."/007_variation7.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'x' mode ***
 resource(%d) of type (stream)
-%unicode|string%(6) "stream"
+string(6) "stream"
 int(0)
 int(37)
 int(37)
 string(0) ""
 int(0)
 bool(true)
-%unicode|string%(7) "Unknown"
+string(7) "Unknown"
 
 Warning: fopen(%s): failed to open stream: File exists in %s on line %s
 *** Done ***
diff --git a/ext/standard/tests/file/bug44034.phpt b/ext/standard/tests/file/bug44034.phpt
index 36d88a983d..863bf57e05 100644
--- a/ext/standard/tests/file/bug44034.phpt
+++ b/ext/standard/tests/file/bug44034.phpt
@@ -19,23 +19,23 @@ foreach($urls as $url) {
 data://text/plain,foo\r\nbar\r\n
 array(2) {
   [0]=>
-  %unicode|string%(3) "foo"
+  string(3) "foo"
   [1]=>
-  %unicode|string%(3) "bar"
+  string(3) "bar"
 }
 data://text/plain,\r\nfoo\r\nbar\r\n
 array(3) {
   [0]=>
-  %unicode|string%(0) ""
+  string(0) ""
   [1]=>
-  %unicode|string%(3) "foo"
+  string(3) "foo"
   [2]=>
-  %unicode|string%(3) "bar"
+  string(3) "bar"
 }
 data://text/plain,foo\r\nbar
 array(2) {
   [0]=>
-  %unicode|string%(3) "foo"
+  string(3) "foo"
   [1]=>
-  %unicode|string%(3) "bar"
+  string(3) "bar"
 }
diff --git a/ext/standard/tests/file/bug46347.phpt b/ext/standard/tests/file/bug46347.phpt
index af81bc217f..e942c71ba3 100644
--- a/ext/standard/tests/file/bug46347.phpt
+++ b/ext/standard/tests/file/bug46347.phpt
@@ -19,6 +19,6 @@ unlink(__DIR__.'/parse.ini');
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"part1.*.part2"]=>
-  %unicode|string%(1) "1"
+  ["part1.*.part2"]=>
+  string(1) "1"
 }
diff --git a/ext/standard/tests/file/chroot_001.phpt b/ext/standard/tests/file/chroot_001.phpt
index daa1a8366e..b42b17b892 100644
--- a/ext/standard/tests/file/chroot_001.phpt
+++ b/ext/standard/tests/file/chroot_001.phpt
@@ -27,4 +27,4 @@ rmdir("chroot_001_x");
 bool(true)
 bool(true)
 bool(false)
-%unicode|string%(1) "/"
+string(1) "/"
diff --git a/ext/standard/tests/file/clearstatcache_001.phpt b/ext/standard/tests/file/clearstatcache_001.phpt
index 4282430b51..5f2fe589eb 100644
--- a/ext/standard/tests/file/clearstatcache_001.phpt
+++ b/ext/standard/tests/file/clearstatcache_001.phpt
@@ -36,8 +36,8 @@ var_dump(realpath(__FILE__ . "_link2"));
 @unlink(__FILE__ . "_link2");
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%s_dir1"
-%unicode|string%(%d) "%s_dir1"
-%unicode|string%(%d) "%s_dir1"
-%unicode|string%(%d) "%s_dir1"
+string(%d) "%s_dir1"
+string(%d) "%s_dir1"
+string(%d) "%s_dir1"
+string(%d) "%s_dir1"
 bool(false)
diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
index 9e8bbe6d1f..26ba22a47e 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
@@ -197,27 +197,27 @@ string(12) "ontents read"
 string(%d) "contents read"
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
index 170ba4343e..66f51895a9 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
@@ -196,27 +196,27 @@ string(12) "ontents read"
 string(%d) "contents read"
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
diff --git a/ext/standard/tests/file/pathinfo_basic.phpt b/ext/standard/tests/file/pathinfo_basic.phpt
index bc4196925d..0ab4776e02 100644
--- a/ext/standard/tests/file/pathinfo_basic.phpt
+++ b/ext/standard/tests/file/pathinfo_basic.phpt
@@ -68,184 +68,184 @@ echo "Done\n";
 --EXPECTF--
 *** Testing basic functions of pathinfo() ***
 -- Iteration 1 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 2 --
-%unicode|string%(1) "."
-%unicode|string%(17) "www.example.co.in"
-%unicode|string%(2) "in"
-%unicode|string%(14) "www.example.co"
+string(1) "."
+string(17) "www.example.co.in"
+string(2) "in"
+string(14) "www.example.co"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(17) "www.example.co.in"
-  [%u|b%"extension"]=>
-  %unicode|string%(2) "in"
-  [%u|b%"filename"]=>
-  %unicode|string%(14) "www.example.co"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(17) "www.example.co.in"
+  ["extension"]=>
+  string(2) "in"
+  ["filename"]=>
+  string(14) "www.example.co"
 }
 -- Iteration 3 --
-%unicode|string%(13) "/var/www/html"
-%unicode|string%(12) "example.html"
-%unicode|string%(4) "html"
-%unicode|string%(7) "example"
+string(13) "/var/www/html"
+string(12) "example.html"
+string(4) "html"
+string(7) "example"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(13) "/var/www/html"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "example.html"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "html"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "example"
+  ["dirname"]=>
+  string(13) "/var/www/html"
+  ["basename"]=>
+  string(12) "example.html"
+  ["extension"]=>
+  string(4) "html"
+  ["filename"]=>
+  string(7) "example"
 }
 -- Iteration 4 --
-%unicode|string%(4) "/dir"
-%unicode|string%(11) "test.tar.gz"
-%unicode|string%(2) "gz"
-%unicode|string%(8) "test.tar"
+string(4) "/dir"
+string(11) "test.tar.gz"
+string(2) "gz"
+string(8) "test.tar"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(4) "/dir"
-  [%u|b%"basename"]=>
-  %unicode|string%(11) "test.tar.gz"
-  [%u|b%"extension"]=>
-  %unicode|string%(2) "gz"
-  [%u|b%"filename"]=>
-  %unicode|string%(8) "test.tar"
+  ["dirname"]=>
+  string(4) "/dir"
+  ["basename"]=>
+  string(11) "test.tar.gz"
+  ["extension"]=>
+  string(2) "gz"
+  ["filename"]=>
+  string(8) "test.tar"
 }
 -- Iteration 5 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 6 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 7 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 8 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 9 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 10 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 11 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 12 --
-%unicode|string%(%d) "%s/foo"
-%unicode|string%(12) "symlink.link"
-%unicode|string%(4) "link"
-%unicode|string%(7) "symlink"
+string(%d) "%s/foo"
+string(12) "symlink.link"
+string(4) "link"
+string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "symlink.link"
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "link"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "symlink"
+  ["dirname"]=>
+  string(%d) "%s/foo"
+  ["basename"]=>
+  string(12) "symlink.link"
+  ["extension"]=>
+  string(4) "link"
+  ["filename"]=>
+  string(7) "symlink"
 }
 -- Iteration 13 --
 string(%d) "%s/foo"
@@ -253,149 +253,149 @@ string(12) "symlink.link"
 string(4) "link"
 string(7) "symlink"
 array(4) {
-  [%u|b%"dirname"]=>
+  ["dirname"]=>
   string(%d) "%s/foo"
-  [%u|b%"basename"]=>
+  ["basename"]=>
   string(12) "symlink.link"
-  [%u|b%"extension"]=>
+  ["extension"]=>
   string(4) "link"
-  [%u|b%"filename"]=>
+  ["filename"]=>
   string(7) "symlink"
 }
 -- Iteration 14 --
-%unicode|string%(1) "."
-%unicode|string%(1) "."
-%unicode|string%(0) ""
-%unicode|string%(0) ""
+string(1) "."
+string(1) "."
+string(0) ""
+string(0) ""
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(1) "."
-  [%u|b%"extension"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(0) ""
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(1) "."
+  ["extension"]=>
+  string(0) ""
+  ["filename"]=>
+  string(0) ""
 }
 -- Iteration 15 --
-%unicode|string%(%d) "%s"
-%unicode|string%(3) "foo"
-%unicode|string%(0) ""
-%unicode|string%(3) "foo"
+string(%d) "%s"
+string(3) "foo"
+string(0) ""
+string(3) "foo"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "foo"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "foo"
+  ["dirname"]=>
+  string(%d) "%s"
+  ["basename"]=>
+  string(3) "foo"
+  ["filename"]=>
+  string(3) "foo"
 }
 -- Iteration 16 --
-%unicode|string%(%d) "%s"
-%unicode|string%(3) "foo"
-%unicode|string%(0) ""
-%unicode|string%(3) "foo"
+string(%d) "%s"
+string(3) "foo"
+string(0) ""
+string(3) "foo"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s"
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "foo"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "foo"
+  ["dirname"]=>
+  string(%d) "%s"
+  ["basename"]=>
+  string(3) "foo"
+  ["filename"]=>
+  string(3) "foo"
 }
 -- Iteration 17 --
-%unicode|string%(%d) "%s/.."
-%unicode|string%(3) "foo"
-%unicode|string%(0) ""
-%unicode|string%(3) "foo"
+string(%d) "%s/.."
+string(3) "foo"
+string(0) ""
+string(3) "foo"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(%d) "%s/.."
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "foo"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "foo"
+  ["dirname"]=>
+  string(%d) "%s/.."
+  ["basename"]=>
+  string(3) "foo"
+  ["filename"]=>
+  string(3) "foo"
 }
 -- Iteration 18 --
-%unicode|string%(6) "../foo"
-%unicode|string%(3) "bar"
-%unicode|string%(0) ""
-%unicode|string%(3) "bar"
+string(6) "../foo"
+string(3) "bar"
+string(0) ""
+string(3) "bar"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(6) "../foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "bar"
+  ["dirname"]=>
+  string(6) "../foo"
+  ["basename"]=>
+  string(3) "bar"
+  ["filename"]=>
+  string(3) "bar"
 }
 -- Iteration 19 --
-%unicode|string%(5) "./foo"
-%unicode|string%(3) "bar"
-%unicode|string%(0) ""
-%unicode|string%(3) "bar"
+string(5) "./foo"
+string(3) "bar"
+string(0) ""
+string(3) "bar"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(5) "./foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "bar"
+  ["dirname"]=>
+  string(5) "./foo"
+  ["basename"]=>
+  string(3) "bar"
+  ["filename"]=>
+  string(3) "bar"
 }
 -- Iteration 20 --
-%unicode|string%(5) "//foo"
-%unicode|string%(3) "bar"
-%unicode|string%(0) ""
-%unicode|string%(3) "bar"
+string(5) "//foo"
+string(3) "bar"
+string(0) ""
+string(3) "bar"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(5) "//foo"
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "bar"
+  ["dirname"]=>
+  string(5) "//foo"
+  ["basename"]=>
+  string(3) "bar"
+  ["filename"]=>
+  string(3) "bar"
 }
 -- Iteration 21 --
-%unicode|string%(5) "~/PHP"
-%unicode|string%(8) "php5.2.0"
-%unicode|string%(1) "0"
-%unicode|string%(6) "php5.2"
+string(5) "~/PHP"
+string(8) "php5.2.0"
+string(1) "0"
+string(6) "php5.2"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(5) "~/PHP"
-  [%u|b%"basename"]=>
-  %unicode|string%(8) "php5.2.0"
-  [%u|b%"extension"]=>
-  %unicode|string%(1) "0"
-  [%u|b%"filename"]=>
-  %unicode|string%(6) "php5.2"
+  ["dirname"]=>
+  string(5) "~/PHP"
+  ["basename"]=>
+  string(8) "php5.2.0"
+  ["extension"]=>
+  string(1) "0"
+  ["filename"]=>
+  string(6) "php5.2"
 }
 -- Iteration 22 --
-%unicode|string%(13) "/home/example"
-%unicode|string%(4) "test"
-%unicode|string%(0) ""
-%unicode|string%(4) "test"
+string(13) "/home/example"
+string(4) "test"
+string(0) ""
+string(4) "test"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(13) "/home/example"
-  [%u|b%"basename"]=>
-  %unicode|string%(4) "test"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "test"
+  ["dirname"]=>
+  string(13) "/home/example"
+  ["basename"]=>
+  string(4) "test"
+  ["filename"]=>
+  string(4) "test"
 }
 -- Iteration 23 --
-%unicode|string%(23) "http://httpd.apache.org"
-%unicode|string%(24) "core.html#acceptpathinfo"
-%unicode|string%(19) "html#acceptpathinfo"
-%unicode|string%(4) "core"
+string(23) "http://httpd.apache.org"
+string(24) "core.html#acceptpathinfo"
+string(19) "html#acceptpathinfo"
+string(4) "core"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(23) "http://httpd.apache.org"
-  [%u|b%"basename"]=>
-  %unicode|string%(24) "core.html#acceptpathinfo"
-  [%u|b%"extension"]=>
-  %unicode|string%(19) "html#acceptpathinfo"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "core"
+  ["dirname"]=>
+  string(23) "http://httpd.apache.org"
+  ["basename"]=>
+  string(24) "core.html#acceptpathinfo"
+  ["extension"]=>
+  string(19) "html#acceptpathinfo"
+  ["filename"]=>
+  string(4) "core"
 }
 Done
diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt
index 92f0524da4..c57774a141 100644
--- a/ext/standard/tests/file/pathinfo_basic1.phpt
+++ b/ext/standard/tests/file/pathinfo_basic1.phpt
@@ -74,537 +74,537 @@ echo "Done\n";
 --EXPECTF--
 *** Testing basic functions of pathinfo() ***
 -- Iteration 1 --
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
 array(2) {
-  [%u|b%"basename"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(0) ""
+  ["basename"]=>
+  string(0) ""
+  ["filename"]=>
+  string(0) ""
 }
 -- Iteration 2 --
-%unicode|string%(1) "."
-%unicode|string%(1) " "
-%unicode|string%(0) ""
-%unicode|string%(1) " "
+string(1) "."
+string(1) " "
+string(0) ""
+string(1) " "
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(1) " "
-  [%u|b%"filename"]=>
-  %unicode|string%(1) " "
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(1) " "
+  ["filename"]=>
+  string(1) " "
 }
 -- Iteration 3 --
-%unicode|string%(1) "."
-%unicode|string%(2) "c:"
-%unicode|string%(0) ""
-%unicode|string%(2) "c:"
+string(1) "."
+string(2) "c:"
+string(0) ""
+string(2) "c:"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(2) "c:"
-  [%u|b%"filename"]=>
-  %unicode|string%(2) "c:"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(2) "c:"
+  ["filename"]=>
+  string(2) "c:"
 }
 -- Iteration 4 --
-%unicode|string%(1) "."
-%unicode|string%(3) "c:\"
-%unicode|string%(0) ""
-%unicode|string%(3) "c:\"
+string(1) "."
+string(3) "c:\"
+string(0) ""
+string(3) "c:\"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "c:\"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "c:\"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(3) "c:\"
+  ["filename"]=>
+  string(3) "c:\"
 }
 -- Iteration 5 --
-%unicode|string%(1) "."
-%unicode|string%(2) "c:"
-%unicode|string%(0) ""
-%unicode|string%(2) "c:"
+string(1) "."
+string(2) "c:"
+string(0) ""
+string(2) "c:"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(2) "c:"
-  [%u|b%"filename"]=>
-  %unicode|string%(2) "c:"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(2) "c:"
+  ["filename"]=>
+  string(2) "c:"
 }
 -- Iteration 6 --
-%unicode|string%(1) "."
-%unicode|string%(5) "afile"
-%unicode|string%(0) ""
-%unicode|string%(5) "afile"
+string(1) "."
+string(5) "afile"
+string(0) ""
+string(5) "afile"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(5) "afile"
-  [%u|b%"filename"]=>
-  %unicode|string%(5) "afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(5) "afile"
+  ["filename"]=>
+  string(5) "afile"
 }
 -- Iteration 7 --
-%unicode|string%(1) "."
-%unicode|string%(12) "c:\test\adir"
-%unicode|string%(0) ""
-%unicode|string%(12) "c:\test\adir"
+string(1) "."
+string(12) "c:\test\adir"
+string(0) ""
+string(12) "c:\test\adir"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(12) "c:\test\adir"
-  [%u|b%"filename"]=>
-  %unicode|string%(12) "c:\test\adir"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(12) "c:\test\adir"
+  ["filename"]=>
+  string(12) "c:\test\adir"
 }
 -- Iteration 8 --
-%unicode|string%(1) "."
-%unicode|string%(13) "c:\test\adir\"
-%unicode|string%(0) ""
-%unicode|string%(13) "c:\test\adir\"
+string(1) "."
+string(13) "c:\test\adir\"
+string(0) ""
+string(13) "c:\test\adir\"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(13) "c:\test\adir\"
-  [%u|b%"filename"]=>
-  %unicode|string%(13) "c:\test\adir\"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(13) "c:\test\adir\"
+  ["filename"]=>
+  string(13) "c:\test\adir\"
 }
 -- Iteration 9 --
-%unicode|string%(12) "/usr/include"
-%unicode|string%(4) "arpa"
-%unicode|string%(0) ""
-%unicode|string%(4) "arpa"
+string(12) "/usr/include"
+string(4) "arpa"
+string(0) ""
+string(4) "arpa"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(12) "/usr/include"
-  [%u|b%"basename"]=>
-  %unicode|string%(4) "arpa"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "arpa"
+  ["dirname"]=>
+  string(12) "/usr/include"
+  ["basename"]=>
+  string(4) "arpa"
+  ["filename"]=>
+  string(4) "arpa"
 }
 -- Iteration 10 --
-%unicode|string%(12) "/usr/include"
-%unicode|string%(4) "arpa"
-%unicode|string%(0) ""
-%unicode|string%(4) "arpa"
+string(12) "/usr/include"
+string(4) "arpa"
+string(0) ""
+string(4) "arpa"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(12) "/usr/include"
-  [%u|b%"basename"]=>
-  %unicode|string%(4) "arpa"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "arpa"
+  ["dirname"]=>
+  string(12) "/usr/include"
+  ["basename"]=>
+  string(4) "arpa"
+  ["filename"]=>
+  string(4) "arpa"
 }
 -- Iteration 11 --
-%unicode|string%(11) "usr/include"
-%unicode|string%(4) "arpa"
-%unicode|string%(0) ""
-%unicode|string%(4) "arpa"
+string(11) "usr/include"
+string(4) "arpa"
+string(0) ""
+string(4) "arpa"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(11) "usr/include"
-  [%u|b%"basename"]=>
-  %unicode|string%(4) "arpa"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "arpa"
+  ["dirname"]=>
+  string(11) "usr/include"
+  ["basename"]=>
+  string(4) "arpa"
+  ["filename"]=>
+  string(4) "arpa"
 }
 -- Iteration 12 --
-%unicode|string%(11) "usr/include"
-%unicode|string%(4) "arpa"
-%unicode|string%(0) ""
-%unicode|string%(4) "arpa"
+string(11) "usr/include"
+string(4) "arpa"
+string(0) ""
+string(4) "arpa"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(11) "usr/include"
-  [%u|b%"basename"]=>
-  %unicode|string%(4) "arpa"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "arpa"
+  ["dirname"]=>
+  string(11) "usr/include"
+  ["basename"]=>
+  string(4) "arpa"
+  ["filename"]=>
+  string(4) "arpa"
 }
 -- Iteration 13 --
-%unicode|string%(1) "."
-%unicode|string%(13) "c:\test\afile"
-%unicode|string%(0) ""
-%unicode|string%(13) "c:\test\afile"
+string(1) "."
+string(13) "c:\test\afile"
+string(0) ""
+string(13) "c:\test\afile"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(13) "c:\test\afile"
-  [%u|b%"filename"]=>
-  %unicode|string%(13) "c:\test\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(13) "c:\test\afile"
+  ["filename"]=>
+  string(13) "c:\test\afile"
 }
 -- Iteration 14 --
-%unicode|string%(1) "."
-%unicode|string%(13) "c:\test\afile"
-%unicode|string%(0) ""
-%unicode|string%(13) "c:\test\afile"
+string(1) "."
+string(13) "c:\test\afile"
+string(0) ""
+string(13) "c:\test\afile"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(13) "c:\test\afile"
-  [%u|b%"filename"]=>
-  %unicode|string%(13) "c:\test\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(13) "c:\test\afile"
+  ["filename"]=>
+  string(13) "c:\test\afile"
 }
 -- Iteration 15 --
-%unicode|string%(8) "c://test"
-%unicode|string%(5) "afile"
-%unicode|string%(0) ""
-%unicode|string%(5) "afile"
+string(8) "c://test"
+string(5) "afile"
+string(0) ""
+string(5) "afile"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(8) "c://test"
-  [%u|b%"basename"]=>
-  %unicode|string%(5) "afile"
-  [%u|b%"filename"]=>
-  %unicode|string%(5) "afile"
+  ["dirname"]=>
+  string(8) "c://test"
+  ["basename"]=>
+  string(5) "afile"
+  ["filename"]=>
+  string(5) "afile"
 }
 -- Iteration 16 --
-%unicode|string%(1) "."
-%unicode|string%(14) "c:\test\afile\"
-%unicode|string%(0) ""
-%unicode|string%(14) "c:\test\afile\"
+string(1) "."
+string(14) "c:\test\afile\"
+string(0) ""
+string(14) "c:\test\afile\"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(14) "c:\test\afile\"
-  [%u|b%"filename"]=>
-  %unicode|string%(14) "c:\test\afile\"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(14) "c:\test\afile\"
+  ["filename"]=>
+  string(14) "c:\test\afile\"
 }
 -- Iteration 17 --
-%unicode|string%(1) "."
-%unicode|string%(16) "c:\test\prog.exe"
-%unicode|string%(3) "exe"
-%unicode|string%(12) "c:\test\prog"
+string(1) "."
+string(16) "c:\test\prog.exe"
+string(3) "exe"
+string(12) "c:\test\prog"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(16) "c:\test\prog.exe"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "exe"
-  [%u|b%"filename"]=>
-  %unicode|string%(12) "c:\test\prog"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(16) "c:\test\prog.exe"
+  ["extension"]=>
+  string(3) "exe"
+  ["filename"]=>
+  string(12) "c:\test\prog"
 }
 -- Iteration 18 --
-%unicode|string%(1) "."
-%unicode|string%(16) "c:\test\prog.exe"
-%unicode|string%(3) "exe"
-%unicode|string%(12) "c:\test\prog"
+string(1) "."
+string(16) "c:\test\prog.exe"
+string(3) "exe"
+string(12) "c:\test\prog"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(16) "c:\test\prog.exe"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "exe"
-  [%u|b%"filename"]=>
-  %unicode|string%(12) "c:\test\prog"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(16) "c:\test\prog.exe"
+  ["extension"]=>
+  string(3) "exe"
+  ["filename"]=>
+  string(12) "c:\test\prog"
 }
 -- Iteration 19 --
-%unicode|string%(7) "c:/test"
-%unicode|string%(8) "prog.exe"
-%unicode|string%(3) "exe"
-%unicode|string%(4) "prog"
+string(7) "c:/test"
+string(8) "prog.exe"
+string(3) "exe"
+string(4) "prog"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(7) "c:/test"
-  [%u|b%"basename"]=>
-  %unicode|string%(8) "prog.exe"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "exe"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "prog"
+  ["dirname"]=>
+  string(7) "c:/test"
+  ["basename"]=>
+  string(8) "prog.exe"
+  ["extension"]=>
+  string(3) "exe"
+  ["filename"]=>
+  string(4) "prog"
 }
 -- Iteration 20 --
-%unicode|string%(17) "/usr/include/arpa"
-%unicode|string%(6) "inet.h"
-%unicode|string%(1) "h"
-%unicode|string%(4) "inet"
+string(17) "/usr/include/arpa"
+string(6) "inet.h"
+string(1) "h"
+string(4) "inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(17) "/usr/include/arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(6) "inet.h"
-  [%u|b%"extension"]=>
-  %unicode|string%(1) "h"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "inet"
+  ["dirname"]=>
+  string(17) "/usr/include/arpa"
+  ["basename"]=>
+  string(6) "inet.h"
+  ["extension"]=>
+  string(1) "h"
+  ["filename"]=>
+  string(4) "inet"
 }
 -- Iteration 21 --
-%unicode|string%(19) "//usr/include//arpa"
-%unicode|string%(6) "inet.h"
-%unicode|string%(1) "h"
-%unicode|string%(4) "inet"
+string(19) "//usr/include//arpa"
+string(6) "inet.h"
+string(1) "h"
+string(4) "inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(19) "//usr/include//arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(6) "inet.h"
-  [%u|b%"extension"]=>
-  %unicode|string%(1) "h"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "inet"
+  ["dirname"]=>
+  string(19) "//usr/include//arpa"
+  ["basename"]=>
+  string(6) "inet.h"
+  ["extension"]=>
+  string(1) "h"
+  ["filename"]=>
+  string(4) "inet"
 }
 -- Iteration 22 --
-%unicode|string%(1) "."
-%unicode|string%(1) "\"
-%unicode|string%(0) ""
-%unicode|string%(1) "\"
+string(1) "."
+string(1) "\"
+string(0) ""
+string(1) "\"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(1) "\"
-  [%u|b%"filename"]=>
-  %unicode|string%(1) "\"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(1) "\"
+  ["filename"]=>
+  string(1) "\"
 }
 -- Iteration 23 --
-%unicode|string%(1) "."
-%unicode|string%(2) "\\"
-%unicode|string%(0) ""
-%unicode|string%(2) "\\"
+string(1) "."
+string(2) "\\"
+string(0) ""
+string(2) "\\"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(2) "\\"
-  [%u|b%"filename"]=>
-  %unicode|string%(2) "\\"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(2) "\\"
+  ["filename"]=>
+  string(2) "\\"
 }
 -- Iteration 24 --
-%unicode|string%(1) "/"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
+string(1) "/"
+string(0) ""
+string(0) ""
+string(0) ""
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "/"
-  [%u|b%"basename"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(0) ""
+  ["dirname"]=>
+  string(1) "/"
+  ["basename"]=>
+  string(0) ""
+  ["filename"]=>
+  string(0) ""
 }
 -- Iteration 25 --
-%unicode|string%(1) "/"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
+string(1) "/"
+string(0) ""
+string(0) ""
+string(0) ""
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "/"
-  [%u|b%"basename"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(0) ""
+  ["dirname"]=>
+  string(1) "/"
+  ["basename"]=>
+  string(0) ""
+  ["filename"]=>
+  string(0) ""
 }
 -- Iteration 26 --
-%unicode|string%(1) "/"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
+string(1) "/"
+string(0) ""
+string(0) ""
+string(0) ""
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "/"
-  [%u|b%"basename"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(0) ""
+  ["dirname"]=>
+  string(1) "/"
+  ["basename"]=>
+  string(0) ""
+  ["filename"]=>
+  string(0) ""
 }
 -- Iteration 27 --
-%unicode|string%(17) "/usr/include/arpa"
-%unicode|string%(6) "inet.h"
-%unicode|string%(1) "h"
-%unicode|string%(4) "inet"
+string(17) "/usr/include/arpa"
+string(6) "inet.h"
+string(1) "h"
+string(4) "inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(17) "/usr/include/arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(6) "inet.h"
-  [%u|b%"extension"]=>
-  %unicode|string%(1) "h"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "inet"
+  ["dirname"]=>
+  string(17) "/usr/include/arpa"
+  ["basename"]=>
+  string(6) "inet.h"
+  ["extension"]=>
+  string(1) "h"
+  ["filename"]=>
+  string(4) "inet"
 }
 -- Iteration 28 --
-%unicode|string%(27) "c:\windows/system32\drivers"
-%unicode|string%(9) "etc\hosts"
-%unicode|string%(0) ""
-%unicode|string%(9) "etc\hosts"
+string(27) "c:\windows/system32\drivers"
+string(9) "etc\hosts"
+string(0) ""
+string(9) "etc\hosts"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(27) "c:\windows/system32\drivers"
-  [%u|b%"basename"]=>
-  %unicode|string%(9) "etc\hosts"
-  [%u|b%"filename"]=>
-  %unicode|string%(9) "etc\hosts"
+  ["dirname"]=>
+  string(27) "c:\windows/system32\drivers"
+  ["basename"]=>
+  string(9) "etc\hosts"
+  ["filename"]=>
+  string(9) "etc\hosts"
 }
 -- Iteration 29 --
-%unicode|string%(12) "/usr\include"
-%unicode|string%(11) "arpa\inet.h"
-%unicode|string%(1) "h"
-%unicode|string%(9) "arpa\inet"
+string(12) "/usr\include"
+string(11) "arpa\inet.h"
+string(1) "h"
+string(9) "arpa\inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(12) "/usr\include"
-  [%u|b%"basename"]=>
-  %unicode|string%(11) "arpa\inet.h"
-  [%u|b%"extension"]=>
-  %unicode|string%(1) "h"
-  [%u|b%"filename"]=>
-  %unicode|string%(9) "arpa\inet"
+  ["dirname"]=>
+  string(12) "/usr\include"
+  ["basename"]=>
+  string(11) "arpa\inet.h"
+  ["extension"]=>
+  string(1) "h"
+  ["filename"]=>
+  string(9) "arpa\inet"
 }
 -- Iteration 30 --
-%unicode|string%(1) "."
-%unicode|string%(25) "   c:\test\adir\afile.txt"
-%unicode|string%(3) "txt"
-%unicode|string%(21) "   c:\test\adir\afile"
+string(1) "."
+string(25) "   c:\test\adir\afile.txt"
+string(3) "txt"
+string(21) "   c:\test\adir\afile"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(25) "   c:\test\adir\afile.txt"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "txt"
-  [%u|b%"filename"]=>
-  %unicode|string%(21) "   c:\test\adir\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(25) "   c:\test\adir\afile.txt"
+  ["extension"]=>
+  string(3) "txt"
+  ["filename"]=>
+  string(21) "   c:\test\adir\afile"
 }
 -- Iteration 31 --
-%unicode|string%(1) "."
-%unicode|string%(25) "c:\test\adir\afile.txt   "
-%unicode|string%(6) "txt   "
-%unicode|string%(18) "c:\test\adir\afile"
+string(1) "."
+string(25) "c:\test\adir\afile.txt   "
+string(6) "txt   "
+string(18) "c:\test\adir\afile"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(25) "c:\test\adir\afile.txt   "
-  [%u|b%"extension"]=>
-  %unicode|string%(6) "txt   "
-  [%u|b%"filename"]=>
-  %unicode|string%(18) "c:\test\adir\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(25) "c:\test\adir\afile.txt   "
+  ["extension"]=>
+  string(6) "txt   "
+  ["filename"]=>
+  string(18) "c:\test\adir\afile"
 }
 -- Iteration 32 --
-%unicode|string%(1) "."
-%unicode|string%(28) "   c:\test\adir\afile.txt   "
-%unicode|string%(6) "txt   "
-%unicode|string%(21) "   c:\test\adir\afile"
+string(1) "."
+string(28) "   c:\test\adir\afile.txt   "
+string(6) "txt   "
+string(21) "   c:\test\adir\afile"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(28) "   c:\test\adir\afile.txt   "
-  [%u|b%"extension"]=>
-  %unicode|string%(6) "txt   "
-  [%u|b%"filename"]=>
-  %unicode|string%(21) "   c:\test\adir\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(28) "   c:\test\adir\afile.txt   "
+  ["extension"]=>
+  string(6) "txt   "
+  ["filename"]=>
+  string(21) "   c:\test\adir\afile"
 }
 -- Iteration 33 --
-%unicode|string%(20) "   /usr/include/arpa"
-%unicode|string%(6) "inet.h"
-%unicode|string%(1) "h"
-%unicode|string%(4) "inet"
+string(20) "   /usr/include/arpa"
+string(6) "inet.h"
+string(1) "h"
+string(4) "inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(20) "   /usr/include/arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(6) "inet.h"
-  [%u|b%"extension"]=>
-  %unicode|string%(1) "h"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "inet"
+  ["dirname"]=>
+  string(20) "   /usr/include/arpa"
+  ["basename"]=>
+  string(6) "inet.h"
+  ["extension"]=>
+  string(1) "h"
+  ["filename"]=>
+  string(4) "inet"
 }
 -- Iteration 34 --
-%unicode|string%(17) "/usr/include/arpa"
-%unicode|string%(9) "inet.h   "
-%unicode|string%(4) "h   "
-%unicode|string%(4) "inet"
+string(17) "/usr/include/arpa"
+string(9) "inet.h   "
+string(4) "h   "
+string(4) "inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(17) "/usr/include/arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(9) "inet.h   "
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "h   "
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "inet"
+  ["dirname"]=>
+  string(17) "/usr/include/arpa"
+  ["basename"]=>
+  string(9) "inet.h   "
+  ["extension"]=>
+  string(4) "h   "
+  ["filename"]=>
+  string(4) "inet"
 }
 -- Iteration 35 --
-%unicode|string%(20) "   /usr/include/arpa"
-%unicode|string%(9) "inet.h   "
-%unicode|string%(4) "h   "
-%unicode|string%(4) "inet"
+string(20) "   /usr/include/arpa"
+string(9) "inet.h   "
+string(4) "h   "
+string(4) "inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(20) "   /usr/include/arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(9) "inet.h   "
-  [%u|b%"extension"]=>
-  %unicode|string%(4) "h   "
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "inet"
+  ["dirname"]=>
+  string(20) "   /usr/include/arpa"
+  ["basename"]=>
+  string(9) "inet.h   "
+  ["extension"]=>
+  string(4) "h   "
+  ["filename"]=>
+  string(4) "inet"
 }
 -- Iteration 36 --
-%unicode|string%(1) "."
-%unicode|string%(3) " c:"
-%unicode|string%(0) ""
-%unicode|string%(3) " c:"
+string(1) "."
+string(3) " c:"
+string(0) ""
+string(3) " c:"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(3) " c:"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) " c:"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(3) " c:"
+  ["filename"]=>
+  string(3) " c:"
 }
 -- Iteration 37 --
-%unicode|string%(1) "."
-%unicode|string%(24) "		c:\test\adir\afile.txt"
-%unicode|string%(3) "txt"
-%unicode|string%(20) "		c:\test\adir\afile"
+string(1) "."
+string(24) "		c:\test\adir\afile.txt"
+string(3) "txt"
+string(20) "		c:\test\adir\afile"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(24) "		c:\test\adir\afile.txt"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "txt"
-  [%u|b%"filename"]=>
-  %unicode|string%(20) "		c:\test\adir\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(24) "		c:\test\adir\afile.txt"
+  ["extension"]=>
+  string(3) "txt"
+  ["filename"]=>
+  string(20) "		c:\test\adir\afile"
 }
 -- Iteration 38 --
-%unicode|string%(1) "/"
-%unicode|string%(3) "usr"
-%unicode|string%(0) ""
-%unicode|string%(3) "usr"
+string(1) "/"
+string(3) "usr"
+string(0) ""
+string(3) "usr"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "/"
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "usr"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "usr"
+  ["dirname"]=>
+  string(1) "/"
+  ["basename"]=>
+  string(3) "usr"
+  ["filename"]=>
+  string(3) "usr"
 }
 -- Iteration 39 --
-%unicode|string%(1) "/"
-%unicode|string%(3) "usr"
-%unicode|string%(0) ""
-%unicode|string%(3) "usr"
+string(1) "/"
+string(3) "usr"
+string(0) ""
+string(3) "usr"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "/"
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "usr"
-  [%u|b%"filename"]=>
-  %unicode|string%(3) "usr"
+  ["dirname"]=>
+  string(1) "/"
+  ["basename"]=>
+  string(3) "usr"
+  ["filename"]=>
+  string(3) "usr"
 }
 Done
 
diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt
index 23c0768ded..3ec7eec358 100644
--- a/ext/standard/tests/file/pathinfo_basic2.phpt
+++ b/ext/standard/tests/file/pathinfo_basic2.phpt
@@ -51,223 +51,223 @@ echo "Done\n";
 --EXPECTF--
 *** Testing basic functions of pathinfo() ***
 -- Iteration 1 --
-%unicode|string%(1) "."
-%unicode|string%(10) "c:\..\dir1"
-%unicode|string%(5) "\dir1"
-%unicode|string%(4) "c:\."
+string(1) "."
+string(10) "c:\..\dir1"
+string(5) "\dir1"
+string(4) "c:\."
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(10) "c:\..\dir1"
-  [%u|b%"extension"]=>
-  %unicode|string%(5) "\dir1"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "c:\."
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(10) "c:\..\dir1"
+  ["extension"]=>
+  string(5) "\dir1"
+  ["filename"]=>
+  string(4) "c:\."
 }
 -- Iteration 2 --
-%unicode|string%(1) "."
-%unicode|string%(33) "c:\test\..\test2\.\adir\afile.txt"
-%unicode|string%(3) "txt"
-%unicode|string%(29) "c:\test\..\test2\.\adir\afile"
+string(1) "."
+string(33) "c:\test\..\test2\.\adir\afile.txt"
+string(3) "txt"
+string(29) "c:\test\..\test2\.\adir\afile"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(33) "c:\test\..\test2\.\adir\afile.txt"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "txt"
-  [%u|b%"filename"]=>
-  %unicode|string%(29) "c:\test\..\test2\.\adir\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(33) "c:\test\..\test2\.\adir\afile.txt"
+  ["extension"]=>
+  string(3) "txt"
+  ["filename"]=>
+  string(29) "c:\test\..\test2\.\adir\afile"
 }
 -- Iteration 3 --
-%unicode|string%(22) "/usr/include/../arpa/."
-%unicode|string%(6) "inet.h"
-%unicode|string%(1) "h"
-%unicode|string%(4) "inet"
+string(22) "/usr/include/../arpa/."
+string(6) "inet.h"
+string(1) "h"
+string(4) "inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(22) "/usr/include/../arpa/."
-  [%u|b%"basename"]=>
-  %unicode|string%(6) "inet.h"
-  [%u|b%"extension"]=>
-  %unicode|string%(1) "h"
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "inet"
+  ["dirname"]=>
+  string(22) "/usr/include/../arpa/."
+  ["basename"]=>
+  string(6) "inet.h"
+  ["extension"]=>
+  string(1) "h"
+  ["filename"]=>
+  string(4) "inet"
 }
 -- Iteration 4 --
-%unicode|string%(1) "."
-%unicode|string%(23) "c:\test\adir\afile..txt"
-%unicode|string%(3) "txt"
-%unicode|string%(19) "c:\test\adir\afile."
+string(1) "."
+string(23) "c:\test\adir\afile..txt"
+string(3) "txt"
+string(19) "c:\test\adir\afile."
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(23) "c:\test\adir\afile..txt"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "txt"
-  [%u|b%"filename"]=>
-  %unicode|string%(19) "c:\test\adir\afile."
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(23) "c:\test\adir\afile..txt"
+  ["extension"]=>
+  string(3) "txt"
+  ["filename"]=>
+  string(19) "c:\test\adir\afile."
 }
 -- Iteration 5 --
-%unicode|string%(17) "/usr/include/arpa"
-%unicode|string%(7) "inet..h"
-%unicode|string%(1) "h"
-%unicode|string%(5) "inet."
+string(17) "/usr/include/arpa"
+string(7) "inet..h"
+string(1) "h"
+string(5) "inet."
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(17) "/usr/include/arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(7) "inet..h"
-  [%u|b%"extension"]=>
-  %unicode|string%(1) "h"
-  [%u|b%"filename"]=>
-  %unicode|string%(5) "inet."
+  ["dirname"]=>
+  string(17) "/usr/include/arpa"
+  ["basename"]=>
+  string(7) "inet..h"
+  ["extension"]=>
+  string(1) "h"
+  ["filename"]=>
+  string(5) "inet."
 }
 -- Iteration 6 --
-%unicode|string%(1) "."
-%unicode|string%(19) "c:\test\adir\afile."
-%unicode|string%(0) ""
-%unicode|string%(18) "c:\test\adir\afile"
+string(1) "."
+string(19) "c:\test\adir\afile."
+string(0) ""
+string(18) "c:\test\adir\afile"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(19) "c:\test\adir\afile."
-  [%u|b%"extension"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(18) "c:\test\adir\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(19) "c:\test\adir\afile."
+  ["extension"]=>
+  string(0) ""
+  ["filename"]=>
+  string(18) "c:\test\adir\afile"
 }
 -- Iteration 7 --
-%unicode|string%(17) "/usr/include/arpa"
-%unicode|string%(5) "inet."
-%unicode|string%(0) ""
-%unicode|string%(4) "inet"
+string(17) "/usr/include/arpa"
+string(5) "inet."
+string(0) ""
+string(4) "inet"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(17) "/usr/include/arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(5) "inet."
-  [%u|b%"extension"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(4) "inet"
+  ["dirname"]=>
+  string(17) "/usr/include/arpa"
+  ["basename"]=>
+  string(5) "inet."
+  ["extension"]=>
+  string(0) ""
+  ["filename"]=>
+  string(4) "inet"
 }
 -- Iteration 8 --
-%unicode|string%(17) "/usr/include/arpa"
-%unicode|string%(6) "inet,h"
-%unicode|string%(0) ""
-%unicode|string%(6) "inet,h"
+string(17) "/usr/include/arpa"
+string(6) "inet,h"
+string(0) ""
+string(6) "inet,h"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(17) "/usr/include/arpa"
-  [%u|b%"basename"]=>
-  %unicode|string%(6) "inet,h"
-  [%u|b%"filename"]=>
-  %unicode|string%(6) "inet,h"
+  ["dirname"]=>
+  string(17) "/usr/include/arpa"
+  ["basename"]=>
+  string(6) "inet,h"
+  ["filename"]=>
+  string(6) "inet,h"
 }
 -- Iteration 9 --
-%unicode|string%(1) "."
-%unicode|string%(11) "c:afile.txt"
-%unicode|string%(3) "txt"
-%unicode|string%(7) "c:afile"
+string(1) "."
+string(11) "c:afile.txt"
+string(3) "txt"
+string(7) "c:afile"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(11) "c:afile.txt"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "txt"
-  [%u|b%"filename"]=>
-  %unicode|string%(7) "c:afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(11) "c:afile.txt"
+  ["extension"]=>
+  string(3) "txt"
+  ["filename"]=>
+  string(7) "c:afile"
 }
 -- Iteration 10 --
-%unicode|string%(1) "."
-%unicode|string%(22) "..\.\..\test\afile.txt"
-%unicode|string%(3) "txt"
-%unicode|string%(18) "..\.\..\test\afile"
+string(1) "."
+string(22) "..\.\..\test\afile.txt"
+string(3) "txt"
+string(18) "..\.\..\test\afile"
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(22) "..\.\..\test\afile.txt"
-  [%u|b%"extension"]=>
-  %unicode|string%(3) "txt"
-  [%u|b%"filename"]=>
-  %unicode|string%(18) "..\.\..\test\afile"
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(22) "..\.\..\test\afile.txt"
+  ["extension"]=>
+  string(3) "txt"
+  ["filename"]=>
+  string(18) "..\.\..\test\afile"
 }
 -- Iteration 11 --
-%unicode|string%(12) ".././../test"
-%unicode|string%(5) "afile"
-%unicode|string%(0) ""
-%unicode|string%(5) "afile"
+string(12) ".././../test"
+string(5) "afile"
+string(0) ""
+string(5) "afile"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(12) ".././../test"
-  [%u|b%"basename"]=>
-  %unicode|string%(5) "afile"
-  [%u|b%"filename"]=>
-  %unicode|string%(5) "afile"
+  ["dirname"]=>
+  string(12) ".././../test"
+  ["basename"]=>
+  string(5) "afile"
+  ["filename"]=>
+  string(5) "afile"
 }
 -- Iteration 12 --
-%unicode|string%(1) "."
-%unicode|string%(1) "."
-%unicode|string%(0) ""
-%unicode|string%(0) ""
+string(1) "."
+string(1) "."
+string(0) ""
+string(0) ""
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(1) "."
-  [%u|b%"extension"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(0) ""
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(1) "."
+  ["extension"]=>
+  string(0) ""
+  ["filename"]=>
+  string(0) ""
 }
 -- Iteration 13 --
-%unicode|string%(1) "."
-%unicode|string%(2) ".."
-%unicode|string%(0) ""
-%unicode|string%(1) "."
+string(1) "."
+string(2) ".."
+string(0) ""
+string(1) "."
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(2) ".."
-  [%u|b%"extension"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(1) "."
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(2) ".."
+  ["extension"]=>
+  string(0) ""
+  ["filename"]=>
+  string(1) "."
 }
 -- Iteration 14 --
-%unicode|string%(1) "."
-%unicode|string%(3) "..."
-%unicode|string%(0) ""
-%unicode|string%(2) ".."
+string(1) "."
+string(3) "..."
+string(0) ""
+string(2) ".."
 array(4) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(1) "."
-  [%u|b%"basename"]=>
-  %unicode|string%(3) "..."
-  [%u|b%"extension"]=>
-  %unicode|string%(0) ""
-  [%u|b%"filename"]=>
-  %unicode|string%(2) ".."
+  ["dirname"]=>
+  string(1) "."
+  ["basename"]=>
+  string(3) "..."
+  ["extension"]=>
+  string(0) ""
+  ["filename"]=>
+  string(2) ".."
 }
 -- Iteration 15 --
-%unicode|string%(12) "/usr/lib/..."
-%unicode|string%(5) "afile"
-%unicode|string%(0) ""
-%unicode|string%(5) "afile"
+string(12) "/usr/lib/..."
+string(5) "afile"
+string(0) ""
+string(5) "afile"
 array(3) {
-  [%u|b%"dirname"]=>
-  %unicode|string%(12) "/usr/lib/..."
-  [%u|b%"basename"]=>
-  %unicode|string%(5) "afile"
-  [%u|b%"filename"]=>
-  %unicode|string%(5) "afile"
+  ["dirname"]=>
+  string(12) "/usr/lib/..."
+  ["basename"]=>
+  string(5) "afile"
+  ["filename"]=>
+  string(5) "afile"
 }
 Done
 
diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt
index 04882853ec..4e619a3286 100644
--- a/ext/standard/tests/file/proc_open01.phpt
+++ b/ext/standard/tests/file/proc_open01.phpt
@@ -57,7 +57,7 @@ array(2) {
   [1]=>
   resource(%d) of type (stream)
 }
-%unicode|string%(5) "yay!
+string(5) "yay!
 "
 array(3) {
   [0]=>
diff --git a/ext/standard/tests/file/symlink_to_symlink.phpt b/ext/standard/tests/file/symlink_to_symlink.phpt
index 8b7ff65cf0..c13c26d827 100644
--- a/ext/standard/tests/file/symlink_to_symlink.phpt
+++ b/ext/standard/tests/file/symlink_to_symlink.phpt
@@ -43,8 +43,8 @@ unlink($prefix . "_file");
 
 ?>
 --EXPECTF--
-%unicode|string%(%d) "symlink_to_symlink.php_file"
-%unicode|string%(%d) "symlink_to_symlink.php_link1"
-%unicode|string%(%d) "symlink_to_symlink.php_nonexistent"
-%unicode|string%(%d) "%s/symlink_to_symlink.php_file"
-%unicode|string%(%d) "%s/symlink_to_symlink.php_link4"
+string(%d) "symlink_to_symlink.php_file"
+string(%d) "symlink_to_symlink.php_link1"
+string(%d) "symlink_to_symlink.php_nonexistent"
+string(%d) "%s/symlink_to_symlink.php_file"
+string(%d) "%s/symlink_to_symlink.php_link4"
diff --git a/ext/standard/tests/file/unlink_error.phpt b/ext/standard/tests/file/unlink_error.phpt
index 9571784a31..ae888bce4a 100644
--- a/ext/standard/tests/file/unlink_error.phpt
+++ b/ext/standard/tests/file/unlink_error.phpt
@@ -89,7 +89,7 @@ Warning: unlink(): %s in %s on line %d
 bool(false)
 bool(false)
 
-Warning: unlink() expects parameter 2 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: unlink() expects parameter 2 to be resource, string given in %s on line %d
 bool(false)
 
 Warning: unlink() expects parameter 2 to be resource, boolean given in %s on line %d
diff --git a/ext/standard/tests/general_functions/parse_ini_string_002.phpt b/ext/standard/tests/general_functions/parse_ini_string_002.phpt
index 733409c84b..98c9c0b359 100644
--- a/ext/standard/tests/general_functions/parse_ini_string_002.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_string_002.phpt
@@ -93,8 +93,8 @@ bool(false)
 Warning: parse_ini_string() expects at most 3 parameters, 4 given in %s
 bool(false)
 array(1) {
-  [%u|b%"test"]=>
-  %unicode|string%(0) ""
+  ["test"]=>
+  string(0) ""
 }
 
 Warning: syntax error, unexpected '='%sin Unknown on line 2
@@ -105,64 +105,64 @@ Warning: syntax error, unexpected '='%sin Unknown on line 2
  in %s
 bool(false)
 array(1) {
-  [%u|b%"test"]=>
-  %unicode|string%(8) "new
+  ["test"]=>
+  string(8) "new
 line"
 }
 array(1) {
-  [%u|b%"test"]=>
-  %unicode|string%(16) "test const value"
+  ["test"]=>
+  string(16) "test const value"
 }
 array(1) {
-  [%u|b%"section"]=>
+  ["section"]=>
   array(1) {
-    [%u|b%"test"]=>
-    %unicode|string%(5) "hello"
+    ["test"]=>
+    string(5) "hello"
   }
 }
 array(1) {
-  [%u|b%"test"]=>
-  %unicode|string%(5) "hello"
+  ["test"]=>
+  string(5) "hello"
 }
 array(1) {
-  [%u|b%"section.test"]=>
-  %unicode|string%(5) "hello"
+  ["section.test"]=>
+  string(5) "hello"
 }
 array(1) {
-  [%u|b%"section"]=>
+  ["section"]=>
   array(1) {
-    [%u|b%"section.test"]=>
-    %unicode|string%(5) "hello"
+    ["section.test"]=>
+    string(5) "hello"
   }
 }
 array(1) {
-  [%u|b%"section"]=>
+  ["section"]=>
   array(1) {
     [1]=>
-    %unicode|string%(1) "2"
+    string(1) "2"
   }
 }
 array(1) {
   [1]=>
-  %unicode|string%(1) "2"
+  string(1) "2"
 }
 array(1) {
-  [%u|b%"test"]=>
-  %unicode|string%(5) "test4"
+  ["test"]=>
+  string(5) "test4"
 }
 array(1) {
-  [%u|b%"section1"]=>
+  ["section1"]=>
   array(1) {
-    [%u|b%"name"]=>
-    %unicode|string%(5) "value"
+    ["name"]=>
+    string(5) "value"
   }
 }
 array(3) {
-  [%u|b%"foo"]=>
-  %unicode|string%(4) "bar1"
-  [%u|b%"_foo"]=>
-  %unicode|string%(4) "bar2"
-  [%u|b%"foo_"]=>
-  %unicode|string%(4) "bar3"
+  ["foo"]=>
+  string(4) "bar1"
+  ["_foo"]=>
+  string(4) "bar2"
+  ["foo_"]=>
+  string(4) "bar3"
 }
 Done
diff --git a/ext/standard/tests/misc/time_nanosleep_error1.phpt b/ext/standard/tests/misc/time_nanosleep_error1.phpt
index 0408396eea..3bbd330e2c 100644
--- a/ext/standard/tests/misc/time_nanosleep_error1.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error1.phpt
@@ -11,4 +11,4 @@ $nano = time_nanosleep('A', 100000);
 
 ?>
 --EXPECTF--
-Warning: time_nanosleep() expects parameter 1 to be integer, %unicode_string_optional% given in %s.php on line %d
+Warning: time_nanosleep() expects parameter 1 to be integer, string given in %s.php on line %d
diff --git a/ext/standard/tests/misc/time_nanosleep_error2.phpt b/ext/standard/tests/misc/time_nanosleep_error2.phpt
index 3e8f9349e8..72d84c42b6 100644
--- a/ext/standard/tests/misc/time_nanosleep_error2.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error2.phpt
@@ -11,4 +11,4 @@ $nano = time_nanosleep(2, 'B');
 
 ?>
 --EXPECTF--
-Warning: time_nanosleep() expects parameter 2 to be integer, %unicode_string_optional% given in %s.php on line %d
+Warning: time_nanosleep() expects parameter 2 to be integer, string given in %s.php on line %d
diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt
index 6e9a1553c8..10b4dad0a6 100644
--- a/ext/standard/tests/network/inet.phpt
+++ b/ext/standard/tests/network/inet.phpt
@@ -38,8 +38,8 @@ foreach ($array as $val) {
 echo "Done\n";
 ?>
 --EXPECTF--	
-%unicode|string%(9) "127.0.0.1"
-%unicode|string%(13) "255.255.255.0"
+string(9) "127.0.0.1"
+string(13) "255.255.255.0"
 
 Warning: inet_ntop() expects exactly 1 parameter, 0 given in %s on line %d
 bool(false)
@@ -64,12 +64,12 @@ bool(false)
 
 Warning: inet_pton(): Unrecognized address abra in %s on line %d
 bool(false)
-%unicode|string%(%d) "7f000001"
-%unicode|string%(9) "127.0.0.1"
-%unicode|string%(%d) "42a3a174"
-%unicode|string%(14) "66.163.161.116"
-%unicode|string%(%d) "ffffffff"
-%unicode|string%(15) "255.255.255.255"
-%unicode|string%(%d) "00000000"
-%unicode|string%(7) "0.0.0.0"
+string(%d) "7f000001"
+string(9) "127.0.0.1"
+string(%d) "42a3a174"
+string(14) "66.163.161.116"
+string(%d) "ffffffff"
+string(15) "255.255.255.255"
+string(%d) "00000000"
+string(7) "0.0.0.0"
 Done
diff --git a/ext/standard/tests/streams/stream_context_get_params_001.phpt b/ext/standard/tests/streams/stream_context_get_params_001.phpt
index d946184f63..e8b107ccfe 100644
--- a/ext/standard/tests/streams/stream_context_get_params_001.phpt
+++ b/ext/standard/tests/streams/stream_context_get_params_001.phpt
@@ -25,97 +25,97 @@ var_dump(stream_context_get_options($ctx));
 --EXPECTF--
 resource(%d) of type (stream-context)
 array(1) {
-  [%u|b%"options"]=>
+  ["options"]=>
   array(0) {
   }
 }
 bool(true)
 array(1) {
-  [%u|b%"options"]=>
+  ["options"]=>
   array(1) {
-    [%u|b%"foo"]=>
+    ["foo"]=>
     array(1) {
-      [%u|b%"bar"]=>
-      %unicode|string%(3) "baz"
+      ["bar"]=>
+      string(3) "baz"
     }
   }
 }
 bool(true)
 array(2) {
-  [%u|b%"notification"]=>
-  %unicode|string%(28) "stream_notification_callback"
-  [%u|b%"options"]=>
+  ["notification"]=>
+  string(28) "stream_notification_callback"
+  ["options"]=>
   array(1) {
-    [%u|b%"foo"]=>
+    ["foo"]=>
     array(1) {
-      [%u|b%"bar"]=>
-      %unicode|string%(3) "baz"
+      ["bar"]=>
+      string(3) "baz"
     }
   }
 }
 bool(true)
 array(2) {
-  [%u|b%"notification"]=>
+  ["notification"]=>
   array(2) {
     [0]=>
-    %unicode|string%(6) "stream"
+    string(6) "stream"
     [1]=>
-    %unicode|string%(21) "notification_callback"
+    string(21) "notification_callback"
   }
-  [%u|b%"options"]=>
+  ["options"]=>
   array(1) {
-    [%u|b%"foo"]=>
+    ["foo"]=>
     array(1) {
-      [%u|b%"bar"]=>
-      %unicode|string%(3) "baz"
+      ["bar"]=>
+      string(3) "baz"
     }
   }
 }
 array(2) {
-  [%u|b%"notification"]=>
+  ["notification"]=>
   array(2) {
     [0]=>
-    %unicode|string%(6) "stream"
+    string(6) "stream"
     [1]=>
-    %unicode|string%(21) "notification_callback"
+    string(21) "notification_callback"
   }
-  [%u|b%"options"]=>
+  ["options"]=>
   array(1) {
-    [%u|b%"foo"]=>
+    ["foo"]=>
     array(1) {
-      [%u|b%"bar"]=>
-      %unicode|string%(3) "baz"
+      ["bar"]=>
+      string(3) "baz"
     }
   }
 }
 array(1) {
-  [%u|b%"foo"]=>
+  ["foo"]=>
   array(1) {
-    [%u|b%"bar"]=>
-    %unicode|string%(3) "baz"
+    ["bar"]=>
+    string(3) "baz"
   }
 }
 array(2) {
-  [%u|b%"notification"]=>
+  ["notification"]=>
   array(2) {
     [0]=>
-    %unicode|string%(6) "stream"
+    string(6) "stream"
     [1]=>
-    %unicode|string%(21) "notification_callback"
+    string(21) "notification_callback"
   }
-  [%u|b%"options"]=>
+  ["options"]=>
   array(1) {
-    [%u|b%"foo"]=>
+    ["foo"]=>
     array(1) {
-      [%u|b%"bar"]=>
-      %unicode|string%(3) "baz"
+      ["bar"]=>
+      string(3) "baz"
     }
   }
 }
 array(1) {
-  [%u|b%"foo"]=>
+  ["foo"]=>
   array(1) {
-    [%u|b%"bar"]=>
-    %unicode|string%(3) "baz"
+    ["bar"]=>
+    string(3) "baz"
   }
 }
diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt
index 84e4337463..b30042e939 100644
--- a/ext/standard/tests/strings/bug40754.phpt
+++ b/ext/standard/tests/strings/bug40754.phpt
@@ -27,8 +27,8 @@ var_dump(substr("abcde", $v, $v));
 
 ?>
 --EXPECTF--	
-%unicode|string%(4) "bcde"
-%unicode|string%(6) "abcdex"
+string(4) "bcde"
+string(6) "abcdex"
 bool(false)
 bool(false)
 
diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt
index c058390ea9..81c974cbf8 100644
--- a/ext/standard/tests/strings/htmlentities-utf-2.phpt
+++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt
@@ -18,53 +18,53 @@ foreach($strings as $string) {
 }
 ?>
 --EXPECTF--
-%unicode|string%(8) "266c743b"
-%unicode|string%(8) "266c743b"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(4) "d090"
-%unicode|string%(4) "d090"
-%unicode|string%(4) "d090"
-%unicode|string%(4) "d090"
-%unicode|string%(8) "d090d0b0"
-%unicode|string%(8) "d090d0b0"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(2) "41"
-%unicode|string%(2) "41"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(2) "79"
-%unicode|string%(2) "79"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(8) "566f696c"
-%unicode|string%(8) "566f696c"
-%unicode|string%(12) "436c69636873"
-%unicode|string%(12) "436c69636873"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(2) "41"
-%unicode|string%(2) "41"
-%unicode|string%(4) "c3a9"
-%unicode|string%(16) "266561637574653b"
-%unicode|string%(2) "79"
-%unicode|string%(2) "79"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(4) "4142"
-%unicode|string%(4) "4142"
-%unicode|string%(4) "4242"
-%unicode|string%(4) "4242"
-%unicode|string%(4) "4342"
-%unicode|string%(4) "4342"
-%unicode|string%(2) "44"
-%unicode|string%(2) "44"
-%unicode|string%(2) "45"
-%unicode|string%(2) "45"
-%unicode|string%(2) "46"
-%unicode|string%(2) "46"
+string(8) "266c743b"
+string(8) "266c743b"
+string(0) ""
+string(0) ""
+string(4) "d090"
+string(4) "d090"
+string(4) "d090"
+string(4) "d090"
+string(8) "d090d0b0"
+string(8) "d090d0b0"
+string(0) ""
+string(0) ""
+string(2) "41"
+string(2) "41"
+string(0) ""
+string(0) ""
+string(2) "79"
+string(2) "79"
+string(0) ""
+string(0) ""
+string(8) "566f696c"
+string(8) "566f696c"
+string(12) "436c69636873"
+string(12) "436c69636873"
+string(0) ""
+string(0) ""
+string(2) "41"
+string(2) "41"
+string(4) "c3a9"
+string(16) "266561637574653b"
+string(2) "79"
+string(2) "79"
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(4) "4142"
+string(4) "4142"
+string(4) "4242"
+string(4) "4242"
+string(4) "4342"
+string(4) "4342"
+string(2) "44"
+string(2) "44"
+string(2) "45"
+string(2) "45"
+string(2) "46"
+string(2) "46"
diff --git a/ext/standard/tests/strings/htmlentities-utf.phpt b/ext/standard/tests/strings/htmlentities-utf.phpt
index de99449552..0dc5b8030c 100644
--- a/ext/standard/tests/strings/htmlentities-utf.phpt
+++ b/ext/standard/tests/strings/htmlentities-utf.phpt
@@ -18,53 +18,53 @@ foreach($strings as $string) {
 }
 ?>
 --EXPECTF--
-%unicode|string%(8) "266c743b"
-%unicode|string%(8) "266c743b"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(4) "d090"
-%unicode|string%(4) "d090"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(8) "d090d0b0"
-%unicode|string%(8) "d090d0b0"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(4) "c3a9"
-%unicode|string%(16) "266561637574653b"
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
-%unicode|string%(0) ""
+string(8) "266c743b"
+string(8) "266c743b"
+string(0) ""
+string(0) ""
+string(4) "d090"
+string(4) "d090"
+string(0) ""
+string(0) ""
+string(8) "d090d0b0"
+string(8) "d090d0b0"
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(4) "c3a9"
+string(16) "266561637574653b"
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
diff --git a/ext/standard/tests/versioning/php_sapi_name.phpt b/ext/standard/tests/versioning/php_sapi_name.phpt
index c9d4988d95..0747b32d66 100644
--- a/ext/standard/tests/versioning/php_sapi_name.phpt
+++ b/ext/standard/tests/versioning/php_sapi_name.phpt
@@ -6,4 +6,4 @@ php_sapi_name test
 var_dump(php_sapi_name());
 
 --EXPECTF--
-%unicode|string%(3) "c%ci"
+string(3) "c%ci"
diff --git a/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt b/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt
index 758d4bab21..f6d9a8852f 100644
--- a/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt
+++ b/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt
@@ -16,10 +16,10 @@ var_dump($proc->getParameter('', array()));
 Warning: XSLTProcessor::getParameter() expects exactly 2 parameters, 0 given in %s on line %d
 bool(false)
 
-Warning: XSLTProcessor::getParameter() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: XSLTProcessor::getParameter() expects parameter 1 to be string, array given in %s on line %d
 bool(false)
 
-Warning: XSLTProcessor::getParameter() expects parameter 2 to be %binary_string_optional%, array given in %s on line %d
+Warning: XSLTProcessor::getParameter() expects parameter 2 to be string, array given in %s on line %d
 bool(false)
 --CREDITS--
 Christian Weiske, cweiske@php.net
diff --git a/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt b/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt
index c2b4f4c0c3..bbfdc20cd7 100644
--- a/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt
+++ b/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt
@@ -15,9 +15,9 @@ $proc->removeParameter('', array());
 --EXPECTF--
 Warning: XSLTProcessor::removeParameter() expects exactly 2 parameters, 0 given in %s on line %d
 
-Warning: XSLTProcessor::removeParameter() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: XSLTProcessor::removeParameter() expects parameter 1 to be string, array given in %s on line %d
 
-Warning: XSLTProcessor::removeParameter() expects parameter 2 to be %binary_string_optional%, array given in %s on line %d
+Warning: XSLTProcessor::removeParameter() expects parameter 2 to be string, array given in %s on line %d
 --CREDITS--
 Christian Weiske, cweiske@php.net
 PHP Testfest Berlin 2009-05-09
diff --git a/sapi/cgi/tests/002.phpt b/sapi/cgi/tests/002.phpt
index 884e6521e2..fda8fcbe04 100644
--- a/sapi/cgi/tests/002.phpt
+++ b/sapi/cgi/tests/002.phpt
@@ -31,22 +31,22 @@ echo "Done\n";
 string(%d) "X-Powered-By: PHP/%s
 Content-type: text/html%r; charset=.*|%r
 
-%unicode|string%(3) "111"
+string(3) "111"
 "
 string(%d) "X-Powered-By: PHP/%s
 Content-type: text/html%r; charset=.*|%r
 
-%unicode|string%(3) "500"
+string(3) "500"
 "
 string(%d) "X-Powered-By: PHP/%s
 Content-type: text/html%r; charset=.*|%r
 
-%unicode|string%(3) "555"
+string(3) "555"
 "
 string(%d) "X-Powered-By: PHP/%s
 Content-type: text/html%r; charset=.*|%r
 
-%unicode|string%(3) "555"
-%unicode|string%(10) "/test/path"
+string(3) "555"
+string(10) "/test/path"
 "
 Done
diff --git a/tests/basic/bug55500.phpt b/tests/basic/bug55500.phpt
index 97eeea2c8c..2f9e393348 100644
--- a/tests/basic/bug55500.phpt
+++ b/tests/basic/bug55500.phpt
@@ -35,29 +35,29 @@ var_dump($_POST);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"file"]=>
+  ["file"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     array(1) {
       [0]=>
-      %unicode|string%(9) "file1.txt"
+      string(9) "file1.txt"
     }
-    [%u|b%"type"]=>
+    ["type"]=>
     array(1) {
       [0]=>
-      %unicode|string%(16) "text/plain-file1"
+      string(16) "text/plain-file1"
     }
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     array(1) {
       [0]=>
-      %unicode|string%(%d) "%s"
+      string(%d) "%s"
     }
-    [%u|b%"error"]=>
+    ["error"]=>
     array(1) {
       [0]=>
       int(0)
     }
-    [%u|b%"size"]=>
+    ["size"]=>
     array(1) {
       [0]=>
       int(1)
diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt
index 361bbbcca7..1612d554cf 100644
--- a/tests/basic/rfc1867_anonymous_upload.phpt
+++ b/tests/basic/rfc1867_anonymous_upload.phpt
@@ -26,28 +26,28 @@ var_dump($_POST);
 array(2) {
   [%d]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
   [%d]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file2"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/tests/basic/rfc1867_array_upload.phpt b/tests/basic/rfc1867_array_upload.phpt
index bbaa5c82ef..90ed0c36e0 100644
--- a/tests/basic/rfc1867_array_upload.phpt
+++ b/tests/basic/rfc1867_array_upload.phpt
@@ -29,36 +29,36 @@ var_dump($_POST);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"file"]=>
+  ["file"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     array(3) {
       [0]=>
-      %unicode|string%(9) "file1.txt"
+      string(9) "file1.txt"
       [2]=>
-      %unicode|string%(9) "file2.txt"
+      string(9) "file2.txt"
       [3]=>
-      %unicode|string%(9) "file3.txt"
+      string(9) "file3.txt"
     }
-    [%u|b%"type"]=>
+    ["type"]=>
     array(3) {
       [0]=>
-      %unicode|string%(16) "text/plain-file1"
+      string(16) "text/plain-file1"
       [2]=>
-      %unicode|string%(16) "text/plain-file2"
+      string(16) "text/plain-file2"
       [3]=>
-      %unicode|string%(16) "text/plain-file3"
+      string(16) "text/plain-file3"
     }
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     array(3) {
       [0]=>
-      %unicode|string%(%d) "%s"
+      string(%d) "%s"
       [2]=>
-      %unicode|string%(%d) "%s"
+      string(%d) "%s"
       [3]=>
-      %unicode|string%(%d) "%s"
+      string(%d) "%s"
     }
-    [%u|b%"error"]=>
+    ["error"]=>
     array(3) {
       [0]=>
       int(0)
@@ -67,7 +67,7 @@ array(1) {
       [3]=>
       int(0)
     }
-    [%u|b%"size"]=>
+    ["size"]=>
     array(3) {
       [0]=>
       int(1)
diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt
index e5321201a5..bea825e797 100644
--- a/tests/basic/rfc1867_boundary_1.phpt
+++ b/tests/basic/rfc1867_boundary_1.phpt
@@ -18,6 +18,6 @@ var_dump($_POST);
 array(0) {
 }
 array(1) {
-  [%u|b%"foobar"]=>
-  %unicode|string%(1) "1"
+  ["foobar"]=>
+  string(1) "1"
 }
diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt
index 88f213fffa..b59fc6db98 100644
--- a/tests/basic/rfc1867_boundary_2.phpt
+++ b/tests/basic/rfc1867_boundary_2.phpt
@@ -18,6 +18,6 @@ var_dump($_POST);
 array(0) {
 }
 array(1) {
-  [%u|b%"foobar"]=>
-  %unicode|string%(1) "1"
+  ["foobar"]=>
+  string(1) "1"
 }
diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt
index 039d994c50..bb6ccee896 100644
--- a/tests/basic/rfc1867_empty_upload.phpt
+++ b/tests/basic/rfc1867_empty_upload.phpt
@@ -39,49 +39,49 @@ if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
 ?>
 --EXPECTF--
 array(3) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(0) ""
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(0) ""
-    [%u|b%"error"]=>
+    ["error"]=>
     int(4)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(0)
   }
-  [%u|b%"file3"]=>
+  ["file3"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(1) {
-  [%u|b%"foo"]=>
-  %unicode|string%(0) ""
+  ["foo"]=>
+  string(0) ""
 }
 string(1) "1"
 string(1) "3"
diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt
index aa4b5ee0f1..1e1a747372 100644
--- a/tests/basic/rfc1867_file_upload_disabled.phpt
+++ b/tests/basic/rfc1867_file_upload_disabled.phpt
@@ -27,8 +27,8 @@ var_dump($_POST);
 array(0) {
 }
 array(2) {
-  [%u|b%"foo"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"bar"]=>
-  %unicode|string%(3) "foo"
+  ["foo"]=>
+  string(3) "bar"
+  ["bar"]=>
+  string(3) "foo"
 }
diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt
index 1b7b9aabee..61fd89f3d2 100644
--- a/tests/basic/rfc1867_max_file_size.phpt
+++ b/tests/basic/rfc1867_max_file_size.phpt
@@ -39,48 +39,48 @@ if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
 ?>
 --EXPECTF--
 array(3) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(0) ""
-    [%u|b%"error"]=>
+    ["error"]=>
     int(2)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(0)
   }
-  [%u|b%"file3"]=>
+  ["file3"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(1) {
-  [%u|b%"MAX_FILE_SIZE"]=>
+  ["MAX_FILE_SIZE"]=>
   %string|unicode%(1) "1"
 }
 string(1) "1"
diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt
index 1c4581c6c3..9cc847f780 100644
--- a/tests/basic/rfc1867_missing_boundary_2.phpt
+++ b/tests/basic/rfc1867_missing_boundary_2.phpt
@@ -17,17 +17,17 @@ var_dump($_POST);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(0) ""
-    [%u|b%"error"]=>
+    ["error"]=>
     int(3)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(0)
   }
 }
diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt
index da851c417c..89115d0703 100644
--- a/tests/basic/rfc1867_post_max_filesize.phpt
+++ b/tests/basic/rfc1867_post_max_filesize.phpt
@@ -35,43 +35,43 @@ if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
 ?>
 --EXPECTF--
 array(3) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(0) ""
-    [%u|b%"error"]=>
+    ["error"]=>
     int(1)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(0)
   }
-  [%u|b%"file3"]=>
+  ["file3"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/tests/classes/implicit_instantiation_001.phpt b/tests/classes/implicit_instantiation_001.phpt
index 51427df1e8..b0dfe2e8b1 100644
--- a/tests/classes/implicit_instantiation_001.phpt
+++ b/tests/classes/implicit_instantiation_001.phpt
@@ -134,25 +134,25 @@ Warning: Attempt to assign property of non-object in %s on line 26
 
 
  --> Resulting object:object(C)#%d (6) {
-  [%u|b%"boolFalse"]=>
+  ["boolFalse"]=>
   object(stdClass)#%d (1) {
-    [%u|b%"prop"]=>
-    %unicode|string%(24) " Implicit instantiation!"
+    ["prop"]=>
+    string(24) " Implicit instantiation!"
   }
-  [%u|b%"emptyString"]=>
+  ["emptyString"]=>
   object(stdClass)#%d (1) {
-    [%u|b%"prop"]=>
-    %unicode|string%(24) " Implicit instantiation!"
+    ["prop"]=>
+    string(24) " Implicit instantiation!"
   }
-  [%u|b%"null"]=>
+  ["null"]=>
   object(stdClass)#%d (1) {
-    [%u|b%"prop"]=>
-    %unicode|string%(24) " Implicit instantiation!"
+    ["prop"]=>
+    string(24) " Implicit instantiation!"
   }
-  [%u|b%"boolTrue"]=>
+  ["boolTrue"]=>
   bool(true)
-  [%u|b%"nonEmptyString"]=>
-  %unicode|string%(5) "hello"
-  [%u|b%"intZero"]=>
+  ["nonEmptyString"]=>
+  string(5) "hello"
+  ["intZero"]=>
   int(0)
 }
diff --git a/tests/classes/inheritance_006.phpt b/tests/classes/inheritance_006.phpt
index 03d1751f3c..3d5c275011 100644
--- a/tests/classes/inheritance_006.phpt
+++ b/tests/classes/inheritance_006.phpt
@@ -17,8 +17,8 @@ var_dump(new C);
 ?>
 --EXPECTF--
 object(C)#%d (2) {
-  [%u|b%"c":%u|b%"B":private]=>
+  ["c":"B":private]=>
   NULL
-  [%u|b%"c":%u|b%"A":private]=>
+  ["c":"A":private]=>
   NULL
 }
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
index 7bee1072f9..b37b974845 100644
--- a/tests/classes/property_recreate_private.phpt
+++ b/tests/classes/property_recreate_private.phpt
@@ -53,27 +53,27 @@ var_dump($c);
 --EXPECTF--
 Unset and recreate a superclass's private property:
 object(D)#%d (1) {
-  [%u|b%"p":%u|b%"C":private]=>
-  %unicode|string%(7) "changed"
+  ["p":"C":private]=>
+  string(7) "changed"
 }
 
 Unset superclass's private property, and recreate it as public in subclass:
 object(D)#%d (1) {
-  [%u|b%"p"]=>
-  %unicode|string%(12) "changed in D"
+  ["p"]=>
+  string(12) "changed in D"
 }
 
 Unset superclass's private property, and recreate it as public at global scope:
 object(D)#%d (1) {
-  [%u|b%"p"]=>
-  %unicode|string%(34) "this will create a public property"
+  ["p"]=>
+  string(34) "this will create a public property"
 }
 
 
 Unset and recreate a private property:
 object(C)#%d (1) {
-  [%u|b%"p":%u|b%"C":private]=>
-  %unicode|string%(7) "changed"
+  ["p":"C":private]=>
+  string(7) "changed"
 }
 
 Unset a private property, and attempt to recreate at global scope (expecting failure):
diff --git a/tests/classes/property_recreate_protected.phpt b/tests/classes/property_recreate_protected.phpt
index 357f27c796..3319640e3a 100644
--- a/tests/classes/property_recreate_protected.phpt
+++ b/tests/classes/property_recreate_protected.phpt
@@ -38,14 +38,14 @@ var_dump($d);
 --EXPECTF--
 Unset and recreate a protected property from property's declaring class scope:
 object(D)#%d (1) {
-  [%u|b%"p":protected]=>
-  %unicode|string%(7) "changed"
+  ["p":protected]=>
+  string(7) "changed"
 }
 
 Unset and recreate a protected property from subclass:
 object(D)#%d (1) {
-  [%u|b%"p":protected]=>
-  %unicode|string%(12) "changed in D"
+  ["p":protected]=>
+  string(12) "changed in D"
 }
 
 Unset a protected property, and attempt to recreate it outside of scope (expected failure):
diff --git a/tests/classes/serialize_001.phpt b/tests/classes/serialize_001.phpt
index 142fc50fcd..c228e714e9 100644
--- a/tests/classes/serialize_001.phpt
+++ b/tests/classes/serialize_001.phpt
@@ -49,17 +49,17 @@ foreach($tests as $data)
 <?php exit(0); ?>
 --EXPECTF--
 ==========
-%unicode|string%(6) "String"
+string(6) "String"
 Test::__construct(String)
 Test::serialize(String)
 Test::unserialize(String)
 object(Test)#%d (1) {
-  [%u|b%"data"]=>
-  %unicode|string%(6) "String"
+  ["data"]=>
+  string(6) "String"
 }
 object(Test)#%d (1) {
-  [%u|b%"data"]=>
-  %unicode|string%(6) "String"
+  ["data"]=>
+  string(6) "String"
 }
 ==========
 NULL
diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt
index 61c9857b58..2aab44d586 100644
--- a/tests/classes/static_properties_003.phpt
+++ b/tests/classes/static_properties_003.phpt
@@ -41,8 +41,8 @@ Notice: Accessing static property C::$x as non static in %s on line 13
 Notice: Accessing static property C::$x as non static in %s on line 15
 
 Notice: Accessing static property C::$x as non static in %s on line 16
-%unicode|string%(3) "ref"
-%unicode|string%(5) "C::$x"
+string(3) "ref"
+string(5) "C::$x"
 
 --> Access non-visible static prop like instance prop:
 bool(false)
diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt
index 832711ae01..b0fc2ccebc 100644
--- a/tests/classes/static_properties_004.phpt
+++ b/tests/classes/static_properties_004.phpt
@@ -21,17 +21,17 @@ var_dump(C::$p, D::$p, E::$p);
 ==Done==
 --EXPECTF--
 Inherited static properties refer to the same value across classes:
-%unicode|string%(8) "original"
-%unicode|string%(8) "original"
-%unicode|string%(8) "original"
+string(8) "original"
+string(8) "original"
+string(8) "original"
 
 Changing one changes all the others:
-%unicode|string%(11) "changed.all"
-%unicode|string%(11) "changed.all"
-%unicode|string%(11) "changed.all"
+string(11) "changed.all"
+string(11) "changed.all"
+string(11) "changed.all"
 
 But because this is implemented using PHP references, the reference set can easily be split:
-%unicode|string%(11) "changed.all"
-%unicode|string%(11) "changed.one"
-%unicode|string%(11) "changed.all"
+string(11) "changed.all"
+string(11) "changed.one"
+string(11) "changed.all"
 ==Done==
diff --git a/tests/lang/engine_assignExecutionOrder_001.phpt b/tests/lang/engine_assignExecutionOrder_001.phpt
index 1b85cb7e6c..f4d2bbfee9 100644
--- a/tests/lang/engine_assignExecutionOrder_001.phpt
+++ b/tests/lang/engine_assignExecutionOrder_001.phpt
@@ -84,7 +84,7 @@ Order with array assignment:
 in f()
 in g()
 array(1) {
-  [%u|b%"name"]=>
+  ["name"]=>
   %string|unicode%(14) "assigned value"
 }
 
@@ -93,7 +93,7 @@ Order with object property assignment:
 in f()
 in g()
 object(stdClass)#%d (1) {
-  [%u|b%"assigned value"]=>
+  ["assigned value"]=>
   %string|unicode%(14) "assigned value"
 }
 
@@ -102,11 +102,11 @@ Order with nested object property assignment:
 in f()
 in g()
 object(stdClass)#%d (1) {
-  [%u|b%"o1"]=>
+  ["o1"]=>
   object(stdClass)#%d (1) {
-    [%u|b%"o2"]=>
+    ["o2"]=>
     object(stdClass)#%d (1) {
-      [%u|b%"assigned value"]=>
+      ["assigned value"]=>
       %string|unicode%(14) "assigned value"
     }
   }
@@ -117,9 +117,9 @@ Order with dim_list property assignment:
 in f()
 in g()
 object(stdClass)#%d (1) {
-  [%u|b%"a"]=>
+  ["a"]=>
   array(1) {
-    [%u|b%"assigned value"]=>
+    ["assigned value"]=>
     %string|unicode%(14) "assigned value"
   }
 }
@@ -135,7 +135,7 @@ Order with static array property assignment:
 in f()
 in g()
 array(1) {
-  [%u|b%"name"]=>
+  ["name"]=>
   %string|unicode%(14) "assigned value"
 }
 
diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt
index 19989cc80d..64c911d447 100644
--- a/tests/output/ob_implicit_flush_variation_001.phpt
+++ b/tests/output/ob_implicit_flush_variation_001.phpt
@@ -156,27 +156,27 @@ NULL
 NULL
 
 --empty string DQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, %unicode_string_optional% given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
 NULL
 
 --empty string SQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, %unicode_string_optional% given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
 NULL
 
 --string DQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, %unicode_string_optional% given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
 NULL
 
 --string SQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, %unicode_string_optional% given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
 NULL
 
 --mixed case string--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, %unicode_string_optional% given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
 NULL
 
 --heredoc--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, %unicode_string_optional% given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
 NULL
 
 --instance of classWithToString--