tony2001 Wed Dec 27 19:17:02 2006 UTC
Modified files:
/php-src/ext/standard/tests/general_functions include_path.phpt
parse_ini_file.phpt
/php-src/ext/standard/tests/strings bug20108.phpt bug25671.phpt
bug27278.phpt bug39873.phpt
/php-src/ext/standard/tests/time bug38524.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/include_path.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/include_path.phpt
diff -u php-src/ext/standard/tests/general_functions/include_path.phpt:1.1
php-src/ext/standard/tests/general_functions/include_path.phpt:1.2
--- php-src/ext/standard/tests/general_functions/include_path.phpt:1.1 Thu Nov
16 13:00:03 2006
+++ php-src/ext/standard/tests/general_functions/include_path.phpt Wed Dec
27 19:17:02 2006
@@ -44,14 +44,14 @@
--EXPECTF--
string(1) "."
-Warning: Wrong parameter count for get_include_path() in %s on line %d
+Warning: get_include_path() expects exactly 0 parameters, 1 given in %s on
line %d
NULL
NULL
-Warning: Wrong parameter count for restore_include_path() in %s on line %d
+Warning: restore_include_path() expects exactly 0 parameters, 1 given in %s on
line %d
NULL
-Warning: Wrong parameter count for set_include_path() in %s on line %d
+Warning: set_include_path() expects exactly 1 parameter, 0 given in %s on line
%d
NULL
string(1) "."
string(1) "."
@@ -67,9 +67,41 @@
NULL
string(1) "."
-Notice: Array to string conversion in %s on line %d
+Warning: set_include_path() expects parameter 1 to be string (Unicode or
binary), array given in %s on line %d
+NULL
string(1) "."
-string(5) "Array"
NULL
string(1) "."
Done
+--UEXPECTF--
+unicode(1) "."
+
+Warning: get_include_path() expects exactly 0 parameters, 1 given in %s on
line %d
+NULL
+NULL
+
+Warning: restore_include_path() expects exactly 0 parameters, 1 given in %s on
line %d
+NULL
+
+Warning: set_include_path() expects exactly 1 parameter, 0 given in %s on line
%d
+NULL
+unicode(1) "."
+unicode(1) "."
+unicode(3) "var"
+NULL
+unicode(1) "."
+unicode(1) "."
+unicode(14) ".:/path/to/dir"
+NULL
+unicode(1) "."
+unicode(1) "."
+unicode(1) "."
+NULL
+unicode(1) "."
+
+Warning: set_include_path() expects parameter 1 to be string (Unicode or
binary), array given in %s on line %d
+NULL
+unicode(1) "."
+NULL
+unicode(1) "."
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_file.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_file.phpt
diff -u php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1
php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.2
--- php-src/ext/standard/tests/general_functions/parse_ini_file.phpt:1.1
Thu Nov 16 13:00:03 2006
+++ php-src/ext/standard/tests/general_functions/parse_ini_file.phpt Wed Dec
27 19:17:02 2006
@@ -95,10 +95,10 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: Wrong parameter count for parse_ini_file() in %s on line %d
+Warning: parse_ini_file() expects at least 1 parameter, 0 given in %s on line
%d
NULL
-Warning: Wrong parameter count for parse_ini_file() in %s on line %d
+Warning: parse_ini_file() expects at most 2 parameters, 3 given in %s on line
%d
NULL
Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such
file or directory in %s on line %d
@@ -173,3 +173,83 @@
string(5) "test4"
}
Done
+--UEXPECTF--
+Warning: parse_ini_file() expects at least 1 parameter, 0 given in %s on line
%d
+NULL
+
+Warning: parse_ini_file() expects at most 2 parameters, 3 given in %s on line
%d
+NULL
+
+Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such
file or directory in %s on line %d
+array(0) {
+}
+
+Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such
file or directory in %s on line %d
+array(0) {
+}
+array(1) {
+ [u"test"]=>
+ unicode(0) ""
+}
+
+Warning: Error parsing %sparse_ini_file.dat on line 2
+ in %s on line %d
+array(1) {
+ [u"test"]=>
+ unicode(0) ""
+}
+
+Warning: Error parsing %sparse_ini_file.dat on line 2
+ in %s on line %d
+array(1) {
+ [u"test"]=>
+ unicode(4) "test"
+}
+array(1) {
+ [u"test"]=>
+ unicode(8) "new
+line"
+}
+array(1) {
+ [u"test"]=>
+ unicode(16) "test const value"
+}
+array(1) {
+ [u"section"]=>
+ array(1) {
+ [u"test"]=>
+ unicode(5) "hello"
+ }
+}
+array(1) {
+ [u"test"]=>
+ unicode(5) "hello"
+}
+array(1) {
+ [u"section.test"]=>
+ unicode(5) "hello"
+}
+array(1) {
+ [u"section"]=>
+ array(1) {
+ [u"section.test"]=>
+ unicode(5) "hello"
+ }
+}
+array(1) {
+ [u"section"]=>
+ array(1) {
+ [1]=>
+ unicode(1) "2"
+ }
+}
+array(1) {
+ [1]=>
+ unicode(1) "2"
+}
+array(1) {
+ [u"test"]=>
+ unicode(5) "test4"
+}
+Done
+
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug20108.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/strings/bug20108.phpt
diff -u php-src/ext/standard/tests/strings/bug20108.phpt:1.5
php-src/ext/standard/tests/strings/bug20108.phpt:1.6
--- php-src/ext/standard/tests/strings/bug20108.phpt:1.5 Wed May 19
08:45:23 2004
+++ php-src/ext/standard/tests/strings/bug20108.phpt Wed Dec 27 19:17:02 2006
@@ -9,3 +9,6 @@
--EXPECT--
string(581) "
boo
"
+--UEXPECT--
+unicode(581) "
boo
+"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug25671.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/bug25671.phpt
diff -u php-src/ext/standard/tests/strings/bug25671.phpt:1.3
php-src/ext/standard/tests/strings/bug25671.phpt:1.4
--- php-src/ext/standard/tests/strings/bug25671.phpt:1.3 Thu Nov 9
01:16:48 2006
+++ php-src/ext/standard/tests/strings/bug25671.phpt Wed Dec 27 19:17:02 2006
@@ -16,10 +16,10 @@
echo serialize(str_replace(" ", "", $arr)) . "\n";
?>
--EXPECT--
-a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung
two.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last
string.";}i:3;s:22:"This is a last strung.";}
-a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung
two.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last
string.";}i:3;s:22:"This is a last strung.";}
-a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This
is another string.";i:1;s:22:"This is a last
string.";}i:3;s:18:"Thisisalaststring.";}
-a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This
is another string.";i:1;s:22:"This is a last
string.";}i:3;s:18:"Thisisalaststring.";}
+a:4:{i:0;S:19:"This is strung one.";i:1;S:19:"This is strung
two.";i:2;a:2:{i:0;S:23:"This is another string.";i:1;S:22:"This is a last
string.";}i:3;S:22:"This is a last strung.";}
+a:4:{i:0;S:19:"This is strung one.";i:1;S:19:"This is strung
two.";i:2;a:2:{i:0;S:23:"This is another string.";i:1;S:22:"This is a last
string.";}i:3;S:22:"This is a last strung.";}
+a:4:{i:0;S:16:"Thisisstringone.";i:1;S:16:"Thisisstringtwo.";i:2;a:2:{i:0;S:23:"This
is another string.";i:1;S:22:"This is a last
string.";}i:3;S:18:"Thisisalaststring.";}
+a:4:{i:0;S:16:"Thisisstringone.";i:1;S:16:"Thisisstringtwo.";i:2;a:2:{i:0;S:23:"This
is another string.";i:1;S:22:"This is a last
string.";}i:3;S:18:"Thisisalaststring.";}
--UEXPECT--
a:4:{i:0;U:19:"This is strung one.";i:1;U:19:"This is strung
two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last
string.";}i:3;U:22:"This is a last strung.";}
a:4:{i:0;U:19:"This is strung one.";i:1;U:19:"This is strung
two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last
string.";}i:3;U:22:"This is a last strung.";}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug27278.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/strings/bug27278.phpt
diff -u php-src/ext/standard/tests/strings/bug27278.phpt:1.5
php-src/ext/standard/tests/strings/bug27278.phpt:1.6
--- php-src/ext/standard/tests/strings/bug27278.phpt:1.5 Tue Jun 20
19:49:44 2006
+++ php-src/ext/standard/tests/strings/bug27278.phpt Wed Dec 27 19:17:02 2006
@@ -21,5 +21,5 @@
string(2) "02"
--UEXPECT--
unicode(2) "02"
-string(2) "02"
+unicode(2) "02"
unicode(2) "02"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug39873.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/bug39873.phpt
diff -u php-src/ext/standard/tests/strings/bug39873.phpt:1.2
php-src/ext/standard/tests/strings/bug39873.phpt:1.3
--- php-src/ext/standard/tests/strings/bug39873.phpt:1.2 Fri Dec 22
04:03:35 2006
+++ php-src/ext/standard/tests/strings/bug39873.phpt Wed Dec 27 19:17:02 2006
@@ -15,3 +15,6 @@
?>
--EXPECT--
1,234.56
+--UEXPECTF--
+Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU
locale functions in %s on line %d
+1,234.56
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/time/bug38524.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/time/bug38524.phpt
diff -u php-src/ext/standard/tests/time/bug38524.phpt:1.4
php-src/ext/standard/tests/time/bug38524.phpt:1.5
--- php-src/ext/standard/tests/time/bug38524.phpt:1.4 Mon Aug 28 19:52:01 2006
+++ php-src/ext/standard/tests/time/bug38524.phpt Wed Dec 27 19:17:02 2006
@@ -46,6 +46,6 @@
[u"tm_yday"]=>
int(231)
[u"unparsed"]=>
- string(0) ""
+ unicode(0) ""
}
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
