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

15 files changed, 51 insertions, 51 deletions

diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt
index 8abd5bec25..740054269f 100644
--- a/ext/zlib/tests/gzdeflate_error1.phpt
+++ b/ext/zlib/tests/gzdeflate_error1.phpt
@@ -81,6 +81,6 @@ bool(false)
 Warning: gzdeflate() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
-Warning: gzdeflate() expects parameter 2 to be long, object given in %s on line %d
+Warning: gzdeflate() expects parameter 2 to be integer, object given in %s on line %d
 NULL
 ===Done===
diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt
index 9ecf4b8f08..5a16ffbc5f 100644
--- a/ext/zlib/tests/gzencode_error1.phpt
+++ b/ext/zlib/tests/gzencode_error1.phpt
@@ -84,15 +84,15 @@ bool(false)
 Warning: gzencode() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
-Warning: gzencode() expects parameter 2 to be long, object given in %s on line %d
+Warning: gzencode() expects parameter 2 to be integer, object given in %s on line %d
 NULL
 
 Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
 bool(false)
 
-Warning: gzencode() expects parameter 3 to be long, object given in %s on line %d
+Warning: gzencode() expects parameter 3 to be integer, object given in %s on line %d
 NULL
 
-Warning: gzencode() expects parameter 2 to be long, string given in %s on line %d
+Warning: gzencode() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 ===Done===
diff --git a/ext/zlib/tests/gzfile_variation10.phpt b/ext/zlib/tests/gzfile_variation10.phpt
index 20de8cb535..145e4c53ca 100644
--- a/ext/zlib/tests/gzfile_variation10.phpt
+++ b/ext/zlib/tests/gzfile_variation10.phpt
@@ -71,10 +71,10 @@ array(6) {
 "
 }
 
-Warning: gzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 array(6) {
   [0]=>
diff --git a/ext/zlib/tests/gzfile_variation13.phpt b/ext/zlib/tests/gzfile_variation13.phpt
index 4198c474df..24f3c84451 100644
--- a/ext/zlib/tests/gzfile_variation13.phpt
+++ b/ext/zlib/tests/gzfile_variation13.phpt
@@ -44,8 +44,8 @@ foreach ( $variation as $var ) {
 ?>
 ===DONE===
 --EXPECTF--
-Error: 2 - gzfile() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - gzfile() expects parameter 2 to be integer, object given, %s(%d)
 NULL
-Error: 2 - gzfile() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - gzfile() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 ===DONE===
\ No newline at end of file
diff --git a/ext/zlib/tests/gzfile_variation14.phpt b/ext/zlib/tests/gzfile_variation14.phpt
index 7462bea809..92547adb7c 100644
--- a/ext/zlib/tests/gzfile_variation14.phpt
+++ b/ext/zlib/tests/gzfile_variation14.phpt
@@ -30,15 +30,15 @@ foreach ( $variation_array as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: gzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file
diff --git a/ext/zlib/tests/gzfile_variation2.phpt b/ext/zlib/tests/gzfile_variation2.phpt
index ba487435cd..36d1d4c71b 100644
--- a/ext/zlib/tests/gzfile_variation2.phpt
+++ b/ext/zlib/tests/gzfile_variation2.phpt
@@ -26,15 +26,15 @@ foreach ( $variation as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: gzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file
diff --git a/ext/zlib/tests/gzfile_variation8.phpt b/ext/zlib/tests/gzfile_variation8.phpt
index 50d042218c..070fa30e40 100644
--- a/ext/zlib/tests/gzfile_variation8.phpt
+++ b/ext/zlib/tests/gzfile_variation8.phpt
@@ -29,15 +29,15 @@ foreach ( $variation as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: gzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file
diff --git a/ext/zlib/tests/gzinflate_error1.phpt b/ext/zlib/tests/gzinflate_error1.phpt
index 6dc8113645..822d9b8129 100644
--- a/ext/zlib/tests/gzinflate_error1.phpt
+++ b/ext/zlib/tests/gzinflate_error1.phpt
@@ -70,6 +70,6 @@ bool(false)
 Warning: gzinflate() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
-Warning: gzinflate() expects parameter 2 to be long, object given in %s on line %d
+Warning: gzinflate() expects parameter 2 to be integer, object given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file
diff --git a/ext/zlib/tests/gzopen_variation3.phpt b/ext/zlib/tests/gzopen_variation3.phpt
index 0210a75905..4ba607420d 100644
--- a/ext/zlib/tests/gzopen_variation3.phpt
+++ b/ext/zlib/tests/gzopen_variation3.phpt
@@ -142,19 +142,19 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 
 --empty array--
-Error: 2 - gzopen() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - gzopen() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - gzopen() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - gzopen() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -176,35 +176,35 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 
 --empty string DQ--
-Error: 2 - gzopen() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - gzopen() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - gzopen() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - gzopen() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - gzopen() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - gzopen() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - gzopen() expects parameter 3 to be long, object given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - gzopen() expects parameter 3 to be long, object given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
@@ -214,6 +214,6 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 
 --resource--
-Error: 2 - gzopen() expects parameter 3 to be long, resource given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be integer, resource given, %s(%d)
 NULL
 ===DONE===
diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt
index f26a4f5dcd..baf2527c14 100644
--- a/ext/zlib/tests/gzuncompress_error1.phpt
+++ b/ext/zlib/tests/gzuncompress_error1.phpt
@@ -75,6 +75,6 @@ bool(false)
 Warning: gzuncompress() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
-Warning: gzuncompress() expects parameter 2 to be long, string given in %s on line %d
+Warning: gzuncompress() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 ===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation10.phpt b/ext/zlib/tests/readgzfile_variation10.phpt
index bc6cc5b452..0f24c5efb2 100644
--- a/ext/zlib/tests/readgzfile_variation10.phpt
+++ b/ext/zlib/tests/readgzfile_variation10.phpt
@@ -45,10 +45,10 @@ as it turns around
 and I know that it descends down on me
 int(176)
 
-Warning: readgzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 When you're taught through feelings
 Destiny flying high above
diff --git a/ext/zlib/tests/readgzfile_variation13.phpt b/ext/zlib/tests/readgzfile_variation13.phpt
index db1bd892a5..d6c1fb4042 100644
--- a/ext/zlib/tests/readgzfile_variation13.phpt
+++ b/ext/zlib/tests/readgzfile_variation13.phpt
@@ -44,8 +44,8 @@ foreach ( $variation as $var ) {
 ?>
 ===DONE===
 --EXPECTF--
-Error: 2 - readgzfile() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - readgzfile() expects parameter 2 to be integer, object given, %s(%d)
 NULL
-Error: 2 - readgzfile() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - readgzfile() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 ===DONE===
\ No newline at end of file
diff --git a/ext/zlib/tests/readgzfile_variation14.phpt b/ext/zlib/tests/readgzfile_variation14.phpt
index 90081a9465..08f62935bc 100644
--- a/ext/zlib/tests/readgzfile_variation14.phpt
+++ b/ext/zlib/tests/readgzfile_variation14.phpt
@@ -30,15 +30,15 @@ foreach ( $variation_array as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: readgzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 ===DONE===
diff --git a/ext/zlib/tests/readgzfile_variation2.phpt b/ext/zlib/tests/readgzfile_variation2.phpt
index 53a9f3e31e..80cb728e93 100644
--- a/ext/zlib/tests/readgzfile_variation2.phpt
+++ b/ext/zlib/tests/readgzfile_variation2.phpt
@@ -26,15 +26,15 @@ foreach ( $variation as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: readgzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file
diff --git a/ext/zlib/tests/readgzfile_variation8.phpt b/ext/zlib/tests/readgzfile_variation8.phpt
index 291b69efcf..7242f19b22 100644
--- a/ext/zlib/tests/readgzfile_variation8.phpt
+++ b/ext/zlib/tests/readgzfile_variation8.phpt
@@ -29,15 +29,15 @@ foreach ( $variation as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: readgzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be long, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file