From: Felipe Pena <felipe@php.net>
Date: Mon, 25 Aug 2008 13:44:33 +0000 (+0000)
Subject: - Fixed tests
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~583
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1e51d05554efb8d4d49f9d93e7d25b4ecfa62e3;p=php

- Fixed tests
---

diff --git a/ext/standard/tests/strings/stripslashes_error.phpt b/ext/standard/tests/strings/stripslashes_error.phpt
index 8905217ee8..97fa8dd4d3 100644
--- a/ext/standard/tests/strings/stripslashes_error.phpt
+++ b/ext/standard/tests/strings/stripslashes_error.phpt
@@ -32,12 +32,12 @@ echo "Done\n";
 
 -- Testing stripslashes() function with Zero arguments --
 
-Warning: Wrong parameter count for stripslashes() in %s on line %d
+Warning: stripslashes() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
 -- Testing stripslashes() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for stripslashes() in %s on line %d
+Warning: stripslashes() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 unicode(18) "\"hello\"\"world\""
 Done
diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt
index 15ee4abf4c..436e0e8a40 100644
--- a/ext/standard/tests/strings/stripslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripslashes_variation1.phpt
@@ -125,24 +125,24 @@ unicode(7) "1.06E-9"
 unicode(3) "0.5"
 -- Iteration 10 --
 
-Notice: Array to string conversion in %s on line %d
-unicode(5) "Array"
+Warning: stripslashes() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
+NULL
 -- Iteration 11 --
 
-Notice: Array to string conversion in %s on line %d
-unicode(5) "Array"
+Warning: stripslashes() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
+NULL
 -- Iteration 12 --
 
-Notice: Array to string conversion in %s on line %d
-unicode(5) "Array"
+Warning: stripslashes() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
+NULL
 -- Iteration 13 --
 
-Notice: Array to string conversion in %s on line %d
-unicode(5) "Array"
+Warning: stripslashes() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
+NULL
 -- Iteration 14 --
 
-Notice: Array to string conversion in %s on line %d
-unicode(5) "Array"
+Warning: stripslashes() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
+NULL
 -- Iteration 15 --
 unicode(1) "1"
 -- Iteration 16 --
@@ -162,7 +162,9 @@ unicode(0) ""
 -- Iteration 23 --
 unicode(6) "obj'ct"
 -- Iteration 24 --
-unicode(%d) "Resource id #%d"
+
+Warning: stripslashes() expects parameter 1 to be string (Unicode or binary), resource given in %s on line %d
+NULL
 -- Iteration 25 --
 unicode(0) ""
 -- Iteration 26 --
diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt
index b39b8c5481..218ec4bdae 100644
Binary files a/ext/standard/tests/strings/strlen.phpt and b/ext/standard/tests/strings/strlen.phpt differ
diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt
index f1f4dec680..0a9437e774 100644
Binary files a/ext/standard/tests/strings/strtoupper1.phpt and b/ext/standard/tests/strings/strtoupper1.phpt differ