felipe          Mon Apr 14 17:51:08 2008 UTC

  Modified files:              
    /php-src/ext/standard/tests/general_functions       floatval.phpt 
  Log:
  - Fixed test (bug #44533)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/floatval.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/general_functions/floatval.phpt
diff -u php-src/ext/standard/tests/general_functions/floatval.phpt:1.2 
php-src/ext/standard/tests/general_functions/floatval.phpt:1.3
--- php-src/ext/standard/tests/general_functions/floatval.phpt:1.2      Tue Jun 
 5 09:21:54 2007
+++ php-src/ext/standard/tests/general_functions/floatval.phpt  Mon Apr 14 
17:51:08 2008
@@ -157,29 +157,17 @@
 *** Testing floatval() on non floating types ***
 float(-2147483648)
 float(2147483648)
-
-Warning: floatval() expects parameter 1 to be double, resource given in %s on 
line %d
-NULL
-
-Warning: floatval() expects parameter 1 to be double, resource given in %s on 
line %d
-NULL
+float(5)
+float(6)
 float(0)
 float(1)
 float(-1300)
-
-Warning: floatval() expects parameter 1 to be double, string given in %s on 
line %d
-NULL
-
-Notice: A non well formed numeric value encountered in %s on line %d
+float(0)
 float(10)
-
-Notice: A non well formed numeric value encountered in %s on line %d
 float(10.2)
 float(11)
 float(11)
-
-Warning: floatval() expects parameter 1 to be double, string given in %s on 
line %d
-NULL
+float(0)
 float(1)
 float(0)
 float(0)
@@ -187,45 +175,33 @@
 *** Testing doubleval() on non floating types ***
 float(-2147483648)
 float(2147483648)
-
-Warning: doubleval() expects parameter 1 to be double, resource given in %s on 
line %d
-NULL
-
-Warning: doubleval() expects parameter 1 to be double, resource given in %s on 
line %d
-NULL
+float(5)
+float(6)
 float(0)
 float(1)
 float(-1300)
-
-Warning: doubleval() expects parameter 1 to be double, string given in %s on 
line %d
-NULL
-
-Notice: A non well formed numeric value encountered in %s on line %d
+float(0)
 float(10)
-
-Notice: A non well formed numeric value encountered in %s on line %d
 float(10.2)
 float(11)
 float(11)
-
-Warning: doubleval() expects parameter 1 to be double, string given in %s on 
line %d
-NULL
+float(0)
 float(1)
 float(0)
 float(0)
 
 *** Testing error conditions ***
 
-Warning: floatval() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for floatval() in %s on line %d
 NULL
 
-Warning: doubleval() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for doubleval() in %s on line %d
 NULL
 
-Warning: floatval() expects exactly 1 parameter, 2 given in %s on line %d
+Warning: Wrong parameter count for floatval() in %s on line %d
 NULL
 
-Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d
+Warning: Wrong parameter count for doubleval() in %s on line %d
 NULL
 
 Done
@@ -279,29 +255,17 @@
 *** Testing floatval() on non floating types ***
 float(-2147483648)
 float(2147483648)
-
-Warning: floatval() expects parameter 1 to be double, resource given in %s on 
line %d
-NULL
-
-Warning: floatval() expects parameter 1 to be double, resource given in %s on 
line %d
-NULL
+float(5)
+float(6)
 float(0)
 float(1)
 float(-1300)
-
-Warning: floatval() expects parameter 1 to be double, Unicode string given in 
%s on line %d
-NULL
-
-Notice: A non well formed numeric value encountered in %s on line %d
+float(0)
 float(10)
-
-Notice: A non well formed numeric value encountered in %s on line %d
 float(10.2)
 float(11)
 float(11)
-
-Warning: floatval() expects parameter 1 to be double, Unicode string given in 
%s on line %d
-NULL
+float(0)
 float(1)
 float(0)
 float(0)
@@ -309,45 +273,33 @@
 *** Testing doubleval() on non floating types ***
 float(-2147483648)
 float(2147483648)
-
-Warning: doubleval() expects parameter 1 to be double, resource given in %s on 
line %d
-NULL
-
-Warning: doubleval() expects parameter 1 to be double, resource given in %s on 
line %d
-NULL
+float(5)
+float(6)
 float(0)
 float(1)
 float(-1300)
-
-Warning: doubleval() expects parameter 1 to be double, Unicode string given in 
%s on line %d
-NULL
-
-Notice: A non well formed numeric value encountered in %s on line %d
+float(0)
 float(10)
-
-Notice: A non well formed numeric value encountered in %s on line %d
 float(10.2)
 float(11)
 float(11)
-
-Warning: doubleval() expects parameter 1 to be double, Unicode string given in 
%s on line %d
-NULL
+float(0)
 float(1)
 float(0)
 float(0)
 
 *** Testing error conditions ***
 
-Warning: floatval() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for floatval() in %s on line %d
 NULL
 
-Warning: doubleval() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for doubleval() in %s on line %d
 NULL
 
-Warning: floatval() expects exactly 1 parameter, 2 given in %s on line %d
+Warning: Wrong parameter count for floatval() in %s on line %d
 NULL
 
-Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d
+Warning: Wrong parameter count for doubleval() in %s on line %d
 NULL
 
 Done



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

Reply via email to