tony2001 Mon Feb 19 20:02:09 2007 UTC
Modified files:
/php-src/tests/basic 022.phpt 023.phpt
/php-src/tests/classes bug26737.phpt bug27504.phpt
/php-src/tests/lang 034.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/022.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/basic/022.phpt
diff -u php-src/tests/basic/022.phpt:1.1 php-src/tests/basic/022.phpt:1.2
--- php-src/tests/basic/022.phpt:1.1 Sat Dec 9 15:57:33 2006
+++ php-src/tests/basic/022.phpt Mon Feb 19 20:02:08 2007
@@ -29,3 +29,26 @@
["-_&_%_$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"
+}
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/023.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/basic/023.phpt
diff -u php-src/tests/basic/023.phpt:1.1 php-src/tests/basic/023.phpt:1.2
--- php-src/tests/basic/023.phpt:1.1 Sat Dec 9 15:57:33 2006
+++ php-src/tests/basic/023.phpt Mon Feb 19 20:02:08 2007
@@ -15,3 +15,12 @@
["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"
+}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/bug26737.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/tests/classes/bug26737.phpt
diff -u php-src/tests/classes/bug26737.phpt:1.5
php-src/tests/classes/bug26737.phpt:1.6
--- php-src/tests/classes/bug26737.phpt:1.5 Wed Dec 6 13:11:02 2006
+++ php-src/tests/classes/bug26737.phpt Mon Feb 19 20:02:08 2007
@@ -18,8 +18,8 @@
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;}"
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/bug27504.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/classes/bug27504.phpt
diff -u php-src/tests/classes/bug27504.phpt:1.3
php-src/tests/classes/bug27504.phpt:1.4
--- php-src/tests/classes/bug27504.phpt:1.3 Fri Oct 20 16:17:32 2006
+++ php-src/tests/classes/bug27504.phpt Mon Feb 19 20:02:08 2007
@@ -18,8 +18,8 @@
$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
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/034.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/tests/lang/034.phpt
diff -u php-src/tests/lang/034.phpt:1.10 php-src/tests/lang/034.phpt:1.11
--- php-src/tests/lang/034.phpt:1.10 Wed Dec 6 13:11:02 2006
+++ php-src/tests/lang/034.phpt Mon Feb 19 20:02:08 2007
@@ -15,6 +15,6 @@
?>
--EXPECT--
3,14
---UEXPECT--
+--UEXPECTF--
Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU
locale functions in %s on line %d
3,14
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
