- Fixed tests

diff --git a/ext/standard/tests/file/fpassthru_error.phpt b/ext/standard/tests/file/fpassthru_error.phpt
index eb9d7e633a497af9c3f5d680eb55124dd93906b9..e9bfd26008494468ac2430ffbc40bad0002ed869 100644 (file)
--- a/ext/standard/tests/file/fpassthru_error.phpt
+++ b/ext/standard/tests/file/fpassthru_error.phpt
@@ -28,13 +28,13 @@ echo "\n*** Done ***\n";
 
 Warning: fread() expects parameter 1 to be resource, Unicode string given in %s on line %d
 
-Warning: fpassthru(): supplied argument is not a valid stream resource in %s on line %d
-bool(false)
+Warning: fpassthru() expects parameter 1 to be resource, null given in %s on line %d
+NULL
 
-Warning: Wrong parameter count for fpassthru() in %s on line %d
+Warning: fpassthru() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for fpassthru() in %s on line %d
+Warning: fpassthru() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt
index 970691789053ca1ccff5ea2f1f2025b916e374eb..b4189106dcfeaa5e0b8af227a8c1cf567a97b311 100644 (file)
--- a/ext/standard/tests/file/fscanf_error.phpt
+++ b/ext/standard/tests/file/fscanf_error.phpt
@@ -66,10 +66,10 @@ unlink($filename);
 
 Notice: fwrite(): 11 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 
-Warning: Wrong parameter count for fscanf() in %s on line %d
+Warning: fscanf() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for fscanf() in %s on line %d
+Warning: fscanf() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
 Warning: fscanf(): 6 is not a valid File-Handle resource in %s on line %d

diff --git a/ext/standard/tests/serialize/serialization_error_001.phpt b/ext/standard/tests/serialize/serialization_error_001.phpt
index 7bc7f3b18b959d17b49aa5f709e25468494272aa..7c4b42b4331d6d225cb9acc9857433f02c33d505 100644 (file)
--- a/ext/standard/tests/serialize/serialization_error_001.phpt
+++ b/ext/standard/tests/serialize/serialization_error_001.phpt
@@ -28,15 +28,15 @@ echo "Done";
 --EXPECTF--
 *** Testing serialize()/unserialize() : error conditions ***
 
-Warning: Wrong parameter count for serialize() in %s on line 16
+Warning: serialize() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: unserialize() expects exactly 1 parameter, 0 given in %s on line 17
+Warning: unserialize() expects exactly 1 parameter, 0 given in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for serialize() in %s on line 20
+Warning: serialize() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: unserialize() expects exactly 1 parameter, 2 given in %s on line 21
+Warning: unserialize() expects exactly 1 parameter, 2 given in %s on line %d
 bool(false)
 Done

diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 8db45df20824eeae6d01ff7e2f23d9e8c548db0d..e4f718dc888e58f220bdefa37dc0f3201bd41223 100644 (file)
Binary files a/ext/standard/tests/strings/implode1.phpt and b/ext/standard/tests/strings/implode1.phpt differ