Remove more PHP 6 leftovers from tests

Author: nikic

Zend/tests/bug46811.phpt

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

Zend/tests/bug48533.phpt

@@ -31,11 +31,11 @@ $x::c();
 
 ?>
 --EXPECTF--
-%unicode|string%(9) "__call::a"
+string(9) "__call::a"
 int(2)
-%unicode|string%(9) "__call::c"
-%unicode|string%(15) "__callStatic::a"
+string(9) "__call::c"
+string(15) "__callStatic::a"
 
 Deprecated: Non-static method foo::b() should not be called statically in %s on line %d
 int(2)
-%unicode|string%(15) "__callStatic::c"
+string(15) "__callStatic::c"

Zend/tests/bug48770.phpt

@@ -50,4 +50,4 @@ $c->func('This should work!');
 
 ?>
 --EXPECTF--
-%unicode|string%(26) "A::func: This should work!"
+string(26) "A::func: This should work!"

Zend/tests/bug48770_2.phpt

@@ -46,8 +46,8 @@ $c->func('This should work!');
 
 ?>
 --EXPECTF--
-%unicode|string%(27) "A::func2: This should work!"
-%unicode|string%(27) "A::func3: This should work!"
+string(27) "A::func2: This should work!"
+string(27) "A::func3: This should work!"
 
 Warning: call_user_func_array() expects parameter 1 to be a valid callback, cannot access private method A::func22() in %s on line %d
 

Zend/tests/bug48770_3.phpt

@@ -45,7 +45,7 @@ $c->func('This should work!');
 
 ?>
 --EXPECTF--
-%unicode|string%(27) "B::func2: This should work!"
-%unicode|string%(27) "B::func3: This should work!"
+string(27) "B::func2: This should work!"
+string(27) "B::func3: This should work!"
 
 Warning: call_user_func_array() expects parameter 1 to be a valid callback, class 'B' does not have a method 'inexistent' in %s on line %d

Zend/tests/bug49908.phpt

@@ -17,8 +17,8 @@ new Foo;
 
 ?>
 --EXPECTF--
-%unicode|string%(3) "Foo"
-%unicode|string%(3) "Bar"
+string(3) "Foo"
+string(3) "Bar"
 
 Fatal error: Uncaught Exception: Bar in %s:%d
 Stack trace:

Zend/tests/call_user_func_002.phpt

@@ -14,7 +14,7 @@ call_user_func(array($foo, ''));
 
 ?>
 --EXPECTF--
-%unicode|string%(3) "foo"
+string(3) "foo"
 
 Warning: call_user_func() expects parameter 1 to be a valid callback, class 'foo' not found in %s on line %d
 

Zend/tests/call_user_func_003.phpt

@@ -20,11 +20,11 @@ var_dump(call_user_func(function() use (&$foo) { return $foo; }, '__invoke'));
 
 ?>
 --EXPECTF--
-%unicode|string%(3) "OK!"
+string(3) "OK!"
 object(Closure)#%d (1) {
-  [%u|b%"static"]=>
+  ["static"]=>
   array(1) {
-    [%u|b%"instance"]=>
+    ["instance"]=>
     object(Closure)#%d (0) {
     }
   }

ext/curl/tests/curl_basic_009.phpt

@@ -19,5 +19,5 @@ curl_close($ch);
 
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%Srotocol%s"
+string(%d) "%Srotocol%s"
 int(1)

ext/curl/tests/curl_basic_010.phpt

@@ -26,5 +26,5 @@ curl_close($ch);
 
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:)%r %s"
+string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:)%r %s"
 int(5)