Remove more PHP 6 leftovers from tests

15 files changed, 883 insertions, 883 deletions

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