tony2001Wed 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/timebug38524.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/include_path.phpt?r1=1.1r2=1.2diff_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.1r2=1.2diff_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.phptWed 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) {
+ [utest]=
+ unicode(0)
+}
+
+Warning: Error parsing %sparse_ini_file.dat on line 2
+ in %s on line %d
+array(1) {
+ [utest]=
+ unicode(0)
+}
+
+Warning: Error parsing %sparse_ini_file.dat on line 2
+ in %s on line %d
+array(1) {
+ [utest]=
+ unicode(4) test
+}
+array(1) {
+ [utest]=
+ unicode(8) new
+line
+}
+array(1) {
+ [utest]=
+ unicode(16) test const value
+}
+array(1) {
+ [usection]=
+ array(1) {
+[utest]=
+unicode(5) hello
+ }
+}
+array(1) {
+ [utest]=
+ unicode(5) hello
+}
+array(1) {
+ [usection.test]=
+ unicode(5) hello
+}
+array(1) {
+ [usection]=
+ array(1) {
+[usection.test]=
+unicode(5) hello
+ }
+}
+array(1) {
+ [usection]=
+ array(1) {
+[1]=
+unicode(1) 2
+ }
+}
+array(1) {
+ [1]=
+ unicode(1) 2
+}
+array(1) {
+ [utest]=
+ unicode(5) test4
+}
+Done
+
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug20108.phpt?r1=1.5r2=1.6diff_format=u
Index:
