felipe          Mon Aug 25 13:44:33 2008 UTC

  Modified files:              
    /php-src/ext/standard/tests/strings stripslashes_error.phpt 
                                        stripslashes_variation1.phpt 
                                        strlen.phpt strtoupper1.phpt 
  Log:
  - Fixed tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_error.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/stripslashes_error.phpt
diff -u php-src/ext/standard/tests/strings/stripslashes_error.phpt:1.3 
php-src/ext/standard/tests/strings/stripslashes_error.phpt:1.4
--- php-src/ext/standard/tests/strings/stripslashes_error.phpt:1.3      Tue May 
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/stripslashes_error.phpt  Mon Aug 25 
13:44:33 2008
@@ -32,12 +32,12 @@
 
 -- 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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation1.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/strings/stripslashes_variation1.phpt
diff -u php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.5 
php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.6
--- php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.5 Tue May 
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/stripslashes_variation1.phpt     Mon Aug 
25 13:44:33 2008
@@ -125,24 +125,24 @@
 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 @@
 -- 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 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strlen.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/strlen.phpt
diff -u php-src/ext/standard/tests/strings/strlen.phpt:1.3 
php-src/ext/standard/tests/strings/strlen.phpt:1.4
--- php-src/ext/standard/tests/strings/strlen.phpt:1.3  Sun Apr 22 19:47:08 2007
+++ php-src/ext/standard/tests/strings/strlen.phpt      Mon Aug 25 13:44:33 2008
@@ -194,8 +194,8 @@
 
 --- Testing arrays ---
 
-Notice: Array to string conversion in %s on line %d
-int(5)
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %sstrlen.php on line %d
+NULL
 int(6)
 int(20)
 
@@ -226,9 +226,9 @@
 int(1)
 
 #### error conditions ####
-Warning: Wrong parameter count for strlen() in %s on line %d
+Warning: strlen() expects exactly 1 parameter, 0 given in %s on line %d
 
-Warning: Wrong parameter count for strlen() in %s on line %d
+Warning: strlen() expects exactly 1 parameter, 2 given in %s on line %d
 
-Warning: Wrong parameter count for strlen() in %s on line %d
+Warning: strlen() expects exactly 1 parameter, 2 given in %s on line %d
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/strings/strtoupper1.phpt
diff -u php-src/ext/standard/tests/strings/strtoupper1.phpt:1.5 
php-src/ext/standard/tests/strings/strtoupper1.phpt:1.6
--- php-src/ext/standard/tests/strings/strtoupper1.phpt:1.5     Thu Aug 21 
12:24:24 2008
+++ php-src/ext/standard/tests/strings/strtoupper1.phpt Mon Aug 25 13:44:33 2008
@@ -71,6 +71,7 @@
 echo "*** Done ***";
 ?>
 --EXPECTF--
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale 
functions in %sstrtoupper1.php on line %d
 *** Testing strtoupper() with all 256 chars ***
 00 => 00
 01 => 01



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to