felipe          Tue Jul 29 12:20:39 2008 UTC

  Modified files:              
    /php-src/ext/standard/tests/general_functions       bug41970.phpt 
    /php-src/ext/standard/tests/strings strncasecmp_variation10.phpt 
                                        strncasecmp_variation11.phpt 
                                        strncasecmp_variation4.phpt 
                                        strncmp_variation4.phpt 
    /php-src/ext/tidy/tests     024.phpt 
  Log:
  - Fixed tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41970.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug41970.phpt
diff -u php-src/ext/standard/tests/general_functions/bug41970.phpt:1.2 
php-src/ext/standard/tests/general_functions/bug41970.phpt:1.3
--- php-src/ext/standard/tests/general_functions/bug41970.phpt:1.2      Thu Jan 
10 09:38:41 2008
+++ php-src/ext/standard/tests/general_functions/bug41970.phpt  Tue Jul 29 
12:20:38 2008
@@ -13,15 +13,15 @@
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: Parameter 1 to sort() expected to be a reference, value given in 
%sbug41970.php on line 5
+Warning: Parameter 1 to sort() expected to be a reference, value given in %s 
on line %d
 NULL
 
-Notice: Array to string conversion in %sbug41970.php on line 6
-int(5)
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
+NULL
 
-Warning: Parameter 1 to sort() expected to be a reference, value given in 
%sbug41970.php on line 7
+Warning: Parameter 1 to sort() expected to be a reference, value given in %s 
on line %d
 NULL
 
-Notice: Array to string conversion in %sbug41970.php on line 8
-int(5)
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
+NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncasecmp_variation10.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/strncasecmp_variation10.phpt
diff -u php-src/ext/standard/tests/strings/strncasecmp_variation10.phpt:1.3 
php-src/ext/standard/tests/strings/strncasecmp_variation10.phpt:1.4
--- php-src/ext/standard/tests/strings/strncasecmp_variation10.phpt:1.3 Tue May 
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/strncasecmp_variation10.phpt     Tue Jul 
29 12:20:39 2008
@@ -129,31 +129,31 @@
 int(-%d)
 -- Iteration 15 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
@@ -179,6 +179,8 @@
 int(-%d)
 -- Iteration 30 --
 
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
+
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
 NULL
 -- Iteration 31 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncasecmp_variation11.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/strncasecmp_variation11.phpt
diff -u php-src/ext/standard/tests/strings/strncasecmp_variation11.phpt:1.3 
php-src/ext/standard/tests/strings/strncasecmp_variation11.phpt:1.4
--- php-src/ext/standard/tests/strings/strncasecmp_variation11.phpt:1.3 Tue May 
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/strncasecmp_variation11.phpt     Tue Jul 
29 12:20:39 2008
@@ -130,31 +130,31 @@
 int(%d)
 -- Iteration 15 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
@@ -180,6 +180,8 @@
 int(%d)
 -- Iteration 30 --
 
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
+
 Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), 
resource given in %s on line %d
 NULL
 -- Iteration 31 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncasecmp_variation4.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/strncasecmp_variation4.phpt
diff -u php-src/ext/standard/tests/strings/strncasecmp_variation4.phpt:1.3 
php-src/ext/standard/tests/strings/strncasecmp_variation4.phpt:1.4
--- php-src/ext/standard/tests/strings/strncasecmp_variation4.phpt:1.3  Tue May 
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/strncasecmp_variation4.phpt      Tue Jul 
29 12:20:39 2008
@@ -130,31 +130,31 @@
 int(0)
 -- Iteration 15 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
array given in %s on line %d
 NULL
@@ -180,6 +180,8 @@
 int(0)
 -- Iteration 30 --
 
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
+
 Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
 NULL
 -- Iteration 31 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strncmp_variation4.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/strncmp_variation4.phpt
diff -u php-src/ext/standard/tests/strings/strncmp_variation4.phpt:1.3 
php-src/ext/standard/tests/strings/strncmp_variation4.phpt:1.4
--- php-src/ext/standard/tests/strings/strncmp_variation4.phpt:1.3      Tue May 
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/strncmp_variation4.phpt  Tue Jul 29 
12:20:39 2008
@@ -133,31 +133,31 @@
 int(0)
 -- Iteration 15 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 
 Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
 NULL
@@ -183,6 +183,8 @@
 int(0)
 -- Iteration 30 --
 
+Warning: strlen() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
+
 Warning: strncmp() expects parameter 1 to be string (Unicode or binary), 
resource given in %s on line %d
 NULL
 -- Iteration 31 --
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tests/024.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/tidy/tests/024.phpt
diff -u php-src/ext/tidy/tests/024.phpt:1.4 php-src/ext/tidy/tests/024.phpt:1.5
--- php-src/ext/tidy/tests/024.phpt:1.4 Tue May 29 21:06:03 2007
+++ php-src/ext/tidy/tests/024.phpt     Tue Jul 29 12:20:39 2008
@@ -28,7 +28,7 @@
 
 ?>
 --EXPECTF--
-string(11%d) "<html>
+unicode(%d) "<html>
 <head>
 <title></title>
 </head>

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

Reply via email to