Use "float" and "integer" in typehint and zpp errors

14 files changed, 65 insertions, 65 deletions

diff --git a/Zend/tests/bug33999.phpt b/Zend/tests/bug33999.phpt
index 1946280712..7460815441 100644
--- a/Zend/tests/bug33999.phpt
+++ b/Zend/tests/bug33999.phpt
@@ -26,5 +26,5 @@ object(Foo)#1 (1) {
 Notice: Object of class Foo could not be converted to int in %sbug33999.php on line 9
 int(1)
 
-Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12
+Notice: Object of class Foo could not be converted to float in %sbug33999.php on line 12
 float(1)
diff --git a/Zend/tests/cast_to_double.phpt b/Zend/tests/cast_to_double.phpt
index a5b9819b02..a1a1adc1dc 100644
--- a/Zend/tests/cast_to_double.phpt
+++ b/Zend/tests/cast_to_double.phpt
@@ -52,6 +52,6 @@ float(1)
 float(0)
 float(%d)
 
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
 float(1)
 Done
diff --git a/Zend/tests/compare_001.phpt b/Zend/tests/compare_001.phpt
index 1d42c637d6..51243da5df 100644
--- a/Zend/tests/compare_001.phpt
+++ b/Zend/tests/compare_001.phpt
@@ -118,13 +118,13 @@ float(2.5) != NULL
 float(2.5) == bool(true)
 float(2.5) != bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  != object(stdClass)#1 (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  != object(stdClass)#2 (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  != object(test)#3 (0) {}
 float(2.5) != array(0) {}
 float(2.5) != int(-2147483648)
@@ -260,7 +260,7 @@ object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  == int(1)
 object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  != float(2.5)
 object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  == int(1)
 object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  != float(2.5)
 object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  == int(1)
 object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  != float(2.5)
 object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_001_64bit.phpt b/Zend/tests/compare_001_64bit.phpt
index bc57d0fec9..6d5a175d3d 100644
--- a/Zend/tests/compare_001_64bit.phpt
+++ b/Zend/tests/compare_001_64bit.phpt
@@ -118,13 +118,13 @@ float(2.5) != NULL
 float(2.5) == bool(true)
 float(2.5) != bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  != object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  != object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  != object(test)#%d (0) {}
 float(2.5) != array(0) {}
 float(2.5) != int(-9223372036854775808)
@@ -260,7 +260,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  == int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  != float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  == int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  != float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  == int(1)
 object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  != float(2.5)
 object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_003.phpt b/Zend/tests/compare_003.phpt
index 9327ee58bc..3b293d1daa 100644
--- a/Zend/tests/compare_003.phpt
+++ b/Zend/tests/compare_003.phpt
@@ -118,13 +118,13 @@ float(2.5) > NULL
 float(2.5) <= bool(true)
 float(2.5) > bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  > object(stdClass)#1 (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  > object(stdClass)#2 (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  > object(test)#3 (0) {}
 float(2.5) <= array(0) {}
 float(2.5) > int(-2147483648)
@@ -260,7 +260,7 @@ object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  <= int(1)
 object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  <= float(2.5)
 object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  <= int(1)
 object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  <= float(2.5)
 object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  <= int(1)
 object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  <= float(2.5)
 object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_003_64bit.phpt b/Zend/tests/compare_003_64bit.phpt
index 1f936c6e37..eca4b5c8ff 100644
--- a/Zend/tests/compare_003_64bit.phpt
+++ b/Zend/tests/compare_003_64bit.phpt
@@ -118,13 +118,13 @@ float(2.5) > NULL
 float(2.5) <= bool(true)
 float(2.5) > bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  > object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  > object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  > object(test)#%d (0) {}
 float(2.5) <= array(0) {}
 float(2.5) > int(-9223372036854775808)
@@ -260,7 +260,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  <= int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  <= float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  <= int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  <= float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  <= int(1)
 object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  <= float(2.5)
 object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_004.phpt b/Zend/tests/compare_004.phpt
index 69131cd5cd..6f6d29b1fb 100644
--- a/Zend/tests/compare_004.phpt
+++ b/Zend/tests/compare_004.phpt
@@ -118,13 +118,13 @@ float(2.5) >= NULL
 float(2.5) >= bool(true)
 float(2.5) >= bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  >= object(stdClass)#1 (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  >= object(stdClass)#2 (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  >= object(test)#3 (0) {}
 float(2.5) < array(0) {}
 float(2.5) >= int(-2147483648)
@@ -260,7 +260,7 @@ object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  >= int(1)
 object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  < float(2.5)
 object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  >= int(1)
 object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  < float(2.5)
 object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  >= int(1)
 object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  < float(2.5)
 object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_004_64bit.phpt b/Zend/tests/compare_004_64bit.phpt
index 36bdaa78ee..ef5083943b 100644
--- a/Zend/tests/compare_004_64bit.phpt
+++ b/Zend/tests/compare_004_64bit.phpt
@@ -118,13 +118,13 @@ float(2.5) >= NULL
 float(2.5) >= bool(true)
 float(2.5) >= bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  >= object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  >= object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  >= object(test)#%d (0) {}
 float(2.5) < array(0) {}
 float(2.5) >= int(-9223372036854775808)
@@ -260,7 +260,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  >= int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  < float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  >= int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  < float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  >= int(1)
 object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  < float(2.5)
 object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_005.phpt b/Zend/tests/compare_005.phpt
index 4f5cd80b54..38f4200ef7 100644
--- a/Zend/tests/compare_005.phpt
+++ b/Zend/tests/compare_005.phpt
@@ -118,13 +118,13 @@ float(2.5) >= NULL
 float(2.5) >= bool(true)
 float(2.5) >= bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  >= object(stdClass)#1 (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  >= object(stdClass)#2 (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  >= object(test)#3 (0) {}
 float(2.5) < array(0) {}
 float(2.5) >= int(-2147483648)
@@ -260,7 +260,7 @@ object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  >= int(1)
 object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  < float(2.5)
 object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  >= int(1)
 object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  < float(2.5)
 object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  >= int(1)
 object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  < float(2.5)
 object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_005_64bit.phpt b/Zend/tests/compare_005_64bit.phpt
index 69492b3b24..86dcbe50f1 100644
--- a/Zend/tests/compare_005_64bit.phpt
+++ b/Zend/tests/compare_005_64bit.phpt
@@ -118,13 +118,13 @@ float(2.5) >= NULL
 float(2.5) >= bool(true)
 float(2.5) >= bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  >= object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  >= object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  >= object(test)#%d (0) {}
 float(2.5) < array(0) {}
 float(2.5) >= int(-9223372036854775808)
@@ -260,7 +260,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  >= int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  < float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  >= int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  < float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  >= int(1)
 object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  < float(2.5)
 object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_006.phpt b/Zend/tests/compare_006.phpt
index 743983b97f..43389fb250 100644
--- a/Zend/tests/compare_006.phpt
+++ b/Zend/tests/compare_006.phpt
@@ -118,13 +118,13 @@ float(2.5) > NULL
 float(2.5) <= bool(true)
 float(2.5) > bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  > object(stdClass)#1 (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  > object(stdClass)#2 (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  > object(test)#3 (0) {}
 float(2.5) <= array(0) {}
 float(2.5) > int(-2147483648)
@@ -260,7 +260,7 @@ object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  <= int(1)
 object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  <= float(2.5)
 object(stdClass)#1 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  <= int(1)
 object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  <= float(2.5)
 object(stdClass)#2 (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  <= int(1)
 object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  <= float(2.5)
 object(test)#3 (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/compare_006_64bit.phpt b/Zend/tests/compare_006_64bit.phpt
index 56aad8d4b7..3870e189f0 100644
--- a/Zend/tests/compare_006_64bit.phpt
+++ b/Zend/tests/compare_006_64bit.phpt
@@ -118,13 +118,13 @@ float(2.5) > NULL
 float(2.5) <= bool(true)
 float(2.5) > bool(false)
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  > object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  > object(stdClass)#%d (0) {}
 float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  > object(test)#%d (0) {}
 float(2.5) <= array(0) {}
 float(2.5) > int(-9223372036854775808)
@@ -260,7 +260,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  <= int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  <= float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -285,7 +285,7 @@ object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
  <= int(1)
 object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
+Notice: Object of class stdClass could not be converted to float in %s on line %d
  <= float(2.5)
 object(stdClass)#%d (0) {}
 Notice: Object of class stdClass could not be converted to int in %s on line %d
@@ -310,7 +310,7 @@ object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
  <= int(1)
 object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
  <= float(2.5)
 object(test)#%d (0) {}
 Notice: Object of class test could not be converted to int in %s on line %d
diff --git a/Zend/tests/objects_001.phpt b/Zend/tests/objects_001.phpt
index 5cdc3dded0..fa1f171a28 100644
--- a/Zend/tests/objects_001.phpt
+++ b/Zend/tests/objects_001.phpt
@@ -49,10 +49,10 @@ bool(true)
 Notice: Object of class Bar could not be converted to int in %s on line %d
 bool(false)
 
-Notice: Object of class Bar could not be converted to double in %s on line %d
+Notice: Object of class Bar could not be converted to float in %s on line %d
 bool(true)
 
-Notice: Object of class Bar could not be converted to double in %s on line %d
+Notice: Object of class Bar could not be converted to float in %s on line %d
 bool(false)
 
 Notice: Object of class Bar could not be converted to int in %s on line %d
diff --git a/Zend/tests/settype_double.phpt b/Zend/tests/settype_double.phpt
index ed63f8ae83..7f1deccc8f 100644
--- a/Zend/tests/settype_double.phpt
+++ b/Zend/tests/settype_double.phpt
@@ -52,6 +52,6 @@ float(1)
 float(0)
 float(%d)
 
-Notice: Object of class test could not be converted to double in %s on line %d
+Notice: Object of class test could not be converted to float in %s on line %d
 float(1)
 Done