Fix bug #80018: Tolerate var_dump() printing floats in exponential notation in tests

diff --git a/Zend/tests/cast_to_double.phpt b/Zend/tests/cast_to_double.phpt
index 6151c00f84b8018711c2c2e435307255fb6e94a9..58286436bd29ba8b165ffe69c569542b6a7558d0 100644 (file)
--- a/Zend/tests/cast_to_double.phpt
+++ b/Zend/tests/cast_to_double.phpt
@@ -50,7 +50,7 @@ float(1)
 float(0)
 float(1)
 float(0)
-float(%d)
+float(%f)
 
 Notice: Object of class test could not be converted to float in %s on line %d
 float(1)

diff --git a/Zend/tests/settype_double.phpt b/Zend/tests/settype_double.phpt
index 8c74a95b14c2d593b4554e5a64cb8ba63666da33..d5b2f0e42ea94878f82f5c16253e959ee2782f06 100644 (file)
--- a/Zend/tests/settype_double.phpt
+++ b/Zend/tests/settype_double.phpt
@@ -50,7 +50,7 @@ float(1)
 float(0)
 float(1)
 float(0)
-float(%d)
+float(%f)
 
 Notice: Object of class test could not be converted to float in %s on line %d
 float(1)

diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt
index 424de1f6ba8a05056c64faf6ea415a588b886197..359b2c02b9b716add6fc6601a591a4c3c02beb75 100644 (file)
--- a/ext/standard/tests/file/disk.phpt
+++ b/ext/standard/tests/file/disk.phpt
@@ -30,8 +30,8 @@ bool(false)
 
 Warning: disk_total_space(): No such file or directory in %s on line %d
 bool(false)
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 Warning: disk_free_space(): No such file or directory in %s on line %d
 bool(false)

diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt
index 29b2cefed90b25884b7143164079fafc02e5939d..1590b71123f938238427098a90a3677f92d517a0 100644 (file)
--- a/ext/standard/tests/file/disk_free_space_basic.phpt
+++ b/ext/standard/tests/file/disk_free_space_basic.phpt
@@ -50,18 +50,18 @@ rmdir($file_path."/disk_free_space");
 ?>
 --EXPECTF--
 *** Testing with existing directory ***
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 *** Testing with newly created directory ***
  
  Free Space before writing to a file
-float(%d)
+float(%f)
 
  Free Space after writing to a file
-float(%d)
+float(%f)
 
  Free Space Value Is Correct
 *** Testing with Binary Input ***
-float(%d)
+float(%f)
 
 --- Done ---

diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt
index 62dd8c40eea93c31da17fa49210ff146ab089b03..3bec04bb814bac2b5f4186d11a1cdba6e9a03c73 100644 (file)
--- a/ext/standard/tests/file/disk_free_space_error.phpt
+++ b/ext/standard/tests/file/disk_free_space_error.phpt
@@ -35,7 +35,7 @@ bool(false)
 
 Warning: diskfreespace(): No such file or directory in %s on line %d
 bool(false)
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Done --

diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt
index d5adb32213816eda5ef739859ccc17ae28e6780b..b68bd34211dd2d9ec6545684dbe9f744ac329b85 100644 (file)
--- a/ext/standard/tests/file/disk_free_space_variation.phpt
+++ b/ext/standard/tests/file/disk_free_space_variation.phpt
@@ -63,44 +63,44 @@ rmdir($file_path."/disk_free_space_variation");
 ?>
 --EXPECTF--
 *** Testing with a directory ***
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 Testing for the return type ***
 bool(true)
 
 *** Testing with different directory combinations ***
 -- Iteration 1 --
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Iteration 2 --
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Iteration 3 --
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Iteration 4 --
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Iteration 5 --
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Iteration 6 --
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Iteration 7 --
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Iteration 8 --
-float(%d)
-float(%d)
+float(%f)
+float(%f)
 
 -- Iteration 9 --
 disk_free_space(): Argument #1 ($directory) must be a valid path, string given

diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt
index 0bb6159a40e167d3d33d6882ef07d25d61115af1..e565527d8814317daf00f6908c9d617c38096664 100644 (file)
--- a/ext/standard/tests/file/disk_total_space_basic.phpt
+++ b/ext/standard/tests/file/disk_total_space_basic.phpt
@@ -32,11 +32,11 @@ rmdir($file_path."/disk_total_space");
 ?>
 --EXPECTF--
 *** Testing with normal directory ***
-float(%d)
+float(%f)
 *** Testing with newly created directory ***
-float(%d)
+float(%f)
 
 Total Space after writing to a file
-float(%d)
+float(%f)
 
 -- Done --

diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt
index e4bd31fa5d9797da5984ad4caf11b522ea0ab5c6..88e6252adf954d3d2c04286678f6a6ff5141c112 100644 (file)
--- a/ext/standard/tests/file/disk_total_space_error.phpt
+++ b/ext/standard/tests/file/disk_total_space_error.phpt
@@ -31,6 +31,6 @@ unlink($file_path."/disk_total_space.tmp");
 
 Warning: disk_total_space(): No such file or directory in %s on line %d
 bool(false)
-float(%d)
+float(%f)
 
 --- Done ---

diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt
index da09238ecca2c13524091e2ebc6a6b01b7015b6f..a7578c486e0d9df011cf7105968b8e220042ee6b 100644 (file)
--- a/ext/standard/tests/file/disk_total_space_variation.phpt
+++ b/ext/standard/tests/file/disk_total_space_variation.phpt
@@ -64,35 +64,35 @@ rmdir($file_path."/disk_total_space");
 ?>
 --EXPECTF--
 *** Testing with a directory ***
-float(%d)
+float(%f)
 
 Testing for the return type ***
 bool(true)
 
 *** Testing with different directory combinations ***
 -- Iteration 1 --
-float(%d)
+float(%f)
 
 -- Iteration 2 --
-float(%d)
+float(%f)
 
 -- Iteration 3 --
-float(%d)
+float(%f)
 
 -- Iteration 4 --
-float(%d)
+float(%f)
 
 -- Iteration 5 --
-float(%d)
+float(%f)
 
 -- Iteration 6 --
-float(%d)
+float(%f)
 
 -- Iteration 7 --
-float(%d)
+float(%f)
 
 -- Iteration 8 --
-float(%d)
+float(%f)
 
 -- Iteration 9 --
 disk_total_space(): Argument #1 ($directory) must be a valid path, string given

diff --git a/ext/standard/tests/general_functions/gettype_settype_basic.phpt b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
index 932ed7a9671b0c9d414e1f6b757343c1c13d8f89..0c336f8a23672aa27aed870b84c662946b367b72 100644 (file)
--- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
@@ -348,11 +348,11 @@ float(0)
 string(6) "double"
 -- Iteration 12 --
 bool(true)
-float(%d)
+float(%f)
 string(6) "double"
 -- Iteration 13 --
 bool(true)
-float(%d)
+float(%f)
 string(6) "double"
 -- Iteration 14 --
 8: Object of class point could not be converted to float
@@ -407,11 +407,11 @@ float(0)
 string(6) "double"
 -- Iteration 12 --
 bool(true)
-float(%d)
+float(%f)
 string(6) "double"
 -- Iteration 13 --
 bool(true)
-float(%d)
+float(%f)
 string(6) "double"
 -- Iteration 14 --
 8: Object of class point could not be converted to float

diff --git a/ext/standard/tests/general_functions/type.phpt b/ext/standard/tests/general_functions/type.phpt
index a32e4b44a1d088f3edc84ce214c505c1a8b8cad5..a43640f09ebaade701d3b237e7749d246e420d80 100644 (file)
--- a/ext/standard/tests/general_functions/type.phpt
+++ b/ext/standard/tests/general_functions/type.phpt
@@ -132,12 +132,12 @@ float(0)
 bool(true)
 float(0)
 bool(true)
-float(%d)
+float(%f)
 bool(true)
-float(%d)
+float(%f)
 string(56) "Object of class stdClass could not be converted to float"
 bool(true)
-float(%d)
+float(%f)
 bool(true)
 bool(true)
 bool(true)