From: Felipe Pena <felipe@php.net>
Date: Sat, 30 Aug 2008 22:16:29 +0000 (+0000)
Subject: - Fixed tests
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~514
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b5e6c5fd8af6ce57f9b757eaec3f547ad54d0d1;p=php

- Fixed tests
---

diff --git a/ext/standard/tests/file/fpassthru_error.phpt b/ext/standard/tests/file/fpassthru_error.phpt
index eb9d7e633a..e9bfd26008 100644
--- 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 9706917890..b4189106dc 100644
--- 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 7bc7f3b18b..7c4b42b433 100644
--- 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 8db45df208..e4f718dc88 100644
Binary files a/ext/standard/tests/strings/implode1.phpt and b/ext/standard/tests/strings/implode1.phpt differ