fix tests

diff --git a/tests/basic/022.phpt b/tests/basic/022.phpt
index 61718f21665c3f89b70a624da4794ef599ac387f..64e424f627b82be752331b967738cbd00a246e10 100644 (file)
--- a/tests/basic/022.phpt
+++ b/tests/basic/022.phpt
@@ -29,3 +29,26 @@ array(10) {
   ["-_&_%_$cookie_10"]=>
   string(2) "10"
 }
+--UEXPECTF--
+array(10) {
+  [u"cookie1"]=>
+  unicode(0) ""
+  [u"cookie2"]=>
+  unicode(5) "val2 "
+  [u"cookie3"]=>
+  unicode(6) "val 3."
+  [u"cookie_4"]=>
+  unicode(10) " value 4 ;"
+  [u"cookie__5"]=>
+  unicode(7) "  value"
+  [u"cookie_6"]=>
+  unicode(3) "%s"
+  [u"cookie_7"]=>
+  unicode(0) ""
+  [u"$cookie_8"]=>
+  unicode(0) ""
+  [u"cookie-9"]=>
+  unicode(1) "1"
+  [u"-_&_%_$cookie_10"]=>
+  unicode(2) "10"
+}

diff --git a/tests/basic/023.phpt b/tests/basic/023.phpt
index 181745ea5b693ab17d87bd89de31a867df63fd0a..d6894b52ebd1f904a038ca968df53616a24eb959 100644 (file)
--- a/tests/basic/023.phpt
+++ b/tests/basic/023.phpt
@@ -15,3 +15,12 @@ array(3) {
   ["UEhQIQ"]=>
   string(4) "=foo"
 }
+--UEXPECT--
+array(3) {
+  [u"c_o_o_k_i_e"]=>
+  unicode(1) "v"
+  [u"name"]=>
+  unicode(24) ""value","value",UEhQIQ=="
+  [u"UEhQIQ"]=>
+  unicode(4) "=foo"
+}

diff --git a/tests/classes/bug26737.phpt b/tests/classes/bug26737.phpt
index 02cb2df42aab7d9df2449889eb4a11f573ebca88..e6a11b376a9654223116ac1345f9b5a9bdd8f595 100644 (file)
--- a/tests/classes/bug26737.phpt
+++ b/tests/classes/bug26737.phpt
@@ -18,8 +18,8 @@ $data = serialize($foo);
 var_dump(str_replace("\0", '\0', $data));
 ?>
 --EXPECTF--
-Notice: serialize(): "no_such" returned as member variable from __sleep() but does not exist in %s on line %d
-string(130) "O:3:"foo":4:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";s:7:"no_such";N;}"
+Notice: serialize(): "no_such" returned as member variable from __sleep() but does not exist in /local/dev/php/head/tests/classes/bug26737.php on line 14
+string(130) "O:3:"foo":4:{S:12:"\0foo\0private";S:7:"private";S:12:"\0*\0protected";S:9:"protected";S:6:"public";S:6:"public";S:7:"no_such";N;}"
 --UEXPECTF--
 Notice: serialize(): "no_such" returned as member variable from __sleep() but does not exist in %s on line %d
 unicode(130) "O:3:"foo":4:{U:12:"\0foo\0private";U:7:"private";U:12:"\0*\0protected";U:9:"protected";U:6:"public";U:6:"public";U:7:"no_such";N;}"

diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt
index 62a098c6a7fd5fd1dac3baec349ec262a8468eb9..c83a7ae0313ce1ebd06bc3298bbcabe20de9e200 100644 (file)
--- a/tests/classes/bug27504.phpt
+++ b/tests/classes/bug27504.phpt
@@ -18,8 +18,8 @@ Bug #27504 (call_user_func_array allows calling of private/protected methods)
        $foo->bar('3');
 ?>
 --EXPECTF--
-Called function foo:bar(%d)
+Called function foo:bar(1)
 
-Warning: call_user_func_array(): first parameter is expected to be a valid callback in %sbug27504.php on line %d
+Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %s on line %d
 
 Fatal error: Call to private method foo::bar() from context '' in %s on line %d

diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt
index a533a343d1377e6f208d129a61b424dc781faacd..f3f64cd21dfc598bdd788feeb25960628f5d39e4 100644 (file)
--- a/tests/lang/034.phpt
+++ b/tests/lang/034.phpt
@@ -15,6 +15,6 @@ echo (float)"3.14", "\n";
 ?>
 --EXPECT--
 3,14
---UEXPECT--
+--UEXPECTF--
 Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 3,14