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

20 files changed, 20 insertions, 20 deletions

diff --git a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
index 9bf7a32007..f370159e3b 100644
--- a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
@@ -8,4 +8,4 @@ $dll = new SplDoublyLinkedList(2);
 $dll->setIteratorMode(new SplDoublyLinkedList(2));
 ?>
 --EXPECTF--
-Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be long, object given in %s on line %d
\ No newline at end of file
+Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be integer, object given in %s on line %d
\ No newline at end of file
diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
index d63d7cca54..1d78695d4a 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
@@ -9,4 +9,4 @@ $array = new SplFixedArray( array("string", 1) );
 
 ?>
 --EXPECTF--
-Warning: SplFixedArray::__construct() expects parameter 1 to be long, array given in %s on line %d
\ No newline at end of file
+Warning: SplFixedArray::__construct() expects parameter 1 to be integer, array given in %s on line %d
\ No newline at end of file
diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
index 3a7e734b06..99742e3eb7 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
@@ -9,4 +9,4 @@ $array = new SplFixedArray( "string" );
 
 ?>
 --EXPECTF--
-Warning: SplFixedArray::__construct() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
+Warning: SplFixedArray::__construct() expects parameter 1 to be integer, %unicode_string_optional% given in %s on line %d
diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
index 6582f847bd..e91f110cd4 100644
--- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
+++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
@@ -8,6 +8,6 @@ $array = new SplFixedArray(new SplFixedArray(3));
 var_dump($array);
 ?>
 --EXPECTF--
-Warning: SplFixedArray::__construct() expects parameter 1 to be long, object given in %s on line %d
+Warning: SplFixedArray::__construct() expects parameter 1 to be integer, object given in %s on line %d
 object(SplFixedArray)#1 (0) {
 }
\ No newline at end of file
diff --git a/ext/spl/tests/SplFixedArray_setSize_param_array.phpt b/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
index 269a45de1b..ee155bb6da 100644
--- a/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
+++ b/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
@@ -9,7 +9,7 @@ $fixed_array->setSize(array());
 var_dump($fixed_array);
 ?>
 --EXPECTF--
-Warning: SplFixedArray::setSize() expects parameter 1 to be long, array given in %s on line %d
+Warning: SplFixedArray::setSize() expects parameter 1 to be integer, array given in %s on line %d
 object(SplFixedArray)#1 (2) {
   [0]=>
   NULL
diff --git a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
index 62605b1dcf..c3f73c4bd1 100644
--- a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
@@ -35,7 +35,7 @@ NULL
 Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, double given in %s on line %d
+Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, float given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, null given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
index f523928702..7e065952b8 100644
--- a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
@@ -35,7 +35,7 @@ NULL
 Warning: SplObjectStorage::contains() expects parameter 1 to be object, integer given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::contains() expects parameter 1 to be object, double given in %s on line %d
+Warning: SplObjectStorage::contains() expects parameter 1 to be object, float given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::contains() expects parameter 1 to be object, null given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
index 83b79fcbf2..0841dfc1c9 100644
--- a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
@@ -35,7 +35,7 @@ NULL
 Warning: SplObjectStorage::detach() expects parameter 1 to be object, integer given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::detach() expects parameter 1 to be object, double given in %s on line %d
+Warning: SplObjectStorage::detach() expects parameter 1 to be object, float given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::detach() expects parameter 1 to be object, null given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
index 3f8bd437ec..4b495a0c44 100644
--- a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
@@ -37,7 +37,7 @@ NULL
 Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, integer given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, double given in %s on line %d
+Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, float given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, null given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
index 62e0dde65b..8ffb0e6721 100644
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
@@ -36,7 +36,7 @@ NULL
 Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, double given in %s on line %d
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, float given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, null given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
index ffd339869f..a0c48aac75 100644
--- a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
@@ -35,7 +35,7 @@ NULL
 Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, double given in %s on line %d
+Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, float given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, null given in %s on line %d
diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
index d2717ac5ae..a6c71717b5 100644
--- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
@@ -5,7 +5,7 @@ SPL SplTempFileObject constructor sets correct defaults when pass 0 arguments
 new SplTempFileObject('invalid');
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'RuntimeException' with message 'SplTempFileObject::__construct() expects parameter 1 to be long, string given' in %s
+Fatal error: Uncaught exception 'RuntimeException' with message 'SplTempFileObject::__construct() expects parameter 1 to be integer, string given' in %s
 Stack trace:
 #0 %s: SplTempFileObject->__construct('invalid')
 #1 {main}
diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt
index 53df1d502b..6a523aec66 100644
--- a/ext/spl/tests/arrayObject_asort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_asort_basic1.phpt
@@ -36,7 +36,7 @@ object(ArrayObject)#%d (1) {
   }
 }
 
-Warning: asort() expects parameter 2 to be long, string given in %sarrayObject_asort_basic1.php on line %d
+Warning: asort() expects parameter 2 to be integer, string given in %sarrayObject_asort_basic1.php on line %d
 bool(false)
 object(ArrayObject)#%d (1) {
   ["storage":"ArrayObject":private]=>
diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt
index 8f37938126..1e7aa01fe8 100644
--- a/ext/spl/tests/arrayObject_ksort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt
@@ -35,7 +35,7 @@ object(ArrayObject)#%d (1) {
   }
 }
 
-Warning: ksort() expects parameter 2 to be long, string given in %sarrayObject_ksort_basic1.php on line %d
+Warning: ksort() expects parameter 2 to be integer, string given in %sarrayObject_ksort_basic1.php on line %d
 bool(false)
 object(ArrayObject)#2 (1) {
   ["storage":"ArrayObject":private]=>
diff --git a/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt b/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
index 8dc50d5fc7..06451a3677 100644
--- a/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
+++ b/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
@@ -9,4 +9,4 @@ $s->setMaxLineLen('string');
 
 ?>
 --EXPECTF--
-Warning: SplFileObject::setMaxLineLen() expects parameter 1 to be long, string given in %s on line %d
+Warning: SplFileObject::setMaxLineLen() expects parameter 1 to be integer, string given in %s on line %d
diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt
index 9ccc693d55..fdd78f06a2 100644
--- a/ext/spl/tests/fixedarray_005.phpt
+++ b/ext/spl/tests/fixedarray_005.phpt
@@ -9,4 +9,4 @@ $a = new SplFixedArray($b);
 
 ?>
 --EXPECTF--
-Warning: SplFixedArray::__construct() expects parameter 1 to be long, object given in %s on line %d
+Warning: SplFixedArray::__construct() expects parameter 1 to be integer, object given in %s on line %d
diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt
index 936d210a65..c386fc638e 100644
--- a/ext/spl/tests/fixedarray_009.phpt
+++ b/ext/spl/tests/fixedarray_009.phpt
@@ -7,4 +7,4 @@ $a = new SplFixedArray('FOO');
 
 ?>
 --EXPECTF--
-Warning: SplFixedArray::__construct() expects parameter 1 to be long, string given in %s on line %d
+Warning: SplFixedArray::__construct() expects parameter 1 to be integer, string given in %s on line %d
diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt
index 60fc4d12fd..6e31a42532 100644
--- a/ext/spl/tests/fixedarray_015.phpt
+++ b/ext/spl/tests/fixedarray_015.phpt
@@ -40,7 +40,7 @@ try {
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: SplFixedArray::__construct() expects parameter 1 to be long, string given in %s on line %d
+Warning: SplFixedArray::__construct() expects parameter 1 to be integer, string given in %s on line %d
 Index invalid or out of range
 Index invalid or out of range
 Index invalid or out of range
diff --git a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
index 81c853f307..32bc574433 100644
--- a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
@@ -26,7 +26,7 @@ $it->setPrefixPart(1, $a); // Should throw a warning as setPrefixPart expects ar
 --EXPECTF--
 Warning: RecursiveTreeIterator::setPrefixPart() expects exactly 2 parameters, 1 given in %s on line %d
 
-Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 1 to be long, object given in %s on line %d
+Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 1 to be integer, object given in %s on line %d
 
 Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 2 to be %binary_string_optional%, object given in %s on line %d
 ===DONE===
diff --git a/ext/spl/tests/regexIterator_setMode_error.phpt b/ext/spl/tests/regexIterator_setMode_error.phpt
index 52af499d7e..7062959eb1 100644
--- a/ext/spl/tests/regexIterator_setMode_error.phpt
+++ b/ext/spl/tests/regexIterator_setMode_error.phpt
@@ -25,4 +25,4 @@ int(0)
 string(14) "Illegal mode 7"
 int(0)
 
-Warning: RegexIterator::setMode() expects parameter 1 to be long, string given in %s on line %d
+Warning: RegexIterator::setMode() expects parameter 1 to be integer, string given in %s on line %d