fix *scanf() tests

diff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt
index 67bd8ee1030ec87d856985a6306bd10c4261fe16..19f21b11ab850ae6e323627e0d280b2a9ea1cc23 100644 (file)
--- a/ext/standard/tests/file/fscanf.phpt
+++ b/ext/standard/tests/file/fscanf.phpt
@@ -11,17 +11,17 @@ var_dump(fscanf(array(), array(), new stdclass));
 
 file_put_contents($filename, "data");
 
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
 var_dump(fscanf($fp, "%d", $v));
 var_dump($v);
 fclose($fp);
 
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
 var_dump(fscanf($fp, "%s", $v));
 var_dump($v);
 fclose($fp);
 
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
 var_dump(fscanf($fp, "%s", $v, $v1));
 var_dump($v);
 var_dump($v1);
@@ -29,7 +29,7 @@ fclose($fp);
 
 $v = array();
 $v1 = array();
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
 var_dump(fscanf($fp, "", $v, $v1));
 var_dump($v);
 var_dump($v1);
@@ -37,7 +37,7 @@ fclose($fp);
 
 $v = array();
 $v1 = array();
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
 var_dump(fscanf($fp, "%.a", $v, $v1));
 var_dump($v);
 var_dump($v1);
@@ -46,14 +46,14 @@ fclose($fp);
 @unlink($filename);
 touch($filename);
 
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
 var_dump(fscanf($fp, "%s", $v));
 var_dump($v);
 fclose($fp);
 
 file_put_contents($filename, "data");
 
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
 var_dump(fscanf($fp, "%s%d", $v));
 
 @unlink($filename);
@@ -98,3 +98,42 @@ array(0) {
 Warning: fscanf(): Different numbers of variable names and field specifiers in %s on line %d
 int(-1)
 Done
+--UEXPECTF--
+Warning: Wrong parameter count for fscanf() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for fscanf() in %s on line %d
+NULL
+
+Warning: fscanf(): supplied argument is not a valid File-Handle resource in %s on line %d
+bool(false)
+int(0)
+NULL
+int(1)
+unicode(4) "data"
+
+Warning: fscanf(): Variable is not assigned by any conversion specifiers in %s on line %d
+int(-1)
+unicode(4) "data"
+NULL
+
+Warning: fscanf(): Variable is not assigned by any conversion specifiers in %s on line %d
+int(-1)
+array(0) {
+}
+array(0) {
+}
+
+Warning: fscanf(): Bad scan conversion character "." in %s on line %d
+int(-1)
+array(0) {
+}
+array(0) {
+}
+bool(false)
+array(0) {
+}
+
+Warning: fscanf(): Different numbers of variable names and field specifiers in %s on line %d
+int(-1)
+Done

diff --git a/ext/standard/tests/strings/bug21730.phpt b/ext/standard/tests/strings/bug21730.phpt
index 8d40e204ce1096caed0638f7d994ad8795c1ca12..406f8c6eb4c0ef2d96ddab6ff30c31e65683c493 100644 (file)
--- a/ext/standard/tests/strings/bug21730.phpt
+++ b/ext/standard/tests/strings/bug21730.phpt
@@ -33,3 +33,20 @@ array(3) {
   [2]=>
   int(9)
 }
+--UEXPECT--
+array(3) {
+  [0]=>
+  unicode(3) "ABC"
+  [1]=>
+  unicode(3) "DEF"
+  [2]=>
+  int(9)
+}
+array(3) {
+  [0]=>
+  unicode(3) "ABC"
+  [1]=>
+  unicode(3) "DEF"
+  [2]=>
+  int(9)
+}