fix tests

diff --git a/ext/standard/tests/general_functions/include_path.phpt b/ext/standard/tests/general_functions/include_path.phpt
index 12d7c3f22622c2c434cfcc705eb03dda7a2f31a2..6925ced37a264bfaf200d5c4fe66a1826e95fd1b 100644 (file)
--- a/ext/standard/tests/general_functions/include_path.phpt
+++ b/ext/standard/tests/general_functions/include_path.phpt
@@ -44,14 +44,14 @@ echo "Done\n";
 --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 @@ string(1) "."
 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

diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt
index 399a224db95f043aad6cbc07d31d5c7672e7d72b..6308edda7311393f3a3ab4b3bcfa4973d04c5fca 100644 (file)
--- a/ext/standard/tests/general_functions/parse_ini_file.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_file.phpt
@@ -95,10 +95,10 @@ var_dump(parse_ini_file($filename, true));
 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 @@ array(1) {
   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
+

diff --git a/ext/standard/tests/strings/bug20108.phpt b/ext/standard/tests/strings/bug20108.phpt
index 6e2219d990915a8eca71cb1fa23589be5a782367..150d9f3da05076c3f9033245847837f1af2a3322 100644 (file)
--- a/ext/standard/tests/strings/bug20108.phpt
+++ b/ext/standard/tests/strings/bug20108.phpt
@@ -9,3 +9,6 @@ Bug #20108 (Segfault on printf statement)
 --EXPECT--
 string(581) "                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 boo
 "
+--UEXPECT--
+unicode(581) "                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 boo
+"

diff --git a/ext/standard/tests/strings/bug25671.phpt b/ext/standard/tests/strings/bug25671.phpt
index e8ad22335491eeb14314e13f3371118f744f9a4c..73a1f06d4e7a2c66441b64400e0167bf558a72e2 100644 (file)
--- a/ext/standard/tests/strings/bug25671.phpt
+++ b/ext/standard/tests/strings/bug25671.phpt
@@ -16,10 +16,10 @@ Bug #25671 (subarrays not copied correctly)
   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.";}

diff --git a/ext/standard/tests/strings/bug27278.phpt b/ext/standard/tests/strings/bug27278.phpt
index 5ed201fe4eab947ef39acc32dbe37e2e539ee41b..512fe64c924d269254c5a38680883ecb28941175 100644 (file)
--- a/ext/standard/tests/strings/bug27278.phpt
+++ b/ext/standard/tests/strings/bug27278.phpt
@@ -21,5 +21,5 @@ string(2) "02"
 string(2) "02"
 --UEXPECT--
 unicode(2) "02"
-string(2) "02"
+unicode(2) "02"
 unicode(2) "02"

diff --git a/ext/standard/tests/strings/bug39873.phpt b/ext/standard/tests/strings/bug39873.phpt
index e73f3c8516eb7cb0e96a269cbfd3cd3cfd79e664..68a5852fca7eef3487de699f3f7aee488c254a06 100644 (file)
--- a/ext/standard/tests/strings/bug39873.phpt
+++ b/ext/standard/tests/strings/bug39873.phpt
@@ -15,3 +15,6 @@ if (!setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO
 ?>
 --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

diff --git a/ext/standard/tests/time/bug38524.phpt b/ext/standard/tests/time/bug38524.phpt
index 1502a546e13460bffa72c879a715a8c4ec0a8f1e..a604476422b7404f8369e780782f3ea1a87b18f6 100755 (executable)
--- a/ext/standard/tests/time/bug38524.phpt
+++ b/ext/standard/tests/time/bug38524.phpt
@@ -46,6 +46,6 @@ array(9) {
   [u"tm_yday"]=>
   int(231)
   [u"unparsed"]=>
-  string(0) ""
+  unicode(0) ""
 }
 ===DONE===