From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Sat, 25 Apr 2009 21:13:07 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.3.0RC2~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bef7308406549be16c328bb7456be42e8680374;p=php

MFH
---

diff --git a/ext/pcre/tests/invalid_utf8_offset.phpt b/ext/pcre/tests/invalid_utf8_offset.phpt
index 4e0d40caf4..b6ec1e596f 100644
--- a/ext/pcre/tests/invalid_utf8_offset.phpt
+++ b/ext/pcre/tests/invalid_utf8_offset.phpt
@@ -9,13 +9,13 @@ if (@preg_match('/./u', '') === false) {
 --FILE--
 <?php
 
-$string = "\xc3\xa9 uma string utf8 bem formada";
+$string = b"\xc3\xa9 uma string utf8 bem formada";
 
-var_dump(preg_match('~.*~u', $string, $m, 0, 1));
+var_dump(preg_match(b'~.*~u', $string, $m, 0, 1));
 var_dump($m);
 var_dump(preg_last_error() == PREG_BAD_UTF8_OFFSET_ERROR);
 
-var_dump(preg_match('~.*~u', $string, $m, 0, 2));
+var_dump(preg_match(b'~.*~u', $string, $m, 0, 2));
 var_dump($m);
 var_dump(preg_last_error() == PREG_NO_ERROR);
 
diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt
index ce47615bc6..11eed0d5a4 100644
--- a/ext/standard/tests/file/007_variation15.phpt
+++ b/ext/standard/tests/file/007_variation15.phpt
@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "xt" mode
    and fclose function
 */
 $file_path = dirname(__FILE__);
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 $file = $file_path."/007_variation15.tmp";
 
 echo "*** Test fopen() & fclose() functions:  with 'xt' mode ***\n";
@@ -45,14 +45,14 @@ unlink(dirname(__FILE__)."/007_variation15.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'xt' mode ***
 resource(%d) of type (stream)
-string(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
 int(37)
 int(37)
 string(0) ""
 int(0)
 bool(true)
-string(7) "Unknown"
+%unicode|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 7886e3287f..528f05a86f 100644
--- a/ext/standard/tests/file/007_variation23.phpt
+++ b/ext/standard/tests/file/007_variation23.phpt
@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "xb" mode
    and fclose function
 */
 $file_path = dirname(__FILE__);
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 $file = $file_path."/007_variation23.tmp";
 
 echo "*** Test fopen() & fclose() functions:  with 'xb' mode ***\n";
@@ -45,14 +45,14 @@ unlink(dirname(__FILE__)."/007_variation23.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'xb' mode ***
 resource(%d) of type (stream)
-string(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
 int(37)
 int(37)
 string(0) ""
 int(0)
 bool(true)
-string(7) "Unknown"
+%unicode|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 2a3f165331..131daff55b 100644
--- a/ext/standard/tests/file/007_variation7.phpt
+++ b/ext/standard/tests/file/007_variation7.phpt
@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "x" mode
    and fclose function
 */
 $file_path = dirname(__FILE__);
-$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
 $file = $file_path."/007_variation7.tmp";
 
 echo "*** Test fopen() & fclose() functions:  with 'x' mode ***\n";
@@ -45,14 +45,14 @@ unlink(dirname(__FILE__)."/007_variation7.tmp");
 --EXPECTF--
 *** Test fopen() & fclose() functions:  with 'x' mode ***
 resource(%d) of type (stream)
-string(6) "stream"
+%unicode|string%(6) "stream"
 int(0)
 int(37)
 int(37)
 string(0) ""
 int(0)
 bool(true)
-string(7) "Unknown"
+%unicode|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/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt
index 4e97767a05..7f012bd8f4 100644
--- a/ext/standard/tests/file/bug27508.phpt
+++ b/ext/standard/tests/file/bug27508.phpt
@@ -30,6 +30,9 @@ class FileStream {
 
     function stream_eof() 
     {
+        if (!$this->fp) {
+            return true;
+        }
         return feof($this->fp);
     }
 
@@ -43,7 +46,7 @@ stream_wrapper_register("myFile", "FileStream")
     or die("Failed to register protocol");
 
 $tmp_dir = __DIR__;
-$tn = tempnam($tmp_dir, 'foo');
+$tn = (binary) tempnam($tmp_dir, 'foo');
 if (!$tn) {
   die("tempnam failed");
 }
@@ -53,9 +56,9 @@ if (!$fp) {
   die("fopen failed");
 }
 
-fwrite($fp, "line1\n");
-fwrite($fp, "line2\n");
-fwrite($fp, "line3\n");
+fwrite($fp, b"line1\n");
+fwrite($fp, b"line2\n");
+fwrite($fp, b"line3\n");
 
 debug_zval_dump(feof($fp));
 rewind($fp);
diff --git a/ext/standard/tests/file/bug46347.phpt b/ext/standard/tests/file/bug46347.phpt
index 903a6e35cc..af81bc217f 100644
--- a/ext/standard/tests/file/bug46347.phpt
+++ b/ext/standard/tests/file/bug46347.phpt
@@ -17,8 +17,8 @@ var_dump(parse_ini_file($file));
 <?php
 unlink(__DIR__.'/parse.ini');
 ?>
---EXPECT--
+--EXPECTF--
 array(1) {
-  ["part1.*.part2"]=>
-  string(1) "1"
+  [%u|b%"part1.*.part2"]=>
+  %unicode|string%(1) "1"
 }
diff --git a/ext/standard/tests/file/file_get_contents_variation5.phpt b/ext/standard/tests/file/file_get_contents_variation5.phpt
index 9b400310cb..ce88d3c3be 100644
--- a/ext/standard/tests/file/file_get_contents_variation5.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5.phpt
@@ -25,7 +25,7 @@ set_error_handler('test_error_handler');
 $filename = 'FileGetContentsVar5.tmp';
 $absFile = dirname(__FILE__).'/'.$filename;
 $h = fopen($absFile,"w");
-fwrite($h, "contents read");
+fwrite($h, b"contents read");
 fclose($h);
 
 
@@ -183,27 +183,27 @@ string(12) "ontents read"
 string(%d) "contents read"
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
 NULL
 
 --instance of classWithToString--
diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt
index 988a3102d2..99812b5349 100644
--- a/ext/standard/tests/file/file_get_contents_variation9.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation9.phpt
@@ -25,7 +25,7 @@ $chainlink = dirname(__FILE__).'/fileGetContentsVar9.ChainLink';
 $h = fopen($filename,"w");
 //Data should be more than the size of a link.
 for ($i = 1; $i <= 10; $i++) {
-   fwrite($h, "Here is a repeated amount of data");
+   fwrite($h, b"Here is a repeated amount of data");
 }
 fclose($h);
 
@@ -48,9 +48,9 @@ echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing file_get_contents() : variation ***
-string(330) "Here is a repeated amount of data%s"
-string(330) "Here is a repeated amount of data%s"
-string(330) "Here is a repeated amount of data%s"
+string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data"
+string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data"
+string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data"
 
 *** Done ***
 
diff --git a/ext/standard/tests/file/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt
index 4c7d4bb082..e459c6a1aa 100644
--- a/ext/standard/tests/file/include_streams.phpt
+++ b/ext/standard/tests/file/include_streams.phpt
@@ -6,6 +6,7 @@ $data1 = $data2 = $data3 = $data4 = $data5 = $data6 = <<<'EOD'
 <?php echo __FILE__ . "\n";?>
 
 EOD;
+/*<?*/
 
 class mystream 
 {
@@ -31,7 +32,7 @@ class mystream
 		$this->options = $options;
 
 		$split = parse_url($path);
-		if ($split["host"] !== "GLOBALS" || 
+		if ($split["host"] !== b"GLOBALS" || 
 		    empty($split["path"]) ||
 		    empty($GLOBALS[substr($split["path"],1)])) {
 		    return false;
@@ -117,7 +118,7 @@ include("data5");
 include_once("data6");
 include_once("data6");
 ?>
---EXPECTF--
+--EXPECT--
 <?php echo __FILE__ . "\n";?>
 test://GLOBALS/data1
 test://GLOBALS/data2
@@ -127,4 +128,3 @@ test://GLOBALS/data4
 <?php echo __FILE__ . "\n";?>
 test://GLOBALS/data5
 test://GLOBALS/data6
-
diff --git a/ext/standard/tests/file/pathinfo_basic.phpt b/ext/standard/tests/file/pathinfo_basic.phpt
index 0761f34d28..53eda5a64e 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 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 2 --
-string(1) "."
-string(17) "www.example.co.in"
-string(2) "in"
-string(14) "www.example.co"
+%unicode|string%(1) "."
+%unicode|string%(17) "www.example.co.in"
+%unicode|string%(2) "in"
+%unicode|string%(14) "www.example.co"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(17) "www.example.co.in"
-  ["extension"]=>
-  string(2) "in"
-  ["filename"]=>
-  string(14) "www.example.co"
+  [%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"
 }
 -- Iteration 3 --
-string(13) "/var/www/html"
-string(12) "example.html"
-string(4) "html"
-string(7) "example"
+%unicode|string%(13) "/var/www/html"
+%unicode|string%(12) "example.html"
+%unicode|string%(4) "html"
+%unicode|string%(7) "example"
 array(4) {
-  ["dirname"]=>
-  string(13) "/var/www/html"
-  ["basename"]=>
-  string(12) "example.html"
-  ["extension"]=>
-  string(4) "html"
-  ["filename"]=>
-  string(7) "example"
+  [%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"
 }
 -- Iteration 4 --
-string(4) "/dir"
-string(11) "test.tar.gz"
-string(2) "gz"
-string(8) "test.tar"
+%unicode|string%(4) "/dir"
+%unicode|string%(11) "test.tar.gz"
+%unicode|string%(2) "gz"
+%unicode|string%(8) "test.tar"
 array(4) {
-  ["dirname"]=>
-  string(4) "/dir"
-  ["basename"]=>
-  string(11) "test.tar.gz"
-  ["extension"]=>
-  string(2) "gz"
-  ["filename"]=>
-  string(8) "test.tar"
+  [%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"
 }
 -- Iteration 5 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 6 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 7 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 8 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 9 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 10 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 11 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 12 --
-string(%d) "%s/foo"
-string(12) "symlink.link"
-string(4) "link"
-string(7) "symlink"
+%unicode|string%(%d) "%s/foo"
+%unicode|string%(12) "symlink.link"
+%unicode|string%(4) "link"
+%unicode|string%(7) "symlink"
 array(4) {
-  ["dirname"]=>
-  string(%d) "%s/foo"
-  ["basename"]=>
-  string(12) "symlink.link"
-  ["extension"]=>
-  string(4) "link"
-  ["filename"]=>
-  string(7) "symlink"
+  [%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"
 }
 -- Iteration 13 --
 string(%d) "%s/foo"
@@ -253,149 +253,149 @@ string(12) "symlink.link"
 string(4) "link"
 string(7) "symlink"
 array(4) {
-  ["dirname"]=>
+  [%u|b%"dirname"]=>
   string(%d) "%s/foo"
-  ["basename"]=>
+  [%u|b%"basename"]=>
   string(12) "symlink.link"
-  ["extension"]=>
+  [%u|b%"extension"]=>
   string(4) "link"
-  ["filename"]=>
+  [%u|b%"filename"]=>
   string(7) "symlink"
 }
 -- Iteration 14 --
-string(1) "."
-string(1) "."
-string(0) ""
-string(0) ""
+%unicode|string%(1) "."
+%unicode|string%(1) "."
+%unicode|string%(0) ""
+%unicode|string%(0) ""
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(1) "."
-  ["extension"]=>
-  string(0) ""
-  ["filename"]=>
-  string(0) ""
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(1) "."
+  [%u|b%"extension"]=>
+  %unicode|string%(0) ""
+  [%u|b%"filename"]=>
+  %unicode|string%(0) ""
 }
 -- Iteration 15 --
-string(%d) "%s"
-string(3) "foo"
-string(0) ""
-string(3) "foo"
+%unicode|string%(%d) "%s"
+%unicode|string%(3) "foo"
+%unicode|string%(0) ""
+%unicode|string%(3) "foo"
 array(3) {
-  ["dirname"]=>
-  string(%d) "%s"
-  ["basename"]=>
-  string(3) "foo"
-  ["filename"]=>
-  string(3) "foo"
+  [%u|b%"dirname"]=>
+  %unicode|string%(%d) "%s"
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "foo"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "foo"
 }
 -- Iteration 16 --
-string(%d) "%s"
-string(3) "foo"
-string(0) ""
-string(3) "foo"
+%unicode|string%(%d) "%s"
+%unicode|string%(3) "foo"
+%unicode|string%(0) ""
+%unicode|string%(3) "foo"
 array(3) {
-  ["dirname"]=>
-  string(%d) "%s"
-  ["basename"]=>
-  string(3) "foo"
-  ["filename"]=>
-  string(3) "foo"
+  [%u|b%"dirname"]=>
+  %unicode|string%(%d) "%s"
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "foo"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "foo"
 }
 -- Iteration 17 --
-string(%d) "%s/.."
-string(3) "foo"
-string(0) ""
-string(3) "foo"
+%unicode|string%(%d) "%s/.."
+%unicode|string%(3) "foo"
+%unicode|string%(0) ""
+%unicode|string%(3) "foo"
 array(3) {
-  ["dirname"]=>
-  string(%d) "%s/.."
-  ["basename"]=>
-  string(3) "foo"
-  ["filename"]=>
-  string(3) "foo"
+  [%u|b%"dirname"]=>
+  %unicode|string%(%d) "%s/.."
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "foo"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "foo"
 }
 -- Iteration 18 --
-string(6) "../foo"
-string(3) "bar"
-string(0) ""
-string(3) "bar"
+%unicode|string%(6) "../foo"
+%unicode|string%(3) "bar"
+%unicode|string%(0) ""
+%unicode|string%(3) "bar"
 array(3) {
-  ["dirname"]=>
-  string(6) "../foo"
-  ["basename"]=>
-  string(3) "bar"
-  ["filename"]=>
-  string(3) "bar"
+  [%u|b%"dirname"]=>
+  %unicode|string%(6) "../foo"
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "bar"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "bar"
 }
 -- Iteration 19 --
-string(5) "./foo"
-string(3) "bar"
-string(0) ""
-string(3) "bar"
+%unicode|string%(5) "./foo"
+%unicode|string%(3) "bar"
+%unicode|string%(0) ""
+%unicode|string%(3) "bar"
 array(3) {
-  ["dirname"]=>
-  string(5) "./foo"
-  ["basename"]=>
-  string(3) "bar"
-  ["filename"]=>
-  string(3) "bar"
+  [%u|b%"dirname"]=>
+  %unicode|string%(5) "./foo"
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "bar"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "bar"
 }
 -- Iteration 20 --
-string(5) "//foo"
-string(3) "bar"
-string(0) ""
-string(3) "bar"
+%unicode|string%(5) "//foo"
+%unicode|string%(3) "bar"
+%unicode|string%(0) ""
+%unicode|string%(3) "bar"
 array(3) {
-  ["dirname"]=>
-  string(5) "//foo"
-  ["basename"]=>
-  string(3) "bar"
-  ["filename"]=>
-  string(3) "bar"
+  [%u|b%"dirname"]=>
+  %unicode|string%(5) "//foo"
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "bar"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "bar"
 }
 -- Iteration 21 --
-string(5) "~/PHP"
-string(8) "php5.2.0"
-string(1) "0"
-string(6) "php5.2"
+%unicode|string%(5) "~/PHP"
+%unicode|string%(8) "php5.2.0"
+%unicode|string%(1) "0"
+%unicode|string%(6) "php5.2"
 array(4) {
-  ["dirname"]=>
-  string(5) "~/PHP"
-  ["basename"]=>
-  string(8) "php5.2.0"
-  ["extension"]=>
-  string(1) "0"
-  ["filename"]=>
-  string(6) "php5.2"
+  [%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"
 }
 -- Iteration 22 --
-string(13) "/home/example"
-string(4) "test"
-string(0) ""
-string(4) "test"
+%unicode|string%(13) "/home/example"
+%unicode|string%(4) "test"
+%unicode|string%(0) ""
+%unicode|string%(4) "test"
 array(3) {
-  ["dirname"]=>
-  string(13) "/home/example"
-  ["basename"]=>
-  string(4) "test"
-  ["filename"]=>
-  string(4) "test"
+  [%u|b%"dirname"]=>
+  %unicode|string%(13) "/home/example"
+  [%u|b%"basename"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"filename"]=>
+  %unicode|string%(4) "test"
 }
 -- Iteration 23 --
-string(23) "http://httpd.apache.org"
-string(24) "core.html#acceptpathinfo"
-string(19) "html#acceptpathinfo"
-string(4) "core"
+%unicode|string%(23) "http://httpd.apache.org"
+%unicode|string%(24) "core.html#acceptpathinfo"
+%unicode|string%(19) "html#acceptpathinfo"
+%unicode|string%(4) "core"
 array(4) {
-  ["dirname"]=>
-  string(23) "http://httpd.apache.org"
-  ["basename"]=>
-  string(24) "core.html#acceptpathinfo"
-  ["extension"]=>
-  string(19) "html#acceptpathinfo"
-  ["filename"]=>
-  string(4) "core"
+  [%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"
 }
 Done
diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt
index 61b183f870..92f0524da4 100644
--- a/ext/standard/tests/file/pathinfo_basic1.phpt
+++ b/ext/standard/tests/file/pathinfo_basic1.phpt
@@ -74,536 +74,537 @@ echo "Done\n";
 --EXPECTF--
 *** Testing basic functions of pathinfo() ***
 -- Iteration 1 --
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
+%unicode|string%(0) ""
+%unicode|string%(0) ""
+%unicode|string%(0) ""
+%unicode|string%(0) ""
 array(2) {
-  ["basename"]=>
-  string(0) ""
-  ["filename"]=>
-  string(0) ""
+  [%u|b%"basename"]=>
+  %unicode|string%(0) ""
+  [%u|b%"filename"]=>
+  %unicode|string%(0) ""
 }
 -- Iteration 2 --
-string(1) "."
-string(1) " "
-string(0) ""
-string(1) " "
+%unicode|string%(1) "."
+%unicode|string%(1) " "
+%unicode|string%(0) ""
+%unicode|string%(1) " "
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(1) " "
-  ["filename"]=>
-  string(1) " "
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(1) " "
+  [%u|b%"filename"]=>
+  %unicode|string%(1) " "
 }
 -- Iteration 3 --
-string(1) "."
-string(2) "c:"
-string(0) ""
-string(2) "c:"
+%unicode|string%(1) "."
+%unicode|string%(2) "c:"
+%unicode|string%(0) ""
+%unicode|string%(2) "c:"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(2) "c:"
-  ["filename"]=>
-  string(2) "c:"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(2) "c:"
+  [%u|b%"filename"]=>
+  %unicode|string%(2) "c:"
 }
 -- Iteration 4 --
-string(1) "."
-string(3) "c:\"
-string(0) ""
-string(3) "c:\"
+%unicode|string%(1) "."
+%unicode|string%(3) "c:\"
+%unicode|string%(0) ""
+%unicode|string%(3) "c:\"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(3) "c:\"
-  ["filename"]=>
-  string(3) "c:\"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "c:\"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "c:\"
 }
 -- Iteration 5 --
-string(1) "."
-string(2) "c:"
-string(0) ""
-string(2) "c:"
+%unicode|string%(1) "."
+%unicode|string%(2) "c:"
+%unicode|string%(0) ""
+%unicode|string%(2) "c:"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(2) "c:"
-  ["filename"]=>
-  string(2) "c:"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(2) "c:"
+  [%u|b%"filename"]=>
+  %unicode|string%(2) "c:"
 }
 -- Iteration 6 --
-string(1) "."
-string(5) "afile"
-string(0) ""
-string(5) "afile"
+%unicode|string%(1) "."
+%unicode|string%(5) "afile"
+%unicode|string%(0) ""
+%unicode|string%(5) "afile"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(5) "afile"
-  ["filename"]=>
-  string(5) "afile"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(5) "afile"
+  [%u|b%"filename"]=>
+  %unicode|string%(5) "afile"
 }
 -- Iteration 7 --
-string(1) "."
-string(12) "c:\test\adir"
-string(0) ""
-string(12) "c:\test\adir"
+%unicode|string%(1) "."
+%unicode|string%(12) "c:\test\adir"
+%unicode|string%(0) ""
+%unicode|string%(12) "c:\test\adir"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(12) "c:\test\adir"
-  ["filename"]=>
-  string(12) "c:\test\adir"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(12) "c:\test\adir"
+  [%u|b%"filename"]=>
+  %unicode|string%(12) "c:\test\adir"
 }
 -- Iteration 8 --
-string(1) "."
-string(13) "c:\test\adir\"
-string(0) ""
-string(13) "c:\test\adir\"
+%unicode|string%(1) "."
+%unicode|string%(13) "c:\test\adir\"
+%unicode|string%(0) ""
+%unicode|string%(13) "c:\test\adir\"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(13) "c:\test\adir\"
-  ["filename"]=>
-  string(13) "c:\test\adir\"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(13) "c:\test\adir\"
+  [%u|b%"filename"]=>
+  %unicode|string%(13) "c:\test\adir\"
 }
 -- Iteration 9 --
-string(12) "/usr/include"
-string(4) "arpa"
-string(0) ""
-string(4) "arpa"
+%unicode|string%(12) "/usr/include"
+%unicode|string%(4) "arpa"
+%unicode|string%(0) ""
+%unicode|string%(4) "arpa"
 array(3) {
-  ["dirname"]=>
-  string(12) "/usr/include"
-  ["basename"]=>
-  string(4) "arpa"
-  ["filename"]=>
-  string(4) "arpa"
+  [%u|b%"dirname"]=>
+  %unicode|string%(12) "/usr/include"
+  [%u|b%"basename"]=>
+  %unicode|string%(4) "arpa"
+  [%u|b%"filename"]=>
+  %unicode|string%(4) "arpa"
 }
 -- Iteration 10 --
-string(12) "/usr/include"
-string(4) "arpa"
-string(0) ""
-string(4) "arpa"
+%unicode|string%(12) "/usr/include"
+%unicode|string%(4) "arpa"
+%unicode|string%(0) ""
+%unicode|string%(4) "arpa"
 array(3) {
-  ["dirname"]=>
-  string(12) "/usr/include"
-  ["basename"]=>
-  string(4) "arpa"
-  ["filename"]=>
-  string(4) "arpa"
+  [%u|b%"dirname"]=>
+  %unicode|string%(12) "/usr/include"
+  [%u|b%"basename"]=>
+  %unicode|string%(4) "arpa"
+  [%u|b%"filename"]=>
+  %unicode|string%(4) "arpa"
 }
 -- Iteration 11 --
-string(11) "usr/include"
-string(4) "arpa"
-string(0) ""
-string(4) "arpa"
+%unicode|string%(11) "usr/include"
+%unicode|string%(4) "arpa"
+%unicode|string%(0) ""
+%unicode|string%(4) "arpa"
 array(3) {
-  ["dirname"]=>
-  string(11) "usr/include"
-  ["basename"]=>
-  string(4) "arpa"
-  ["filename"]=>
-  string(4) "arpa"
+  [%u|b%"dirname"]=>
+  %unicode|string%(11) "usr/include"
+  [%u|b%"basename"]=>
+  %unicode|string%(4) "arpa"
+  [%u|b%"filename"]=>
+  %unicode|string%(4) "arpa"
 }
 -- Iteration 12 --
-string(11) "usr/include"
-string(4) "arpa"
-string(0) ""
-string(4) "arpa"
+%unicode|string%(11) "usr/include"
+%unicode|string%(4) "arpa"
+%unicode|string%(0) ""
+%unicode|string%(4) "arpa"
 array(3) {
-  ["dirname"]=>
-  string(11) "usr/include"
-  ["basename"]=>
-  string(4) "arpa"
-  ["filename"]=>
-  string(4) "arpa"
+  [%u|b%"dirname"]=>
+  %unicode|string%(11) "usr/include"
+  [%u|b%"basename"]=>
+  %unicode|string%(4) "arpa"
+  [%u|b%"filename"]=>
+  %unicode|string%(4) "arpa"
 }
 -- Iteration 13 --
-string(1) "."
-string(13) "c:\test\afile"
-string(0) ""
-string(13) "c:\test\afile"
+%unicode|string%(1) "."
+%unicode|string%(13) "c:\test\afile"
+%unicode|string%(0) ""
+%unicode|string%(13) "c:\test\afile"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(13) "c:\test\afile"
-  ["filename"]=>
-  string(13) "c:\test\afile"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(13) "c:\test\afile"
+  [%u|b%"filename"]=>
+  %unicode|string%(13) "c:\test\afile"
 }
 -- Iteration 14 --
-string(1) "."
-string(13) "c:\test\afile"
-string(0) ""
-string(13) "c:\test\afile"
+%unicode|string%(1) "."
+%unicode|string%(13) "c:\test\afile"
+%unicode|string%(0) ""
+%unicode|string%(13) "c:\test\afile"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(13) "c:\test\afile"
-  ["filename"]=>
-  string(13) "c:\test\afile"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(13) "c:\test\afile"
+  [%u|b%"filename"]=>
+  %unicode|string%(13) "c:\test\afile"
 }
 -- Iteration 15 --
-string(8) "c://test"
-string(5) "afile"
-string(0) ""
-string(5) "afile"
+%unicode|string%(8) "c://test"
+%unicode|string%(5) "afile"
+%unicode|string%(0) ""
+%unicode|string%(5) "afile"
 array(3) {
-  ["dirname"]=>
-  string(8) "c://test"
-  ["basename"]=>
-  string(5) "afile"
-  ["filename"]=>
-  string(5) "afile"
+  [%u|b%"dirname"]=>
+  %unicode|string%(8) "c://test"
+  [%u|b%"basename"]=>
+  %unicode|string%(5) "afile"
+  [%u|b%"filename"]=>
+  %unicode|string%(5) "afile"
 }
 -- Iteration 16 --
-string(1) "."
-string(14) "c:\test\afile\"
-string(0) ""
-string(14) "c:\test\afile\"
+%unicode|string%(1) "."
+%unicode|string%(14) "c:\test\afile\"
+%unicode|string%(0) ""
+%unicode|string%(14) "c:\test\afile\"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(14) "c:\test\afile\"
-  ["filename"]=>
-  string(14) "c:\test\afile\"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(14) "c:\test\afile\"
+  [%u|b%"filename"]=>
+  %unicode|string%(14) "c:\test\afile\"
 }
 -- Iteration 17 --
-string(1) "."
-string(16) "c:\test\prog.exe"
-string(3) "exe"
-string(12) "c:\test\prog"
+%unicode|string%(1) "."
+%unicode|string%(16) "c:\test\prog.exe"
+%unicode|string%(3) "exe"
+%unicode|string%(12) "c:\test\prog"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(16) "c:\test\prog.exe"
-  ["extension"]=>
-  string(3) "exe"
-  ["filename"]=>
-  string(12) "c:\test\prog"
+  [%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"
 }
 -- Iteration 18 --
-string(1) "."
-string(16) "c:\test\prog.exe"
-string(3) "exe"
-string(12) "c:\test\prog"
+%unicode|string%(1) "."
+%unicode|string%(16) "c:\test\prog.exe"
+%unicode|string%(3) "exe"
+%unicode|string%(12) "c:\test\prog"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(16) "c:\test\prog.exe"
-  ["extension"]=>
-  string(3) "exe"
-  ["filename"]=>
-  string(12) "c:\test\prog"
+  [%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"
 }
 -- Iteration 19 --
-string(7) "c:/test"
-string(8) "prog.exe"
-string(3) "exe"
-string(4) "prog"
+%unicode|string%(7) "c:/test"
+%unicode|string%(8) "prog.exe"
+%unicode|string%(3) "exe"
+%unicode|string%(4) "prog"
 array(4) {
-  ["dirname"]=>
-  string(7) "c:/test"
-  ["basename"]=>
-  string(8) "prog.exe"
-  ["extension"]=>
-  string(3) "exe"
-  ["filename"]=>
-  string(4) "prog"
+  [%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"
 }
 -- Iteration 20 --
-string(17) "/usr/include/arpa"
-string(6) "inet.h"
-string(1) "h"
-string(4) "inet"
+%unicode|string%(17) "/usr/include/arpa"
+%unicode|string%(6) "inet.h"
+%unicode|string%(1) "h"
+%unicode|string%(4) "inet"
 array(4) {
-  ["dirname"]=>
-  string(17) "/usr/include/arpa"
-  ["basename"]=>
-  string(6) "inet.h"
-  ["extension"]=>
-  string(1) "h"
-  ["filename"]=>
-  string(4) "inet"
+  [%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"
 }
 -- Iteration 21 --
-string(19) "//usr/include//arpa"
-string(6) "inet.h"
-string(1) "h"
-string(4) "inet"
+%unicode|string%(19) "//usr/include//arpa"
+%unicode|string%(6) "inet.h"
+%unicode|string%(1) "h"
+%unicode|string%(4) "inet"
 array(4) {
-  ["dirname"]=>
-  string(19) "//usr/include//arpa"
-  ["basename"]=>
-  string(6) "inet.h"
-  ["extension"]=>
-  string(1) "h"
-  ["filename"]=>
-  string(4) "inet"
+  [%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"
 }
 -- Iteration 22 --
-string(1) "."
-string(1) "\"
-string(0) ""
-string(1) "\"
+%unicode|string%(1) "."
+%unicode|string%(1) "\"
+%unicode|string%(0) ""
+%unicode|string%(1) "\"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(1) "\"
-  ["filename"]=>
-  string(1) "\"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(1) "\"
+  [%u|b%"filename"]=>
+  %unicode|string%(1) "\"
 }
 -- Iteration 23 --
-string(1) "."
-string(2) "\\"
-string(0) ""
-string(2) "\\"
+%unicode|string%(1) "."
+%unicode|string%(2) "\\"
+%unicode|string%(0) ""
+%unicode|string%(2) "\\"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(2) "\\"
-  ["filename"]=>
-  string(2) "\\"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(2) "\\"
+  [%u|b%"filename"]=>
+  %unicode|string%(2) "\\"
 }
 -- Iteration 24 --
-string(1) "/"
-string(0) ""
-string(0) ""
-string(0) ""
+%unicode|string%(1) "/"
+%unicode|string%(0) ""
+%unicode|string%(0) ""
+%unicode|string%(0) ""
 array(3) {
-  ["dirname"]=>
-  string(1) "/"
-  ["basename"]=>
-  string(0) ""
-  ["filename"]=>
-  string(0) ""
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "/"
+  [%u|b%"basename"]=>
+  %unicode|string%(0) ""
+  [%u|b%"filename"]=>
+  %unicode|string%(0) ""
 }
 -- Iteration 25 --
-string(1) "/"
-string(0) ""
-string(0) ""
-string(0) ""
+%unicode|string%(1) "/"
+%unicode|string%(0) ""
+%unicode|string%(0) ""
+%unicode|string%(0) ""
 array(3) {
-  ["dirname"]=>
-  string(1) "/"
-  ["basename"]=>
-  string(0) ""
-  ["filename"]=>
-  string(0) ""
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "/"
+  [%u|b%"basename"]=>
+  %unicode|string%(0) ""
+  [%u|b%"filename"]=>
+  %unicode|string%(0) ""
 }
 -- Iteration 26 --
-string(1) "/"
-string(0) ""
-string(0) ""
-string(0) ""
+%unicode|string%(1) "/"
+%unicode|string%(0) ""
+%unicode|string%(0) ""
+%unicode|string%(0) ""
 array(3) {
-  ["dirname"]=>
-  string(1) "/"
-  ["basename"]=>
-  string(0) ""
-  ["filename"]=>
-  string(0) ""
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "/"
+  [%u|b%"basename"]=>
+  %unicode|string%(0) ""
+  [%u|b%"filename"]=>
+  %unicode|string%(0) ""
 }
 -- Iteration 27 --
-string(17) "/usr/include/arpa"
-string(6) "inet.h"
-string(1) "h"
-string(4) "inet"
+%unicode|string%(17) "/usr/include/arpa"
+%unicode|string%(6) "inet.h"
+%unicode|string%(1) "h"
+%unicode|string%(4) "inet"
 array(4) {
-  ["dirname"]=>
-  string(17) "/usr/include/arpa"
-  ["basename"]=>
-  string(6) "inet.h"
-  ["extension"]=>
-  string(1) "h"
-  ["filename"]=>
-  string(4) "inet"
+  [%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"
 }
 -- Iteration 28 --
-string(27) "c:\windows/system32\drivers"
-string(9) "etc\hosts"
-string(0) ""
-string(9) "etc\hosts"
+%unicode|string%(27) "c:\windows/system32\drivers"
+%unicode|string%(9) "etc\hosts"
+%unicode|string%(0) ""
+%unicode|string%(9) "etc\hosts"
 array(3) {
-  ["dirname"]=>
-  string(27) "c:\windows/system32\drivers"
-  ["basename"]=>
-  string(9) "etc\hosts"
-  ["filename"]=>
-  string(9) "etc\hosts"
+  [%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"
 }
 -- Iteration 29 --
-string(12) "/usr\include"
-string(11) "arpa\inet.h"
-string(1) "h"
-string(9) "arpa\inet"
+%unicode|string%(12) "/usr\include"
+%unicode|string%(11) "arpa\inet.h"
+%unicode|string%(1) "h"
+%unicode|string%(9) "arpa\inet"
 array(4) {
-  ["dirname"]=>
-  string(12) "/usr\include"
-  ["basename"]=>
-  string(11) "arpa\inet.h"
-  ["extension"]=>
-  string(1) "h"
-  ["filename"]=>
-  string(9) "arpa\inet"
+  [%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"
 }
 -- Iteration 30 --
-string(1) "."
-string(25) "   c:\test\adir\afile.txt"
-string(3) "txt"
-string(21) "   c:\test\adir\afile"
+%unicode|string%(1) "."
+%unicode|string%(25) "   c:\test\adir\afile.txt"
+%unicode|string%(3) "txt"
+%unicode|string%(21) "   c:\test\adir\afile"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(25) "   c:\test\adir\afile.txt"
-  ["extension"]=>
-  string(3) "txt"
-  ["filename"]=>
-  string(21) "   c:\test\adir\afile"
+  [%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"
 }
 -- Iteration 31 --
-string(1) "."
-string(25) "c:\test\adir\afile.txt   "
-string(6) "txt   "
-string(18) "c:\test\adir\afile"
+%unicode|string%(1) "."
+%unicode|string%(25) "c:\test\adir\afile.txt   "
+%unicode|string%(6) "txt   "
+%unicode|string%(18) "c:\test\adir\afile"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(25) "c:\test\adir\afile.txt   "
-  ["extension"]=>
-  string(6) "txt   "
-  ["filename"]=>
-  string(18) "c:\test\adir\afile"
+  [%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"
 }
 -- Iteration 32 --
-string(1) "."
-string(28) "   c:\test\adir\afile.txt   "
-string(6) "txt   "
-string(21) "   c:\test\adir\afile"
+%unicode|string%(1) "."
+%unicode|string%(28) "   c:\test\adir\afile.txt   "
+%unicode|string%(6) "txt   "
+%unicode|string%(21) "   c:\test\adir\afile"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(28) "   c:\test\adir\afile.txt   "
-  ["extension"]=>
-  string(6) "txt   "
-  ["filename"]=>
-  string(21) "   c:\test\adir\afile"
+  [%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"
 }
 -- Iteration 33 --
-string(20) "   /usr/include/arpa"
-string(6) "inet.h"
-string(1) "h"
-string(4) "inet"
+%unicode|string%(20) "   /usr/include/arpa"
+%unicode|string%(6) "inet.h"
+%unicode|string%(1) "h"
+%unicode|string%(4) "inet"
 array(4) {
-  ["dirname"]=>
-  string(20) "   /usr/include/arpa"
-  ["basename"]=>
-  string(6) "inet.h"
-  ["extension"]=>
-  string(1) "h"
-  ["filename"]=>
-  string(4) "inet"
+  [%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"
 }
 -- Iteration 34 --
-string(17) "/usr/include/arpa"
-string(9) "inet.h   "
-string(4) "h   "
-string(4) "inet"
+%unicode|string%(17) "/usr/include/arpa"
+%unicode|string%(9) "inet.h   "
+%unicode|string%(4) "h   "
+%unicode|string%(4) "inet"
 array(4) {
-  ["dirname"]=>
-  string(17) "/usr/include/arpa"
-  ["basename"]=>
-  string(9) "inet.h   "
-  ["extension"]=>
-  string(4) "h   "
-  ["filename"]=>
-  string(4) "inet"
+  [%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"
 }
 -- Iteration 35 --
-string(20) "   /usr/include/arpa"
-string(9) "inet.h   "
-string(4) "h   "
-string(4) "inet"
+%unicode|string%(20) "   /usr/include/arpa"
+%unicode|string%(9) "inet.h   "
+%unicode|string%(4) "h   "
+%unicode|string%(4) "inet"
 array(4) {
-  ["dirname"]=>
-  string(20) "   /usr/include/arpa"
-  ["basename"]=>
-  string(9) "inet.h   "
-  ["extension"]=>
-  string(4) "h   "
-  ["filename"]=>
-  string(4) "inet"
+  [%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"
 }
 -- Iteration 36 --
-string(1) "."
-string(3) " c:"
-string(0) ""
-string(3) " c:"
+%unicode|string%(1) "."
+%unicode|string%(3) " c:"
+%unicode|string%(0) ""
+%unicode|string%(3) " c:"
 array(3) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(3) " c:"
-  ["filename"]=>
-  string(3) " c:"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(3) " c:"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) " c:"
 }
 -- Iteration 37 --
-string(1) "."
-string(24) "		c:\test\adir\afile.txt"
-string(3) "txt"
-string(20) "		c:\test\adir\afile"
+%unicode|string%(1) "."
+%unicode|string%(24) "		c:\test\adir\afile.txt"
+%unicode|string%(3) "txt"
+%unicode|string%(20) "		c:\test\adir\afile"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(24) "		c:\test\adir\afile.txt"
-  ["extension"]=>
-  string(3) "txt"
-  ["filename"]=>
-  string(20) "		c:\test\adir\afile"
+  [%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"
 }
 -- Iteration 38 --
-string(1) "/"
-string(3) "usr"
-string(0) ""
-string(3) "usr"
+%unicode|string%(1) "/"
+%unicode|string%(3) "usr"
+%unicode|string%(0) ""
+%unicode|string%(3) "usr"
 array(3) {
-  ["dirname"]=>
-  string(1) "/"
-  ["basename"]=>
-  string(3) "usr"
-  ["filename"]=>
-  string(3) "usr"
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "/"
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "usr"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "usr"
 }
 -- Iteration 39 --
-string(1) "/"
-string(3) "usr"
-string(0) ""
-string(3) "usr"
+%unicode|string%(1) "/"
+%unicode|string%(3) "usr"
+%unicode|string%(0) ""
+%unicode|string%(3) "usr"
 array(3) {
-  ["dirname"]=>
-  string(1) "/"
-  ["basename"]=>
-  string(3) "usr"
-  ["filename"]=>
-  string(3) "usr"
-}
-Done
\ No newline at end of file
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "/"
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "usr"
+  [%u|b%"filename"]=>
+  %unicode|string%(3) "usr"
+}
+Done
+
diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt
index 7bddda039b..23c0768ded 100644
--- a/ext/standard/tests/file/pathinfo_basic2.phpt
+++ b/ext/standard/tests/file/pathinfo_basic2.phpt
@@ -48,225 +48,226 @@ foreach($paths as $path) {
 
 echo "Done\n";
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing basic functions of pathinfo() ***
 -- Iteration 1 --
-string(1) "."
-string(10) "c:\..\dir1"
-string(5) "\dir1"
-string(4) "c:\."
+%unicode|string%(1) "."
+%unicode|string%(10) "c:\..\dir1"
+%unicode|string%(5) "\dir1"
+%unicode|string%(4) "c:\."
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(10) "c:\..\dir1"
-  ["extension"]=>
-  string(5) "\dir1"
-  ["filename"]=>
-  string(4) "c:\."
+  [%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:\."
 }
 -- Iteration 2 --
-string(1) "."
-string(33) "c:\test\..\test2\.\adir\afile.txt"
-string(3) "txt"
-string(29) "c:\test\..\test2\.\adir\afile"
+%unicode|string%(1) "."
+%unicode|string%(33) "c:\test\..\test2\.\adir\afile.txt"
+%unicode|string%(3) "txt"
+%unicode|string%(29) "c:\test\..\test2\.\adir\afile"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(33) "c:\test\..\test2\.\adir\afile.txt"
-  ["extension"]=>
-  string(3) "txt"
-  ["filename"]=>
-  string(29) "c:\test\..\test2\.\adir\afile"
+  [%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"
 }
 -- Iteration 3 --
-string(22) "/usr/include/../arpa/."
-string(6) "inet.h"
-string(1) "h"
-string(4) "inet"
+%unicode|string%(22) "/usr/include/../arpa/."
+%unicode|string%(6) "inet.h"
+%unicode|string%(1) "h"
+%unicode|string%(4) "inet"
 array(4) {
-  ["dirname"]=>
-  string(22) "/usr/include/../arpa/."
-  ["basename"]=>
-  string(6) "inet.h"
-  ["extension"]=>
-  string(1) "h"
-  ["filename"]=>
-  string(4) "inet"
+  [%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"
 }
 -- Iteration 4 --
-string(1) "."
-string(23) "c:\test\adir\afile..txt"
-string(3) "txt"
-string(19) "c:\test\adir\afile."
+%unicode|string%(1) "."
+%unicode|string%(23) "c:\test\adir\afile..txt"
+%unicode|string%(3) "txt"
+%unicode|string%(19) "c:\test\adir\afile."
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(23) "c:\test\adir\afile..txt"
-  ["extension"]=>
-  string(3) "txt"
-  ["filename"]=>
-  string(19) "c:\test\adir\afile."
+  [%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."
 }
 -- Iteration 5 --
-string(17) "/usr/include/arpa"
-string(7) "inet..h"
-string(1) "h"
-string(5) "inet."
+%unicode|string%(17) "/usr/include/arpa"
+%unicode|string%(7) "inet..h"
+%unicode|string%(1) "h"
+%unicode|string%(5) "inet."
 array(4) {
-  ["dirname"]=>
-  string(17) "/usr/include/arpa"
-  ["basename"]=>
-  string(7) "inet..h"
-  ["extension"]=>
-  string(1) "h"
-  ["filename"]=>
-  string(5) "inet."
+  [%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."
 }
 -- Iteration 6 --
-string(1) "."
-string(19) "c:\test\adir\afile."
-string(0) ""
-string(18) "c:\test\adir\afile"
+%unicode|string%(1) "."
+%unicode|string%(19) "c:\test\adir\afile."
+%unicode|string%(0) ""
+%unicode|string%(18) "c:\test\adir\afile"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(19) "c:\test\adir\afile."
-  ["extension"]=>
-  string(0) ""
-  ["filename"]=>
-  string(18) "c:\test\adir\afile"
+  [%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"
 }
 -- Iteration 7 --
-string(17) "/usr/include/arpa"
-string(5) "inet."
-string(0) ""
-string(4) "inet"
+%unicode|string%(17) "/usr/include/arpa"
+%unicode|string%(5) "inet."
+%unicode|string%(0) ""
+%unicode|string%(4) "inet"
 array(4) {
-  ["dirname"]=>
-  string(17) "/usr/include/arpa"
-  ["basename"]=>
-  string(5) "inet."
-  ["extension"]=>
-  string(0) ""
-  ["filename"]=>
-  string(4) "inet"
+  [%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"
 }
 -- Iteration 8 --
-string(17) "/usr/include/arpa"
-string(6) "inet,h"
-string(0) ""
-string(6) "inet,h"
+%unicode|string%(17) "/usr/include/arpa"
+%unicode|string%(6) "inet,h"
+%unicode|string%(0) ""
+%unicode|string%(6) "inet,h"
 array(3) {
-  ["dirname"]=>
-  string(17) "/usr/include/arpa"
-  ["basename"]=>
-  string(6) "inet,h"
-  ["filename"]=>
-  string(6) "inet,h"
+  [%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"
 }
 -- Iteration 9 --
-string(1) "."
-string(11) "c:afile.txt"
-string(3) "txt"
-string(7) "c:afile"
+%unicode|string%(1) "."
+%unicode|string%(11) "c:afile.txt"
+%unicode|string%(3) "txt"
+%unicode|string%(7) "c:afile"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(11) "c:afile.txt"
-  ["extension"]=>
-  string(3) "txt"
-  ["filename"]=>
-  string(7) "c:afile"
+  [%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"
 }
 -- Iteration 10 --
-string(1) "."
-string(22) "..\.\..\test\afile.txt"
-string(3) "txt"
-string(18) "..\.\..\test\afile"
+%unicode|string%(1) "."
+%unicode|string%(22) "..\.\..\test\afile.txt"
+%unicode|string%(3) "txt"
+%unicode|string%(18) "..\.\..\test\afile"
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(22) "..\.\..\test\afile.txt"
-  ["extension"]=>
-  string(3) "txt"
-  ["filename"]=>
-  string(18) "..\.\..\test\afile"
+  [%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"
 }
 -- Iteration 11 --
-string(12) ".././../test"
-string(5) "afile"
-string(0) ""
-string(5) "afile"
+%unicode|string%(12) ".././../test"
+%unicode|string%(5) "afile"
+%unicode|string%(0) ""
+%unicode|string%(5) "afile"
 array(3) {
-  ["dirname"]=>
-  string(12) ".././../test"
-  ["basename"]=>
-  string(5) "afile"
-  ["filename"]=>
-  string(5) "afile"
+  [%u|b%"dirname"]=>
+  %unicode|string%(12) ".././../test"
+  [%u|b%"basename"]=>
+  %unicode|string%(5) "afile"
+  [%u|b%"filename"]=>
+  %unicode|string%(5) "afile"
 }
 -- Iteration 12 --
-string(1) "."
-string(1) "."
-string(0) ""
-string(0) ""
+%unicode|string%(1) "."
+%unicode|string%(1) "."
+%unicode|string%(0) ""
+%unicode|string%(0) ""
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(1) "."
-  ["extension"]=>
-  string(0) ""
-  ["filename"]=>
-  string(0) ""
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(1) "."
+  [%u|b%"extension"]=>
+  %unicode|string%(0) ""
+  [%u|b%"filename"]=>
+  %unicode|string%(0) ""
 }
 -- Iteration 13 --
-string(1) "."
-string(2) ".."
-string(0) ""
-string(1) "."
+%unicode|string%(1) "."
+%unicode|string%(2) ".."
+%unicode|string%(0) ""
+%unicode|string%(1) "."
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(2) ".."
-  ["extension"]=>
-  string(0) ""
-  ["filename"]=>
-  string(1) "."
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(2) ".."
+  [%u|b%"extension"]=>
+  %unicode|string%(0) ""
+  [%u|b%"filename"]=>
+  %unicode|string%(1) "."
 }
 -- Iteration 14 --
-string(1) "."
-string(3) "..."
-string(0) ""
-string(2) ".."
+%unicode|string%(1) "."
+%unicode|string%(3) "..."
+%unicode|string%(0) ""
+%unicode|string%(2) ".."
 array(4) {
-  ["dirname"]=>
-  string(1) "."
-  ["basename"]=>
-  string(3) "..."
-  ["extension"]=>
-  string(0) ""
-  ["filename"]=>
-  string(2) ".."
+  [%u|b%"dirname"]=>
+  %unicode|string%(1) "."
+  [%u|b%"basename"]=>
+  %unicode|string%(3) "..."
+  [%u|b%"extension"]=>
+  %unicode|string%(0) ""
+  [%u|b%"filename"]=>
+  %unicode|string%(2) ".."
 }
 -- Iteration 15 --
-string(12) "/usr/lib/..."
-string(5) "afile"
-string(0) ""
-string(5) "afile"
+%unicode|string%(12) "/usr/lib/..."
+%unicode|string%(5) "afile"
+%unicode|string%(0) ""
+%unicode|string%(5) "afile"
 array(3) {
-  ["dirname"]=>
-  string(12) "/usr/lib/..."
-  ["basename"]=>
-  string(5) "afile"
-  ["filename"]=>
-  string(5) "afile"
+  [%u|b%"dirname"]=>
+  %unicode|string%(12) "/usr/lib/..."
+  [%u|b%"basename"]=>
+  %unicode|string%(5) "afile"
+  [%u|b%"filename"]=>
+  %unicode|string%(5) "afile"
 }
-Done
\ No newline at end of file
+Done
+
diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt
index 3c64908eb5..3348403e2b 100644
--- a/ext/standard/tests/file/proc_open01.phpt
+++ b/ext/standard/tests/file/proc_open01.phpt
@@ -11,14 +11,14 @@ if ($php === false) {
 $proc = proc_open(
 	"$php -n",
 	array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
-	$pipes
+	$pipes, getcwd(), array(), array('binary_pipes' => true)
 );
 if ($proc === false) {
 	print "something went wrong.\n";
 }
 var_dump($pipes);
 stream_set_blocking($pipes[1], FALSE);
-$test_string = "yay!\n";
+$test_string = b"yay!\n";
 fwrite($pipes[0], $test_string);
 fflush($pipes[0]);
 fclose($pipes[0]);
@@ -57,7 +57,7 @@ array(2) {
   [1]=>
   resource(%d) of type (stream)
 }
-string(5) "yay!
+%unicode|string%(5) "yay!
 "
 array(3) {
   [0]=>
diff --git a/ext/standard/tests/file/unlink_error.phpt b/ext/standard/tests/file/unlink_error.phpt
index ae888bce4a..9571784a31 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, string given in %s on line %d
+Warning: unlink() expects parameter 2 to be resource, %unicode_string_optional% 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/network/inet.phpt b/ext/standard/tests/network/inet.phpt
index 0df527c7a9..851e1ba6c5 100644
--- a/ext/standard/tests/network/inet.phpt
+++ b/ext/standard/tests/network/inet.phpt
@@ -9,37 +9,37 @@ if (!function_exists("inet_pton")) die("skip no inet_pton()");
 <?php
 
 $packed = chr(127) . chr(0) . chr(0) . chr(1);
-var_dump(inet_ntop($packed));
+var_dump(inet_ntop((binary)$packed));
 
 $packed = chr(255) . chr(255) . chr(255) . chr(0);
-var_dump(inet_ntop($packed));
+var_dump(inet_ntop((binary)$packed));
 
 var_dump(inet_ntop());
 var_dump(inet_ntop(-1));
-var_dump(inet_ntop(""));
-var_dump(inet_ntop("blah-blah"));
+var_dump(inet_ntop(b""));
+var_dump(inet_ntop(b"blah-blah"));
 
 var_dump(inet_pton());
-var_dump(inet_pton(""));
+var_dump(inet_pton(b""));
 var_dump(inet_pton(-1));
-var_dump(inet_pton("abra"));
+var_dump(inet_pton(b"abra"));
 
 $array = array(
-	"127.0.0.1",
-	"66.163.161.116",
-	"255.255.255.255",
-	"0.0.0.0",
+	b"127.0.0.1",
+	b"66.163.161.116",
+	b"255.255.255.255",
+	b"0.0.0.0",
 	);
 foreach ($array as $val) {
-	var_dump($packed = inet_pton($val));
+	var_dump(bin2hex($packed = inet_pton($val)));
 	var_dump(inet_ntop($packed));
 }
 
 echo "Done\n";
 ?>
 --EXPECTF--	
-string(9) "127.0.0.1"
-string(13) "255.255.255.0"
+%unicode|string%(9) "127.0.0.1"
+%unicode|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)
-string(%d) "%s"
-string(9) "127.0.0.1"
-string(%d) "%s"
-string(14) "66.163.161.116"
-string(%d) "%s"
-string(15) "255.255.255.255"
-string(%d) "%s"
-string(7) "0.0.0.0"
+%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"
 Done
diff --git a/ext/standard/tests/serialize/bug43614.phpt b/ext/standard/tests/serialize/bug43614.phpt
index 127dfba586..68568a1224 100644
--- a/ext/standard/tests/serialize/bug43614.phpt
+++ b/ext/standard/tests/serialize/bug43614.phpt
@@ -7,7 +7,7 @@ error_reporting(E_ALL);
 
 var_dump($a = unserialize('a:2:{s:2:"10";i:1;s:2:"01";i:2;}'));
 var_dump($a['10']);
-var_dump($a['01']);
+var_dump($a[b'01']);
 
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/streams/bug46426.phpt b/ext/standard/tests/streams/bug46426.phpt
index 8c95ea456e..80dbcded80 100644
--- a/ext/standard/tests/streams/bug46426.phpt
+++ b/ext/standard/tests/streams/bug46426.phpt
@@ -5,7 +5,7 @@ Bug #46426 (3rd parameter offset of stream_get_contents not works for "0")
 
 $tmp = tmpfile();
 
-fwrite($tmp, "12345");
+fwrite($tmp, b"12345");
 
 echo stream_get_contents($tmp, 2, 1);
 echo "\n";
diff --git a/ext/standard/tests/streams/stream_get_contents_001.phpt b/ext/standard/tests/streams/stream_get_contents_001.phpt
index dc7fcb239c..e8e1c3d26b 100644
--- a/ext/standard/tests/streams/stream_get_contents_001.phpt
+++ b/ext/standard/tests/streams/stream_get_contents_001.phpt
@@ -5,7 +5,7 @@ stream_get_contents() - Testing offset out of range
 
 $tmp = tmpfile();
 
-fwrite($tmp, "12345");
+fwrite($tmp, b"12345");
 
 echo stream_get_contents($tmp, 2, 5), "--\n";
 echo stream_get_contents($tmp, 2), "--\n";
diff --git a/ext/standard/tests/strings/bug40915.phpt b/ext/standard/tests/strings/bug40915.phpt
index 9b26896e71..e3a501a178 100644
Binary files a/ext/standard/tests/strings/bug40915.phpt and b/ext/standard/tests/strings/bug40915.phpt differ
diff --git a/ext/standard/tests/strings/bug44703.phpt b/ext/standard/tests/strings/bug44703.phpt
index d2cdce9bfa..0b019b9cb4 100644
--- a/ext/standard/tests/strings/bug44703.phpt
+++ b/ext/standard/tests/strings/bug44703.phpt
@@ -3,22 +3,22 @@ Bug #44703 (htmlspecialchars() does not detect bad character set argument)
 --FILE--
 <?php
 
-var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 1));
-var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 12));
-var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 125));
-var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 1252));
-var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 12526));
+var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 1));
+var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 12));
+var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 125));
+var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 1252));
+var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 12526));
 
-var_dump(htmlspecialchars("<>", ENT_COMPAT, 866));
-var_dump(htmlspecialchars("<>", ENT_COMPAT, 8666));
+var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 866));
+var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 8666));
 
-var_dump(htmlspecialchars("<>", ENT_COMPAT, NULL));
+var_dump(htmlspecialchars(b"<>", ENT_COMPAT, NULL));
 
 
-var_dump(htmlspecialchars("<>", ENT_COMPAT, 'SJIS'));
-var_dump(htmlspecialchars("<>", ENT_COMPAT, 'SjiS'));
+var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 'SJIS'));
+var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 'SjiS'));
 
-var_dump(htmlspecialchars("<>", ENT_COMPAT, str_repeat('a', 100)));
+var_dump(htmlspecialchars(b"<>", ENT_COMPAT, str_repeat('a', 100)));
 
 ?>
 --EXPECTF--
@@ -44,5 +44,3 @@ string(8) "&lt;&gt;"
 
 Warning: htmlspecialchars(): charset `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' not supported, assuming iso-8859-1 in %s on line %d
 string(8) "&lt;&gt;"
-
-
diff --git a/ext/standard/tests/strings/htmlentities01.phpt b/ext/standard/tests/strings/htmlentities01.phpt
index 4ab49472d1..eb64b0a63b 100644
--- a/ext/standard/tests/strings/htmlentities01.phpt
+++ b/ext/standard/tests/strings/htmlentities01.phpt
@@ -5,8 +5,8 @@ output_handler=
 mbstring.internal_encoding=pass
 --FILE--
 <?php
-	var_dump(htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, 'cp1252'));
-	var_dump(htmlentities("\x80\xa2\xa3\xa4\xa5", ENT_QUOTES, 'cp1252'));
+	var_dump(htmlentities(b"\x82\x86\x99\x9f", ENT_QUOTES, 'cp1252'));
+	var_dump(htmlentities(b"\x80\xa2\xa3\xa4\xa5", ENT_QUOTES, 'cp1252'));
 ?>
 --EXPECT--
 string(28) "&sbquo;&dagger;&trade;&Yuml;"