From b1e51d05554efb8d4d49f9d93e7d25b4ecfa62e3 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Mon, 25 Aug 2008 13:44:33 +0000
Subject: [PATCH] - Fixed tests

---
 .../tests/strings/stripslashes_error.phpt     |   4 +--
 .../strings/stripslashes_variation1.phpt      |  24 ++++++++++--------
 ext/standard/tests/strings/strlen.phpt        | Bin 6981 -> 7071 bytes
 ext/standard/tests/strings/strtoupper1.phpt   | Bin 5094 -> 5211 bytes
 4 files changed, 15 insertions(+), 13 deletions(-)

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 b39b8c5481db8fe19d14f019898d807cf3d19157..218ec4bdae2eadbe6f64be89df07da0251f6e7b4 100644
GIT binary patch
delta 290
zcmX?VHs5^1R*CxX#G<^+ymTvt;*z4A)I1GMh180I)Z~(4g@VMQ#N5=9)FK5#g_3-Q
zq*Ra+pi%{m(7ep#{FGFM{33;<%)G>+N=+Sw#G<0aN`>^yveZ0<%sd6vVu*Qq1sMej
z`FRRCnR%%SswrH4p*}ubnRz7|W}0AX^KXf%jJg<hr&c5;m*i9eZHBu-N5KGM{NxW(
OGDPYyB3p-^v^W6r2xfl(

delta 207
zcmbPle$;HkRtYP={F2P%R4WC?qN2n~g_3-Q;*z4wymW=+{JgT%qT<Z_JcZ0W1=V5&
zAR{L;FI7P`g)1|!M8i~bvxekCMy2qge4y%r#G=I9)RNR9puW<)5{0z<B9K8jsd*Zj
WlkKHth*V}t*fdPnxa8-hasdDVFGwu_

diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt
index f1f4dec6809c2fcf12e4cf2da26df9ca236de3e5..0a9437e774833ba0bfa644d14d0d28684f40cc94 100644
GIT binary patch
delta 144
zcmaE+ep_S1L$-RC)Pkba<iwKH6f1?|)RLV1<iwm*4NWVB6u5*!W}ZT5US@KBN~%IG
zkkC;m$Vp8sPE{xcVo&E#1&Ahvw9>rflFa<PVvq*a;^LB`lKj$wg47~Iy@HGah5S5)
goXosb1=SQTEiEmDkksOm%)H4m0wSCLvpwel06EGu6951J

delta 16
Ycmcbu@l1WgL$=AE1mrfCus`Pk07dHud;kCd

-- 
2.50.1