MFH (Use the same test fiel as in HEAD)

Zend/tests/bug46811.phpt

@@ -7,7 +7,7 @@ arg_separator.output=&
 var_dump(ini_set("arg_separator.output", ""));
 var_dump(ini_get("arg_separator.output"));
 ?>
---EXPECT--
+--EXPECTF--
 bool(false)
-string(1) "&"
+%unicode|string%(1) "&"
 

ext/date/tests/009.phpt

@@ -34,18 +34,18 @@ echo "Done\n";
 Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 bool(false)
-string(%d) "Tue Tuesday Jun June Tue Jun 27 00:00:00 2006 %s
+%unicode|string%(%d) "Tue Tuesday Jun June Tue Jun 27 00:00:00 2006 %s
 %s %"
-string(5) "%q %a"
-string(%d) "%s"
-string(4) "blah"
+%unicode|string%(5) "%q %a"
+%unicode|string%(%d) "%s"
+%unicode|string%(4) "blah"
 
 Warning: gmstrftime() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 bool(false)
-string(%d) "Mon Monday Jun June Mon Jun 26 21:00:00 2006 %s
+%unicode|string%(%d) "Mon Monday Jun June Mon Jun 26 21:00:00 2006 %s
 %s %"
-string(5) "%q %a"
-string(%d) "%s"
-string(4) "blah"
+%unicode|string%(5) "%q %a"
+%unicode|string%(%d) "%s"
+%unicode|string%(4) "blah"
 Done