summaryrefslogtreecommitdiff
path: root/ext/standard/tests/file
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/tests/file')
-rw-r--r--ext/standard/tests/file/006_variation2.phpt16
-rw-r--r--ext/standard/tests/file/007_error.phpt4
-rw-r--r--ext/standard/tests/file/chmod_variation4.phpt24
-rw-r--r--ext/standard/tests/file/fflush_error.phpt2
-rw-r--r--ext/standard/tests/file/fgetc_error.phpt2
-rw-r--r--ext/standard/tests/file/fgetcsv_error.phpt4
-rw-r--r--ext/standard/tests/file/fgets_error.phpt2
-rw-r--r--ext/standard/tests/file/fgetss_error.phpt2
-rw-r--r--ext/standard/tests/file/file_error.phpt2
-rw-r--r--ext/standard/tests/file/file_get_contents_variation4.phpt8
-rw-r--r--ext/standard/tests/file/file_get_contents_variation5_32bit.phpt28
-rw-r--r--ext/standard/tests/file/file_get_contents_variation5_64bit.phpt24
-rw-r--r--ext/standard/tests/file/file_get_contents_variation6.phpt24
-rw-r--r--ext/standard/tests/file/file_put_contents_variation3.phpt8
-rw-r--r--ext/standard/tests/file/file_variation3.phpt24
-rw-r--r--ext/standard/tests/file/file_variation4.phpt8
-rw-r--r--ext/standard/tests/file/flock_error.phpt10
-rw-r--r--ext/standard/tests/file/fopen_variation4.phpt8
-rw-r--r--ext/standard/tests/file/fpassthru_variation1.phpt8
-rw-r--r--ext/standard/tests/file/fputcsv_error.phpt2
-rw-r--r--ext/standard/tests/file/fread_error.phpt2
-rw-r--r--ext/standard/tests/file/fseek_ftell_rewind_error1.phpt2
-rw-r--r--ext/standard/tests/file/fseek_ftell_rewind_error2.phpt2
-rw-r--r--ext/standard/tests/file/fseek_ftell_rewind_error3.phpt2
-rw-r--r--ext/standard/tests/file/fseek_variation1.phpt20
-rw-r--r--ext/standard/tests/file/fseek_variation2.phpt8
-rw-r--r--ext/standard/tests/file/fstat_variation5.phpt8
-rw-r--r--ext/standard/tests/file/ftruncate_error.phpt2
-rw-r--r--ext/standard/tests/file/fwrite_error.phpt2
-rw-r--r--ext/standard/tests/file/glob_error.phpt4
-rw-r--r--ext/standard/tests/file/mkdir_variation2.phpt24
-rw-r--r--ext/standard/tests/file/mkdir_variation4.phpt8
-rw-r--r--ext/standard/tests/file/pathinfo_variation2.phpt24
-rw-r--r--ext/standard/tests/file/pclose_variation1.phpt8
-rw-r--r--ext/standard/tests/file/popen_pclose_error-win32-debug.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_error-win32.phpt2
-rw-r--r--ext/standard/tests/file/popen_pclose_error.phpt2
-rw-r--r--ext/standard/tests/file/readfile_variation4.phpt8
-rw-r--r--ext/standard/tests/file/rename_variation10.phpt8
-rw-r--r--ext/standard/tests/file/rmdir_variation2.phpt8
-rw-r--r--ext/standard/tests/file/touch_variation3-win32-mb.phpt24
-rw-r--r--ext/standard/tests/file/touch_variation3-win32.phpt24
-rw-r--r--ext/standard/tests/file/touch_variation3.phpt24
-rw-r--r--ext/standard/tests/file/touch_variation4-win32.phpt24
-rw-r--r--ext/standard/tests/file/touch_variation4.phpt24
-rw-r--r--ext/standard/tests/file/umask_variation3.phpt24
-rw-r--r--ext/standard/tests/file/unlink_variation7.phpt8
47 files changed, 254 insertions, 254 deletions
diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt
index 7c5d2c838b..f40932645b 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 integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
103567
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
43567
-- Iteration 13 --
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
103567
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
43567
-- Iteration 14 --
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
103567
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
43567
-- Iteration 15 --
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
NULL
103567
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, 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 80cc657d5d..b8b8fd5cbf 100644
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -118,10 +118,10 @@ bool(false)
Warning: fopen(10): failed to open stream: No such file or directory in %s on line %d
bool(false)
-Warning: fclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-Warning: feof() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: feof() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt
index 1fa5ad53ff..d5a691fa37 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 integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, 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 integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, 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 a334d8fea1..dadbdccf5a 100644
--- a/ext/standard/tests/file/fflush_error.phpt
+++ b/ext/standard/tests/file/fflush_error.phpt
@@ -67,7 +67,7 @@ Warning: fflush() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fflush() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fflush() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fgetc_error.phpt b/ext/standard/tests/file/fgetc_error.phpt
index 6b2f49e38c..19615269cc 100644
--- a/ext/standard/tests/file/fgetc_error.phpt
+++ b/ext/standard/tests/file/fgetc_error.phpt
@@ -52,7 +52,7 @@ Warning: fgetc() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fgetc() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetc() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fgetcsv_error.phpt b/ext/standard/tests/file/fgetcsv_error.phpt
index daaa733c9d..ad04c72c3e 100644
--- a/ext/standard/tests/file/fgetcsv_error.phpt
+++ b/ext/standard/tests/file/fgetcsv_error.phpt
@@ -60,10 +60,10 @@ Warning: fgetcsv() expects parameter 1 to be resource, string given in %s on lin
NULL
-- Iteration 2 --
-Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, int given in %s on line %d
NULL
-Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt
index 5a62252b78..c5f0aabc28 100644
--- a/ext/standard/tests/file/fgets_error.phpt
+++ b/ext/standard/tests/file/fgets_error.phpt
@@ -80,7 +80,7 @@ Warning: fgets() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fgets() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgets() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt
index 2640d27900..cf0afb2e09 100644
--- a/ext/standard/tests/file/fgetss_error.phpt
+++ b/ext/standard/tests/file/fgetss_error.phpt
@@ -79,7 +79,7 @@ Warning: fgetss() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fgetss() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetss() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt
index 31189672d3..1e7d51237a 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 integer, string given in %s on line %d
+Warning: file() expects parameter 2 to be int, 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 ecceb28093..6a6f5317dc 100644
--- a/ext/standard/tests/file/file_get_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation4.phpt
@@ -131,19 +131,19 @@ fclose($fileRes);
*** Testing file_get_contents() : usage variation ***
--int 0--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int 1--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int 12345--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int -12345--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
NULL
--float 10.5--
diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
index 26ba22a47e..e4d610c035 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
@@ -152,30 +152,30 @@ Error: 2 - file_get_contents(): Failed to seek to position -22 in the stream, %s
bool(false)
--float 12.3456789000e10--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, float given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, float given, %s(%d)
NULL
--float -12.3456789000e10--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, float given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, float given, %s(%d)
NULL
--float .5--
string(%d) "contents read"
--empty array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -197,35 +197,35 @@ string(12) "ontents read"
string(%d) "contents read"
--empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
index 66f51895a9..8e23c65791 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
@@ -162,19 +162,19 @@ bool(false)
string(%d) "contents read"
--empty array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -196,35 +196,35 @@ string(12) "ontents read"
string(%d) "contents read"
--empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, 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 25a122e1bc..f253957709 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 integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, 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 integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, 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 bf454ca08c..fc7a021c50 100644
--- a/ext/standard/tests/file/file_put_contents_variation3.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation3.phpt
@@ -130,19 +130,19 @@ fclose($fileRes);
*** Testing file_put_contents() : usage variation ***
--int 0--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
NULL
--int 1--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
NULL
--int 12345--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
NULL
--int -12345--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
NULL
--float 10.5--
diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt
index f61c3c257e..250621ef73 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 integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
NULL
--uppercase NULL--
@@ -239,35 +239,35 @@ array(3) {
}
--empty string DQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, 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 04ddc91600..cc9ac156d5 100644
--- a/ext/standard/tests/file/file_variation4.phpt
+++ b/ext/standard/tests/file/file_variation4.phpt
@@ -129,19 +129,19 @@ unlink($filename);
*** Testing file() : usage variation ***
--int 0--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int 1--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int 12345--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
NULL
--int -12345--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
NULL
--float 10.5--
diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt
index 81e42f3fe6..216e70c246 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 integer, array given in %s on line %d
+Warning: flock() expects parameter 2 to be int, array given in %s on line %d
NULL
--- Iteration 5 ---
-Warning: flock() expects parameter 2 to be integer, array given in %s on line %d
+Warning: flock() expects parameter 2 to be int, array given in %s on line %d
NULL
--- Iteration 6 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, string given in %s on line %d
NULL
--- Iteration 7 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, string given in %s on line %d
NULL
--- Iteration 8 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, 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 4bd5b2a446..34a2be3811 100644
--- a/ext/standard/tests/file/fopen_variation4.phpt
+++ b/ext/standard/tests/file/fopen_variation4.phpt
@@ -130,19 +130,19 @@ fclose($fileresource);
*** Testing fopen() : usage variation ***
--int 0--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt
index f952cdbc8c..c1a5a37b27 100644
--- a/ext/standard/tests/file/fpassthru_variation1.phpt
+++ b/ext/standard/tests/file/fpassthru_variation1.phpt
@@ -88,22 +88,22 @@ echo "Done";
Arg value 0
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
Arg value 1
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
Arg value 12345
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
Arg value -2345
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
Arg value 10.5
diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt
index 1e6ba94edd..c0445ec1e2 100644
--- a/ext/standard/tests/file/fputcsv_error.phpt
+++ b/ext/standard/tests/file/fputcsv_error.phpt
@@ -63,7 +63,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, integer given in %s on line %d
+Warning: fputcsv() expects parameter 1 to be resource, int given in %s on line %d
NULL
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 4917d2ef47..0a694f3859 100644
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -81,7 +81,7 @@ Warning: fread() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fread() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fread() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
index 9a3a2d5154..fcecb64dca 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
@@ -72,7 +72,7 @@ Warning: fseek() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fseek() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fseek() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
index e83c398f4b..6838e1b074 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
@@ -68,7 +68,7 @@ Warning: ftell() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: ftell() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ftell() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
index 6f2511d49c..ef9e349391 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
@@ -68,7 +68,7 @@ Warning: rewind() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: rewind() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewind() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt
index 914c6d0e42..dda12bc704 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 integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
bool(false)
int(0)
Arg value Array
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, 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 integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
bool(false)
int(0)
Arg value
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
bool(false)
int(0)
Arg value string
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
bool(false)
int(0)
Arg value string
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
bool(false)
int(0)
Arg value testClass
-Warning: fseek() expects parameter 2 to be integer, object given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, 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 cb88c03525..48fe1802a8 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 integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
bool(false)
int(3)
Arg value
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
bool(false)
int(3)
Arg value string
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
bool(false)
int(3)
Arg value string
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
bool(false)
int(3)
diff --git a/ext/standard/tests/file/fstat_variation5.phpt b/ext/standard/tests/file/fstat_variation5.phpt
index 6f98da81e7..6478b39377 100644
--- a/ext/standard/tests/file/fstat_variation5.phpt
+++ b/ext/standard/tests/file/fstat_variation5.phpt
@@ -17,15 +17,15 @@ foreach ( $variation_array as $var ) {
===DONE===
--EXPECTF--
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int 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 3ccd32a2d4..a44d269add 100644
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -94,7 +94,7 @@ Warning: ftruncate() expects parameter 1 to be resource, string given in %s on l
bool(false)
-- Iteration 2 --
-Warning: ftruncate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ftruncate() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt
index 119302a13a..9d330d4c12 100644
--- a/ext/standard/tests/file/fwrite_error.phpt
+++ b/ext/standard/tests/file/fwrite_error.phpt
@@ -92,7 +92,7 @@ Warning: fwrite() expects parameter 1 to be resource, string given in %s on line
bool(false)
-- Iteration 2 --
-Warning: fwrite() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fwrite() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
-- Iteration 3 --
diff --git a/ext/standard/tests/file/glob_error.phpt b/ext/standard/tests/file/glob_error.phpt
index b65c5fe528..527b70e069 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 integer, string given in %s on line %d
+Warning: glob() expects parameter 2 to be int, string given in %s on line %d
NULL
-Warning: glob() expects parameter 2 to be integer, string given in %s on line %d
+Warning: glob() expects parameter 2 to be int, 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 67316f2c14..0b461d2635 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 integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
--int indexed array--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
--associative array--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
--nested arrays--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, 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 integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--empty string SQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--string DQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--string SQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--mixed case string--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--heredoc--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
--instance of classWithToString--
-Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, object given, %s(%d)
--instance of classWithoutToString--
-Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, 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 a866f8d16f..0975c8d986 100644
--- a/ext/standard/tests/file/mkdir_variation4.phpt
+++ b/ext/standard/tests/file/mkdir_variation4.phpt
@@ -128,16 +128,16 @@ fclose($fileRes);
*** Testing mkdir() : usage variation ***
--int 0--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
--int 1--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
--int 12345--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
--int -12345--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
--float 10.5--
Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d)
diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt
index ea7c2d77a8..84c8243369 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 integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, 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 integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, 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 a6ffd0630f..b639747463 100644
--- a/ext/standard/tests/file/pclose_variation1.phpt
+++ b/ext/standard/tests/file/pclose_variation1.phpt
@@ -114,19 +114,19 @@ foreach($inputs as $key =>$value) {
*** Testing pclose() : usage variation ***
--int 0--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
index e41d6b113e..3c4439e5cb 100644
--- a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
+++ b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
@@ -56,7 +56,7 @@ bool(false)
Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
--- Done ---'abc.txt' is not recognized as an internal or external command,
diff --git a/ext/standard/tests/file/popen_pclose_error-win32.phpt b/ext/standard/tests/file/popen_pclose_error-win32.phpt
index 9f9593c64b..1d059828d0 100644
--- a/ext/standard/tests/file/popen_pclose_error-win32.phpt
+++ b/ext/standard/tests/file/popen_pclose_error-win32.phpt
@@ -51,7 +51,7 @@ bool(false)
Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
diff --git a/ext/standard/tests/file/popen_pclose_error.phpt b/ext/standard/tests/file/popen_pclose_error.phpt
index 72ce73411c..8b851f13bb 100644
--- a/ext/standard/tests/file/popen_pclose_error.phpt
+++ b/ext/standard/tests/file/popen_pclose_error.phpt
@@ -50,7 +50,7 @@ bool(false)
Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
bool(false)
--- Done ---
diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt
index 9ee5a2f3c7..1a7b5830c0 100644
--- a/ext/standard/tests/file/readfile_variation4.phpt
+++ b/ext/standard/tests/file/readfile_variation4.phpt
@@ -134,19 +134,19 @@ fclose($fileRes);
*** Testing readfile() : usage variation ***
--int 0--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
file not read
--int 1--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
file not read
--int 12345--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
file not read
--int -12345--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
file not read
--float 10.5--
diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt
index 5c81757ed8..17fa5192bc 100644
--- a/ext/standard/tests/file/rename_variation10.phpt
+++ b/ext/standard/tests/file/rename_variation10.phpt
@@ -132,19 +132,19 @@ fclose($fileRes);
*** Testing rename() : usage variation ***
--int 0--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt
index 6053018f42..7d1a5e2f24 100644
--- a/ext/standard/tests/file/rmdir_variation2.phpt
+++ b/ext/standard/tests/file/rmdir_variation2.phpt
@@ -123,19 +123,19 @@ fclose($fileres);
*** Testing rmdir() : usage variation ***
--int 0--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--float 10.5--
diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt
index 445ef3fb1c..b3f8817656 100644
--- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt
+++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt
@@ -126,19 +126,19 @@ bool(true)
bool(true)
--empty array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, 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 integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--undefined var--
diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt
index d6760f92b7..8c7db0905b 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 integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, 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 integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, 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 1ba1fc44cb..00203c8f36 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 integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, 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 integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, 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 0b12173cc1..2f1eda71c6 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 integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, 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 integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, 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 0bbb4a7a3b..6467f5dcdf 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 integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--int indexed array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--associative array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
NULL
--nested arrays--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, 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 integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--empty string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--mixed case string--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--heredoc--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
NULL
--instance of classWithToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
NULL
--instance of classWithoutToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, 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 4ce074f81d..843dbe0dc4 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 integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
bool(false)
int(63)
--int indexed array--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
bool(false)
int(63)
--associative array--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
bool(false)
int(63)
--nested arrays--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, 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 integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--empty string SQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--string DQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--string SQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--mixed case string--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--heredoc--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
bool(false)
int(63)
--instance of classWithToString--
-Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, object given, %s(%d)
bool(false)
int(63)
--instance of classWithoutToString--
-Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, 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 f165e4e9c2..d68db852fd 100644
--- a/ext/standard/tests/file/unlink_variation7.phpt
+++ b/ext/standard/tests/file/unlink_variation7.phpt
@@ -125,19 +125,19 @@ fclose($fileRes);
*** Testing unlink() : usage variation different types for context ***
--int 0--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int 1--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int 12345--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--int -12345--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
bool(false)
--float 10.5--