- Fixed tests

diff --git a/ext/standard/tests/strings/stripslashes_error.phpt b/ext/standard/tests/strings/stripslashes_error.phpt
index 8905217ee813686eb4fb77e18e6c2226cd4429ff..97fa8dd4d34d6a3dd5338a444e929622bdeea773 100644 (file)
--- 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 15ee4abf4cdcd1b30b30552e4a753271c65ae15b..436e0e8a407de45f54a10b7059228b050e770f72 100644 (file)
--- 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 b39b8c5481db8fe19d14f019898d807cf3d19157..218ec4bdae2eadbe6f64be89df07da0251f6e7b4 100644 (file)
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 f1f4dec6809c2fcf12e4cf2da26df9ca236de3e5..0a9437e774833ba0bfa644d14d0d28684f40cc94 100644 (file)
Binary files a/ext/standard/tests/strings/strtoupper1.phpt and b/ext/standard/tests/strings/strtoupper1.phpt differ