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

33 files changed, 33 insertions, 33 deletions

diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt
index 2072112a02..0c1f378b8a 100644
--- a/tests/classes/__call_004.phpt
+++ b/tests/classes/__call_004.phpt
@@ -38,4 +38,4 @@ object(B)#1 (0) {
 }
 In B::__call(test4, array(1,a))
 object(B)#1 (0) {
-}
\ No newline at end of file
+}
diff --git a/tests/classes/__call_006.phpt b/tests/classes/__call_006.phpt
index a65fafb823..c3937393fd 100644
--- a/tests/classes/__call_006.phpt
+++ b/tests/classes/__call_006.phpt
@@ -74,4 +74,4 @@ Exception caught OK; continuing.
 object(B)#%d (0) {
 }
 Exception caught OK; continuing.
-==DONE==
\ No newline at end of file
+==DONE==
diff --git a/tests/classes/__call_007.phpt b/tests/classes/__call_007.phpt
index d79dba3bf6..b061d17d85 100644
--- a/tests/classes/__call_007.phpt
+++ b/tests/classes/__call_007.phpt
@@ -71,4 +71,4 @@ Exception caught OK; continuing.
 ---> Invoke __call via callback.
 NULL
 Exception caught OK; continuing.
-==DONE==
\ No newline at end of file
+==DONE==
diff --git a/tests/classes/autoload_017.phpt b/tests/classes/autoload_017.phpt
index 26de9fd3ae..d5ce2bd0e6 100644
--- a/tests/classes/autoload_017.phpt
+++ b/tests/classes/autoload_017.phpt
@@ -20,4 +20,4 @@ Ensure ReflectionClass::implementsInterface triggers autoload.
 ?>
 --EXPECTF--
 In autoload: string(6) "UndefI"
-Interface UndefI does not exist
\ No newline at end of file
+Interface UndefI does not exist
diff --git a/tests/classes/autoload_derived.p5c b/tests/classes/autoload_derived.p5c
index 93a4b3579a..d897daeed0 100755
--- a/tests/classes/autoload_derived.p5c
+++ b/tests/classes/autoload_derived.p5c
@@ -3,4 +3,4 @@
 class autoload_derived extends autoload_root {
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/tests/classes/autoload_implements.p5c b/tests/classes/autoload_implements.p5c
index 2c3479c860..55fcc3cd9f 100755
--- a/tests/classes/autoload_implements.p5c
+++ b/tests/classes/autoload_implements.p5c
@@ -7,4 +7,4 @@ class autoload_implements implements autoload_interface {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/tests/classes/autoload_interface.p5c b/tests/classes/autoload_interface.p5c
index 6908155e61..e6a416e721 100755
--- a/tests/classes/autoload_interface.p5c
+++ b/tests/classes/autoload_interface.p5c
@@ -4,4 +4,4 @@ interface autoload_interface {
 	function testFunction();
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/tests/classes/autoload_root.p5c b/tests/classes/autoload_root.p5c
index 9559d36d32..98149c59b5 100755
--- a/tests/classes/autoload_root.p5c
+++ b/tests/classes/autoload_root.p5c
@@ -7,4 +7,4 @@ class autoload_root {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/tests/classes/bug29446.phpt b/tests/classes/bug29446.phpt
index 5e30e8e74b..573f136ce0 100644
--- a/tests/classes/bug29446.phpt
+++ b/tests/classes/bug29446.phpt
@@ -16,4 +16,4 @@ $test = new testClass;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot redefine class constant testClass::TEST_CONST in %s on line 5
\ No newline at end of file
+Fatal error: Cannot redefine class constant testClass::TEST_CONST in %s on line 5
diff --git a/tests/classes/constants_basic_003.inc b/tests/classes/constants_basic_003.inc
index be193e64f8..5eb9065b82 100644
--- a/tests/classes/constants_basic_003.inc
+++ b/tests/classes/constants_basic_003.inc
@@ -2,4 +2,4 @@
 class A {
 	const MY_CONST = "hello from A"; 
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/classes/destructor_inheritance.phpt b/tests/classes/destructor_inheritance.phpt
index b9a46659b0..868c8960c8 100644
--- a/tests/classes/destructor_inheritance.phpt
+++ b/tests/classes/destructor_inheritance.phpt
@@ -26,4 +26,4 @@ echo 'Done';
 --EXPECT--
 base::__construct
 base::__destruct
-Done
\ No newline at end of file
+Done
diff --git a/tests/classes/final.phpt b/tests/classes/final.phpt
index b4e37a36f6..bf3a0cb937 100644
--- a/tests/classes/final.phpt
+++ b/tests/classes/final.phpt
@@ -28,4 +28,4 @@ echo "Done\n";
 --EXPECTF--
 Call to function first::show()
 Call to function second::show()
-Done
\ No newline at end of file
+Done
diff --git a/tests/classes/inheritance_006.phpt b/tests/classes/inheritance_006.phpt
index d51dafeede..03d1751f3c 100644
--- a/tests/classes/inheritance_006.phpt
+++ b/tests/classes/inheritance_006.phpt
@@ -21,4 +21,4 @@ object(C)#%d (2) {
   NULL
   [%u|b%"c":%u|b%"A":private]=>
   NULL
-}
\ No newline at end of file
+}
diff --git a/tests/classes/interface_optional_arg_002.phpt b/tests/classes/interface_optional_arg_002.phpt
index 92980f65b4..9987e925e0 100644
--- a/tests/classes/interface_optional_arg_002.phpt
+++ b/tests/classes/interface_optional_arg_002.phpt
@@ -21,4 +21,4 @@ $foo->bar();
 
 ?>
 --EXPECT--
-int(2)
\ No newline at end of file
+int(2)
diff --git a/tests/classes/interface_optional_arg_003.inc b/tests/classes/interface_optional_arg_003.inc
index a62c65670c..27b3350da0 100644
--- a/tests/classes/interface_optional_arg_003.inc
+++ b/tests/classes/interface_optional_arg_003.inc
@@ -1,4 +1,4 @@
 <?php 
 interface I {
   function f($a = null);
-}
\ No newline at end of file
+}
diff --git a/tests/classes/interface_optional_arg_003.phpt b/tests/classes/interface_optional_arg_003.phpt
index 13e36d5583..ece436b484 100644
--- a/tests/classes/interface_optional_arg_003.phpt
+++ b/tests/classes/interface_optional_arg_003.phpt
@@ -14,4 +14,4 @@ $c = new C;
 $c->f();
 ?>
 --EXPECTF--
-int(2)
\ No newline at end of file
+int(2)
diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt
index 47fa69087a..e00a00afff 100644
--- a/tests/classes/iterators_006.phpt
+++ b/tests/classes/iterators_006.phpt
@@ -84,4 +84,4 @@ foreach ($array as $property => $value) {
 0: foo
 1: bar
 2: baz
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/tests/classes/iterators_008.phpt b/tests/classes/iterators_008.phpt
index 22e6dc8107..da59ec3aaa 100644
--- a/tests/classes/iterators_008.phpt
+++ b/tests/classes/iterators_008.phpt
@@ -42,4 +42,4 @@ D::next(1)
 D::valid(1)
 D::current(1)
 D::next(0)
-D::valid(0)
\ No newline at end of file
+D::valid(0)
diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt
index ea3fe610d3..2d1850b519 100644
--- a/tests/classes/private_004b.phpt
+++ b/tests/classes/private_004b.phpt
@@ -32,4 +32,4 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
\ No newline at end of file
+Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt
index ea3fe610d3..2d1850b519 100644
--- a/tests/classes/private_005b.phpt
+++ b/tests/classes/private_005b.phpt
@@ -32,4 +32,4 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
\ No newline at end of file
+Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt
index 950f16a3c4..4084124915 100644
--- a/tests/classes/private_006b.phpt
+++ b/tests/classes/private_006b.phpt
@@ -38,4 +38,4 @@ echo "Done\n";
 --EXPECTF--
 Call show()
 Call show()
-Done
\ No newline at end of file
+Done
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
index 8bcf485355..410395e0e0 100644
--- a/tests/classes/property_recreate_private.phpt
+++ b/tests/classes/property_recreate_private.phpt
@@ -78,4 +78,4 @@ object(C)#%d (1) {
 
 Unset a private property, and attempt to recreate at global scope (expecting failure):
 
-Fatal error: Cannot access private property C::$p in %s on line 46
\ No newline at end of file
+Fatal error: Cannot access private property C::$p in %s on line 46
diff --git a/tests/classes/property_recreate_protected.phpt b/tests/classes/property_recreate_protected.phpt
index 4da4de87ad..f8444c3a2f 100644
--- a/tests/classes/property_recreate_protected.phpt
+++ b/tests/classes/property_recreate_protected.phpt
@@ -50,4 +50,4 @@ object(D)#%d (1) {
 
 Unset a protected property, and attempt to recreate it outside of scope (expected failure):
 
-Fatal error: Cannot access protected property %s::$p in %s on line 32
\ No newline at end of file
+Fatal error: Cannot access protected property %s::$p in %s on line 32
diff --git a/tests/classes/static_mix_1.phpt b/tests/classes/static_mix_1.phpt
index ecc9c01a28..5146e7096e 100644
--- a/tests/classes/static_mix_1.phpt
+++ b/tests/classes/static_mix_1.phpt
@@ -23,4 +23,4 @@ fail::show();
 echo "Done\n"; // shouldn't be displayed
 ?>                                                            
 --EXPECTF--
-Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d
\ No newline at end of file
+Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d
diff --git a/tests/classes/static_mix_2.phpt b/tests/classes/static_mix_2.phpt
index bbdaedf50a..cecb37bdaf 100644
--- a/tests/classes/static_mix_2.phpt
+++ b/tests/classes/static_mix_2.phpt
@@ -24,4 +24,4 @@ fail::show();
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Cannot make non static method pass::show() static in class fail in %s on line %d
\ No newline at end of file
+Fatal error: Cannot make non static method pass::show() static in class fail in %s on line %d
diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt
index 2441e41578..3303d7c1fd 100644
--- a/tests/classes/static_properties_003.phpt
+++ b/tests/classes/static_properties_003.phpt
@@ -46,4 +46,4 @@ Strict Standards: Accessing static property C::$x as non static in %s on line 16
 
 --> Access non-visible static prop like instance prop:
 bool(false)
-==Done==
\ No newline at end of file
+==Done==
diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt
index e98c605eb4..832711ae01 100644
--- a/tests/classes/static_properties_004.phpt
+++ b/tests/classes/static_properties_004.phpt
@@ -34,4 +34,4 @@ But because this is implemented using PHP references, the reference set can easi
 %unicode|string%(11) "changed.all"
 %unicode|string%(11) "changed.one"
 %unicode|string%(11) "changed.all"
-==Done==
\ No newline at end of file
+==Done==
diff --git a/tests/classes/static_properties_undeclared_assign.phpt b/tests/classes/static_properties_undeclared_assign.phpt
index 99340e9ac5..aed65797b4 100644
--- a/tests/classes/static_properties_undeclared_assign.phpt
+++ b/tests/classes/static_properties_undeclared_assign.phpt
@@ -6,4 +6,4 @@ Class C {}
 C::$p = 1;
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 3
\ No newline at end of file
+Fatal error: Access to undeclared static property: C::$p in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_assignInc.phpt b/tests/classes/static_properties_undeclared_assignInc.phpt
index 258f2f841b..9680bf5f15 100644
--- a/tests/classes/static_properties_undeclared_assignInc.phpt
+++ b/tests/classes/static_properties_undeclared_assignInc.phpt
@@ -6,4 +6,4 @@ Class C {}
 C::$p += 1;
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 3
\ No newline at end of file
+Fatal error: Access to undeclared static property: C::$p in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_assignRef.phpt b/tests/classes/static_properties_undeclared_assignRef.phpt
index 75cf270a9a..9f677f6c58 100644
--- a/tests/classes/static_properties_undeclared_assignRef.phpt
+++ b/tests/classes/static_properties_undeclared_assignRef.phpt
@@ -7,4 +7,4 @@ $a = 'foo';
 C::$p =& $a;
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 4
\ No newline at end of file
+Fatal error: Access to undeclared static property: C::$p in %s on line 4
diff --git a/tests/classes/static_properties_undeclared_inc.phpt b/tests/classes/static_properties_undeclared_inc.phpt
index ff8b8c3af1..a9b28d6cdd 100644
--- a/tests/classes/static_properties_undeclared_inc.phpt
+++ b/tests/classes/static_properties_undeclared_inc.phpt
@@ -6,4 +6,4 @@ Class C {}
 C::$p++;
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 3
\ No newline at end of file
+Fatal error: Access to undeclared static property: C::$p in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_isset.phpt b/tests/classes/static_properties_undeclared_isset.phpt
index 58aac40052..83fb7711c5 100644
--- a/tests/classes/static_properties_undeclared_isset.phpt
+++ b/tests/classes/static_properties_undeclared_isset.phpt
@@ -6,4 +6,4 @@ Class C {}
 var_dump(isset(C::$p));
 ?>
 --EXPECTF--
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/tests/classes/static_properties_undeclared_read.phpt b/tests/classes/static_properties_undeclared_read.phpt
index 715b41e78d..ae518d8ee1 100644
--- a/tests/classes/static_properties_undeclared_read.phpt
+++ b/tests/classes/static_properties_undeclared_read.phpt
@@ -6,4 +6,4 @@ Class C {}
 echo C::$p;
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 3
\ No newline at end of file
+Fatal error: Access to undeclared static property: C::$p in %s on line 3