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

42 files changed, 237 insertions, 237 deletions

diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt
index d56207a349..7c5d2c838b 100644
--- a/ext/standard/tests/file/006_variation2.phpt
+++ b/ext/standard/tests/file/006_variation2.phpt
@@ -149,38 +149,38 @@ bool(true)
 43567
 -- Iteration 12 --
 
-Warning: chmod() expects parameter 2 to be long, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 103567
 
-Warning: chmod() expects parameter 2 to be long, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 43567
 -- Iteration 13 --
 
-Warning: chmod() expects parameter 2 to be long, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 103567
 
-Warning: chmod() expects parameter 2 to be long, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 43567
 -- Iteration 14 --
 
-Warning: chmod() expects parameter 2 to be long, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 103567
 
-Warning: chmod() expects parameter 2 to be long, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 43567
 -- Iteration 15 --
 
-Warning: chmod() expects parameter 2 to be long, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 103567
 
-Warning: chmod() expects parameter 2 to be long, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 43567
 *** Done ***
diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt
index 1d692b0b6f..80cc657d5d 100644
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -128,10 +128,10 @@ bool(false)
 Warning: fopen(10.5): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 
-Warning: fclose() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
-Warning: feof() expects parameter 1 to be resource, double given in %s on line %d
+Warning: feof() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt
index 70615755c4..1fa5ad53ff 100644
--- a/ext/standard/tests/file/chmod_variation4.phpt
+++ b/ext/standard/tests/file/chmod_variation4.phpt
@@ -129,19 +129,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - chmod() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - chmod() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - chmod() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - chmod() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -163,35 +163,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - chmod() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - chmod() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - chmod() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - chmod() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - chmod() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - chmod() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - chmod() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - chmod() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt
index 6d7f731763..a334d8fea1 100644
--- a/ext/standard/tests/file/fflush_error.phpt
+++ b/ext/standard/tests/file/fflush_error.phpt
@@ -71,7 +71,7 @@ Warning: fflush() expects parameter 1 to be resource, integer given in %s on lin
 bool(false)
 -- Iteration 3 --
 
-Warning: fflush() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fflush() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fgetc_error.phpt b/ext/standard/tests/file/fgetc_error.phpt
index 15292d6c53..6b2f49e38c 100644
--- a/ext/standard/tests/file/fgetc_error.phpt
+++ b/ext/standard/tests/file/fgetc_error.phpt
@@ -56,7 +56,7 @@ Warning: fgetc() expects parameter 1 to be resource, integer given in %s on line
 bool(false)
 -- Iteration 3 --
 
-Warning: fgetc() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fgetc() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fgetcsv_error.phpt b/ext/standard/tests/file/fgetcsv_error.phpt
index e2db9f8730..daaa733c9d 100644
--- a/ext/standard/tests/file/fgetcsv_error.phpt
+++ b/ext/standard/tests/file/fgetcsv_error.phpt
@@ -67,10 +67,10 @@ Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on li
 NULL
 -- Iteration 3 --
 
-Warning: fgetcsv() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, float given in %s on line %d
 NULL
 
-Warning: fgetcsv() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, float given in %s on line %d
 NULL
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt
index 5ab32820ca..5a62252b78 100644
--- a/ext/standard/tests/file/fgets_error.phpt
+++ b/ext/standard/tests/file/fgets_error.phpt
@@ -84,7 +84,7 @@ Warning: fgets() expects parameter 1 to be resource, integer given in %s on line
 bool(false)
 -- Iteration 3 --
 
-Warning: fgets() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fgets() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt
index 1671662584..2640d27900 100644
--- a/ext/standard/tests/file/fgetss_error.phpt
+++ b/ext/standard/tests/file/fgetss_error.phpt
@@ -83,7 +83,7 @@ Warning: fgetss() expects parameter 1 to be resource, integer given in %s on lin
 bool(false)
 -- Iteration 3 --
 
-Warning: fgetss() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fgetss() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt
index c3130c30e2..31189672d3 100644
--- a/ext/standard/tests/file/file_error.phpt
+++ b/ext/standard/tests/file/file_error.phpt
@@ -36,7 +36,7 @@ NULL
 Warning: file() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
-Warning: file() expects parameter 2 to be long, string given in %s on line %d
+Warning: file() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 array(0) {
 }
diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt
index 3b494b4491..ecceb28093 100644
--- a/ext/standard/tests/file/file_get_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation4.phpt
@@ -147,23 +147,23 @@ Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given
 NULL
 
 --float 10.5--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --float -10.5--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --float 12.3456789000e10--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --float -12.3456789000e10--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --float .5--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --empty array--
diff --git a/ext/standard/tests/file/file_get_contents_variation5.phpt b/ext/standard/tests/file/file_get_contents_variation5.phpt
index e2dafbe0ee..aa13d69eb8 100644
--- a/ext/standard/tests/file/file_get_contents_variation5.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5.phpt
@@ -151,19 +151,19 @@ string(%d) %s
 string(%d) "contents read"
 
 --empty array--
-Error: 2 - file_get_contents() expects parameter 4 to be long, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - file_get_contents() expects parameter 4 to be long, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - file_get_contents() expects parameter 4 to be long, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - file_get_contents() expects parameter 4 to be long, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -185,35 +185,35 @@ string(12) "ontents read"
 string(%d) "contents read"
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, %unicode_string_optional% given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 4 to be long, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 4 to be long, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt
index 6795e0165a..25a122e1bc 100644
--- a/ext/standard/tests/file/file_get_contents_variation6.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation6.phpt
@@ -142,19 +142,19 @@ bool(false)
 string(%d) ""
 
 --empty array--
-Error: 2 - file_get_contents() expects parameter 5 to be long, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - file_get_contents() expects parameter 5 to be long, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - file_get_contents() expects parameter 5 to be long, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - file_get_contents() expects parameter 5 to be long, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -176,35 +176,35 @@ string(%d) "c"
 string(%d) ""
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 5 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 5 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 5 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 5 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 5 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 5 to be long, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 5 to be long, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 5 to be long, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt
index e16f6403c0..bf454ca08c 100644
--- a/ext/standard/tests/file/file_put_contents_variation3.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation3.phpt
@@ -146,23 +146,23 @@ Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given
 NULL
 
 --float 10.5--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, float given, %s(%d)
 NULL
 
 --float -10.5--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, float given, %s(%d)
 NULL
 
 --float 12.3456789000e10--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, float given, %s(%d)
 NULL
 
 --float -12.3456789000e10--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, float given, %s(%d)
 NULL
 
 --float .5--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, float given, %s(%d)
 NULL
 
 --empty array--
diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt
index 54635d6d86..f61c3c257e 100644
--- a/ext/standard/tests/file/file_variation3.phpt
+++ b/ext/standard/tests/file/file_variation3.phpt
@@ -151,19 +151,19 @@ array(3) {
 }
 
 --empty array--
-Error: 2 - file() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - file() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - file() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - file() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -239,35 +239,35 @@ array(3) {
 }
 
 --empty string DQ--
-Error: 2 - file() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - file() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - file() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt
index 5010368148..04ddc91600 100644
--- a/ext/standard/tests/file/file_variation4.phpt
+++ b/ext/standard/tests/file/file_variation4.phpt
@@ -145,23 +145,23 @@ Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
 NULL
 
 --float 10.5--
-Error: 2 - file() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --float -10.5--
-Error: 2 - file() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --float 12.3456789000e10--
-Error: 2 - file() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --float -12.3456789000e10--
-Error: 2 - file() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --float .5--
-Error: 2 - file() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, float given, %s(%d)
 NULL
 
 --empty array--
diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt
index 4fa1094967..81e42f3fe6 100644
--- a/ext/standard/tests/file/flock_error.phpt
+++ b/ext/standard/tests/file/flock_error.phpt
@@ -75,23 +75,23 @@ Warning: flock(): Illegal operation argument in %s on line %d
 bool(false)
 
 --- Iteration 4 ---
-Warning: flock() expects parameter 2 to be long, array given in %s on line %d
+Warning: flock() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
 --- Iteration 5 ---
-Warning: flock() expects parameter 2 to be long, array given in %s on line %d
+Warning: flock() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
 --- Iteration 6 ---
-Warning: flock() expects parameter 2 to be long, string given in %s on line %d
+Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 --- Iteration 7 ---
-Warning: flock() expects parameter 2 to be long, string given in %s on line %d
+Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 --- Iteration 8 ---
-Warning: flock() expects parameter 2 to be long, string given in %s on line %d
+Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 Warning: flock(): supplied resource is not a valid stream resource in %s on line %d
diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt
index 61d850c501..38f5fefe62 100644
--- a/ext/standard/tests/file/fopen_variation4.phpt
+++ b/ext/standard/tests/file/fopen_variation4.phpt
@@ -146,23 +146,23 @@ Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 2 - fopen() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, float given, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 2 - fopen() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, float given, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 2 - fopen() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, float given, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 2 - fopen() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, float given, %s(%d)
 bool(false)
 
 --float .5--
-Error: 2 - fopen() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, float given, %s(%d)
 bool(false)
 
 --empty array--
diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt
index f6868e3ece..f952cdbc8c 100644
--- a/ext/standard/tests/file/fpassthru_variation1.phpt
+++ b/ext/standard/tests/file/fpassthru_variation1.phpt
@@ -108,27 +108,27 @@ bool(false)
 
 Arg value 10.5 
 
-Warning: fpassthru() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
 Arg value -10.5 
 
-Warning: fpassthru() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
 Arg value 101234567000 
 
-Warning: fpassthru() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
 Arg value 1.07654321E-9 
 
-Warning: fpassthru() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
 Arg value 0.5 
 
-Warning: fpassthru() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
 Arg value Array 
diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt
index ebffd45425..1e6ba94edd 100644
--- a/ext/standard/tests/file/fputcsv_error.phpt
+++ b/ext/standard/tests/file/fputcsv_error.phpt
@@ -70,7 +70,7 @@ NULL
 Warning: fputcsv() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: fputcsv() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fputcsv() expects parameter 1 to be resource, float given in %s on line %d
 NULL
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 16c828ec51..4917d2ef47 100644
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -85,7 +85,7 @@ Warning: fread() expects parameter 1 to be resource, integer given in %s on line
 bool(false)
 -- Iteration 3 --
 
-Warning: fread() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fread() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
index d955340581..9a3a2d5154 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
@@ -76,7 +76,7 @@ Warning: fseek() expects parameter 1 to be resource, integer given in %s on line
 bool(false)
 -- Iteration 3 --
 
-Warning: fseek() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fseek() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
index d297d6c7cb..e83c398f4b 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
@@ -72,7 +72,7 @@ Warning: ftell() expects parameter 1 to be resource, integer given in %s on line
 bool(false)
 -- Iteration 3 --
 
-Warning: ftell() expects parameter 1 to be resource, double given in %s on line %d
+Warning: ftell() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
index 16a4a0f9dd..6f2511d49c 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
@@ -72,7 +72,7 @@ Warning: rewind() expects parameter 1 to be resource, integer given in %s on lin
 bool(false)
 -- Iteration 3 --
 
-Warning: rewind() expects parameter 1 to be resource, double given in %s on line %d
+Warning: rewind() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt
index fbe4673a3f..914c6d0e42 100644
--- a/ext/standard/tests/file/fseek_variation1.phpt
+++ b/ext/standard/tests/file/fseek_variation1.phpt
@@ -105,31 +105,31 @@ int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be long, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
 bool(false)
 int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be long, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
 bool(false)
 int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be long, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
 bool(false)
 int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be long, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
 bool(false)
 int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be long, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
 bool(false)
 int(0)
 
@@ -159,31 +159,31 @@ int(0)
 
 Arg value  
 
-Warning: fseek() expects parameter 2 to be long, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
 bool(false)
 int(0)
 
 Arg value  
 
-Warning: fseek() expects parameter 2 to be long, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
 bool(false)
 int(0)
 
 Arg value string 
 
-Warning: fseek() expects parameter 2 to be long, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
 bool(false)
 int(0)
 
 Arg value string 
 
-Warning: fseek() expects parameter 2 to be long, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
 bool(false)
 int(0)
 
 Arg value testClass 
 
-Warning: fseek() expects parameter 2 to be long, object given in %s on line %d
+Warning: fseek() expects parameter 2 to be integer, object given in %s on line %d
 bool(false)
 int(0)
 
diff --git a/ext/standard/tests/file/fseek_variation2.phpt b/ext/standard/tests/file/fseek_variation2.phpt
index 5377843716..cb88c03525 100644
--- a/ext/standard/tests/file/fseek_variation2.phpt
+++ b/ext/standard/tests/file/fseek_variation2.phpt
@@ -128,25 +128,25 @@ int(3)
 
 Arg value  
 
-Warning: fseek() expects parameter 3 to be long, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
 bool(false)
 int(3)
 
 Arg value  
 
-Warning: fseek() expects parameter 3 to be long, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
 bool(false)
 int(3)
 
 Arg value string 
 
-Warning: fseek() expects parameter 3 to be long, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
 bool(false)
 int(3)
 
 Arg value string 
 
-Warning: fseek() expects parameter 3 to be long, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
 bool(false)
 int(3)
 
diff --git a/ext/standard/tests/file/fstat_variation4.phpt b/ext/standard/tests/file/fstat_variation4.phpt
index dc2575f7d0..66da94f552 100644
--- a/ext/standard/tests/file/fstat_variation4.phpt
+++ b/ext/standard/tests/file/fstat_variation4.phpt
@@ -18,18 +18,18 @@ foreach ( $variation_array as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: fstat() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
-Warning: fstat() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
-Warning: fstat() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
-Warning: fstat() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 
-Warning: fstat() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 ===DONE===
\ No newline at end of file
diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt
index 4823a7739b..40dcf4cf51 100644
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -98,7 +98,7 @@ Warning: ftruncate() expects parameter 1 to be resource, integer given in %s on
 bool(false)
 -- Iteration 3 --
 
-Warning: ftruncate() expects parameter 1 to be resource, double given in %s on line %d
+Warning: ftruncate() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt
index 2b28429362..119302a13a 100644
--- a/ext/standard/tests/file/fwrite_error.phpt
+++ b/ext/standard/tests/file/fwrite_error.phpt
@@ -96,7 +96,7 @@ Warning: fwrite() expects parameter 1 to be resource, integer given in %s on lin
 bool(false)
 -- Iteration 3 --
 
-Warning: fwrite() expects parameter 1 to be resource, double given in %s on line %d
+Warning: fwrite() expects parameter 1 to be resource, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
diff --git a/ext/standard/tests/file/glob_error.phpt b/ext/standard/tests/file/glob_error.phpt
index 546b40d6a2..b65c5fe528 100644
--- a/ext/standard/tests/file/glob_error.phpt
+++ b/ext/standard/tests/file/glob_error.phpt
@@ -45,9 +45,9 @@ NULL
 
 -- Testing glob() with invalid arguments --
 
-Warning: glob() expects parameter 2 to be long, string given in %s on line %d
+Warning: glob() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
-Warning: glob() expects parameter 2 to be long, string given in %s on line %d
+Warning: glob() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt
index 48e6cb8722..67316f2c14 100644
--- a/ext/standard/tests/file/mkdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_variation2.phpt
@@ -130,16 +130,16 @@ Directory created
 Directory created
 
 --empty array--
-Error: 2 - mkdir() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
 
 --int indexed array--
-Error: 2 - mkdir() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
 
 --associative array--
-Error: 2 - mkdir() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
 
 --nested arrays--
-Error: 2 - mkdir() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
 
 --uppercase NULL--
 Directory created
@@ -160,28 +160,28 @@ Directory created
 Directory created
 
 --empty string DQ--
-Error: 2 - mkdir() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
 
 --empty string SQ--
-Error: 2 - mkdir() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
 
 --string DQ--
-Error: 2 - mkdir() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
 
 --string SQ--
-Error: 2 - mkdir() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
 
 --mixed case string--
-Error: 2 - mkdir() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
 
 --heredoc--
-Error: 2 - mkdir() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
 
 --instance of classWithToString--
-Error: 2 - mkdir() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d)
 
 --instance of classWithoutToString--
-Error: 2 - mkdir() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d)
 
 --undefined var--
 Directory created
diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt
index b97d4ebc74..deb6ff4a45 100644
--- a/ext/standard/tests/file/mkdir_variation4.phpt
+++ b/ext/standard/tests/file/mkdir_variation4.phpt
@@ -140,19 +140,19 @@ Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
 Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
 
 --float 10.5--
-Error: 2 - mkdir() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d)
 
 --float -10.5--
-Error: 2 - mkdir() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d)
 
 --float 12.3456789000e10--
-Error: 2 - mkdir() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d)
 
 --float -12.3456789000e10--
-Error: 2 - mkdir() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d)
 
 --float .5--
-Error: 2 - mkdir() expects parameter 4 to be resource, double given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d)
 
 --empty array--
 Error: 2 - mkdir() expects parameter 4 to be resource, array given, %s(%d)
diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt
index 897b2d9836..ea7c2d77a8 100644
--- a/ext/standard/tests/file/pathinfo_variation2.phpt
+++ b/ext/standard/tests/file/pathinfo_variation2.phpt
@@ -126,19 +126,19 @@ string(%d) %s
 string(%d) %s
 
 --empty array--
-Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ string(17) "/usr/include/arpa"
 string(0) ""
 
 --empty string DQ--
-Error: 2 - pathinfo() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - pathinfo() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - pathinfo() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - pathinfo() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - pathinfo() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - pathinfo() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - pathinfo() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - pathinfo() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt
index 07b5f3fbd4..a6ffd0630f 100644
--- a/ext/standard/tests/file/pclose_variation1.phpt
+++ b/ext/standard/tests/file/pclose_variation1.phpt
@@ -130,23 +130,23 @@ Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 2 - pclose() expects parameter 1 to be resource, double given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, float given, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 2 - pclose() expects parameter 1 to be resource, double given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, float given, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 2 - pclose() expects parameter 1 to be resource, double given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, float given, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 2 - pclose() expects parameter 1 to be resource, double given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, float given, %s(%d)
 bool(false)
 
 --float .5--
-Error: 2 - pclose() expects parameter 1 to be resource, double given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, float given, %s(%d)
 bool(false)
 
 --empty array--
diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt
index 94b3326b56..9ee5a2f3c7 100644
--- a/ext/standard/tests/file/readfile_variation4.phpt
+++ b/ext/standard/tests/file/readfile_variation4.phpt
@@ -150,23 +150,23 @@ Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
 file not read
 
 --float 10.5--
-Error: 2 - readfile() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, float given, %s(%d)
 file not read
 
 --float -10.5--
-Error: 2 - readfile() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, float given, %s(%d)
 file not read
 
 --float 12.3456789000e10--
-Error: 2 - readfile() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, float given, %s(%d)
 file not read
 
 --float -12.3456789000e10--
-Error: 2 - readfile() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, float given, %s(%d)
 file not read
 
 --float .5--
-Error: 2 - readfile() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, float given, %s(%d)
 file not read
 
 --empty array--
diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt
index fbb109cd28..42909ee484 100644
--- a/ext/standard/tests/file/rename_variation10.phpt
+++ b/ext/standard/tests/file/rename_variation10.phpt
@@ -148,23 +148,23 @@ Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 2 - rename() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, float given, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 2 - rename() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, float given, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 2 - rename() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, float given, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 2 - rename() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, float given, %s(%d)
 bool(false)
 
 --float .5--
-Error: 2 - rename() expects parameter 3 to be resource, double given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, float given, %s(%d)
 bool(false)
 
 --empty array--
diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt
index 2cee440837..7b4311c245 100644
--- a/ext/standard/tests/file/rmdir_variation2.phpt
+++ b/ext/standard/tests/file/rmdir_variation2.phpt
@@ -139,23 +139,23 @@ Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 2 - rmdir() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 2 - rmdir() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 2 - rmdir() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 2 - rmdir() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --float .5--
-Error: 2 - rmdir() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --empty array--
diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt
index 0aa4a3ae4d..d6760f92b7 100644
--- a/ext/standard/tests/file/touch_variation3-win32.phpt
+++ b/ext/standard/tests/file/touch_variation3-win32.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt
index 87cb199f8f..1ba1fc44cb 100644
--- a/ext/standard/tests/file/touch_variation3.phpt
+++ b/ext/standard/tests/file/touch_variation3.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 2 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 2 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be long, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt
index 77a89185ca..0b12173cc1 100644
--- a/ext/standard/tests/file/touch_variation4-win32.phpt
+++ b/ext/standard/tests/file/touch_variation4-win32.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 3 to be long, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 3 to be long, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt
index 384b68b384..0bbb4a7a3b 100644
--- a/ext/standard/tests/file/touch_variation4.phpt
+++ b/ext/standard/tests/file/touch_variation4.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 3 to be long, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 3 to be long, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 3 to be long, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 3 to be long, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
 NULL
 
 --undefined var--
diff --git a/ext/standard/tests/file/umask_variation3.phpt b/ext/standard/tests/file/umask_variation3.phpt
index 7885d0e5b8..4ce074f81d 100644
--- a/ext/standard/tests/file/umask_variation3.phpt
+++ b/ext/standard/tests/file/umask_variation3.phpt
@@ -144,22 +144,22 @@ int(0)
 int(0)
 
 --empty array--
-Error: 2 - umask() expects parameter 1 to be long, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
 bool(false)
 int(63)
 
 --int indexed array--
-Error: 2 - umask() expects parameter 1 to be long, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
 bool(false)
 int(63)
 
 --associative array--
-Error: 2 - umask() expects parameter 1 to be long, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
 bool(false)
 int(63)
 
 --nested arrays--
-Error: 2 - umask() expects parameter 1 to be long, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
 bool(false)
 int(63)
 
@@ -188,42 +188,42 @@ int(0)
 int(0)
 
 --empty string DQ--
-Error: 2 - umask() expects parameter 1 to be long, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
 bool(false)
 int(63)
 
 --empty string SQ--
-Error: 2 - umask() expects parameter 1 to be long, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
 bool(false)
 int(63)
 
 --string DQ--
-Error: 2 - umask() expects parameter 1 to be long, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
 bool(false)
 int(63)
 
 --string SQ--
-Error: 2 - umask() expects parameter 1 to be long, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
 bool(false)
 int(63)
 
 --mixed case string--
-Error: 2 - umask() expects parameter 1 to be long, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
 bool(false)
 int(63)
 
 --heredoc--
-Error: 2 - umask() expects parameter 1 to be long, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
 bool(false)
 int(63)
 
 --instance of classWithToString--
-Error: 2 - umask() expects parameter 1 to be long, object given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d)
 bool(false)
 int(63)
 
 --instance of classWithoutToString--
-Error: 2 - umask() expects parameter 1 to be long, object given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d)
 bool(false)
 int(63)
 
diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt
index 4c63e11c85..64a2607d5f 100644
--- a/ext/standard/tests/file/unlink_variation7.phpt
+++ b/ext/standard/tests/file/unlink_variation7.phpt
@@ -141,23 +141,23 @@ Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
 bool(false)
 
 --float 10.5--
-Error: 2 - unlink() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --float -10.5--
-Error: 2 - unlink() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --float 12.3456789000e10--
-Error: 2 - unlink() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --float -12.3456789000e10--
-Error: 2 - unlink() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --float .5--
-Error: 2 - unlink() expects parameter 2 to be resource, double given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, float given, %s(%d)
 bool(false)
 
 --empty array--