Use int instead of integer in type errors

PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".

13 files changed, 79 insertions, 79 deletions

diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt
index 96bc596747..14593ffe76 100644
--- a/ext/standard/tests/math/base_convert_variation2.phpt
+++ b/ext/standard/tests/math/base_convert_variation2.phpt
@@ -153,32 +153,32 @@ bool(false)
 
 -- Iteration 17 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: base_convert() expects parameter 2 to be integer, array given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
diff --git a/ext/standard/tests/math/base_convert_variation3.phpt b/ext/standard/tests/math/base_convert_variation3.phpt
index c5cf390f19..bd4f052ca6 100644
--- a/ext/standard/tests/math/base_convert_variation3.phpt
+++ b/ext/standard/tests/math/base_convert_variation3.phpt
@@ -153,32 +153,32 @@ bool(false)
 
 -- Iteration 17 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: base_convert() expects parameter 3 to be integer, array given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
diff --git a/ext/standard/tests/math/mt_rand_error.phpt b/ext/standard/tests/math/mt_rand_error.phpt
index 888e7d2bc5..87f5c3641d 100644
--- a/ext/standard/tests/math/mt_rand_error.phpt
+++ b/ext/standard/tests/math/mt_rand_error.phpt
@@ -14,6 +14,6 @@ Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line 2
 
 Warning: mt_rand() expects exactly 2 parameters, 3 given in %s on line 3
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line 4
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line 4
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line 5
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line 5
diff --git a/ext/standard/tests/math/mt_rand_variation1.phpt b/ext/standard/tests/math/mt_rand_variation1.phpt
index f2adb6d39d..38df739baf 100644
--- a/ext/standard/tests/math/mt_rand_variation1.phpt
+++ b/ext/standard/tests/math/mt_rand_variation1.phpt
@@ -138,37 +138,37 @@ int(%i)
 
 -- Iteration 17 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mt_rand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: mt_rand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -179,6 +179,6 @@ int(%i)
 
 -- Iteration 26 --
 
-Warning: mt_rand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===Done===
diff --git a/ext/standard/tests/math/mt_rand_variation2.phpt b/ext/standard/tests/math/mt_rand_variation2.phpt
index 3c4be806d6..f49d1293f7 100644
--- a/ext/standard/tests/math/mt_rand_variation2.phpt
+++ b/ext/standard/tests/math/mt_rand_variation2.phpt
@@ -113,7 +113,7 @@ int(%i)
 
 -- Iteration 8 --
 
-Warning: mt_rand() expects parameter 2 to be integer, float given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
 
 -- Iteration 17 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mt_rand() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: mt_rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
 
 -- Iteration 26 --
 
-Warning: mt_rand() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===Done===
diff --git a/ext/standard/tests/math/mt_srand_error.phpt b/ext/standard/tests/math/mt_srand_error.phpt
index aa2fc75b74..0858a99e83 100644
--- a/ext/standard/tests/math/mt_srand_error.phpt
+++ b/ext/standard/tests/math/mt_srand_error.phpt
@@ -10,7 +10,7 @@ var_dump(mt_srand("500ABC"));
 Warning: mt_srand() expects at most 2 parameters, 3 given in %s on line 2
 NULL
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line 3
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line 3
 NULL
 
 Notice: A non well formed numeric value encountered in %s on line 4
diff --git a/ext/standard/tests/math/mt_srand_variation1.phpt b/ext/standard/tests/math/mt_srand_variation1.phpt
index 7409767f91..891152b8a8 100644
--- a/ext/standard/tests/math/mt_srand_variation1.phpt
+++ b/ext/standard/tests/math/mt_srand_variation1.phpt
@@ -113,7 +113,7 @@ NULL
 
 -- Iteration 8 --
 
-Warning: mt_srand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ NULL
 
 -- Iteration 17 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mt_srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: mt_srand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ NULL
 
 -- Iteration 26 --
 
-Warning: mt_srand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===Done===
diff --git a/ext/standard/tests/math/rand_error.phpt b/ext/standard/tests/math/rand_error.phpt
index f4a868959a..876f79b029 100644
--- a/ext/standard/tests/math/rand_error.phpt
+++ b/ext/standard/tests/math/rand_error.phpt
@@ -13,6 +13,6 @@ Warning: rand() expects exactly 2 parameters, 1 given in %s on line 2
 
 Warning: rand() expects exactly 2 parameters, 3 given in %s on line 3
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line 4
+Warning: rand() expects parameter 1 to be int, string given in %s on line 4
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line 5
+Warning: rand() expects parameter 2 to be int, string given in %s on line 5
diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt
index f14ada87f5..d688524b6e 100644
--- a/ext/standard/tests/math/rand_variation1.phpt
+++ b/ext/standard/tests/math/rand_variation1.phpt
@@ -113,7 +113,7 @@ int(%i)
 
 -- Iteration 8 --
 
-Warning: rand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: rand() expects parameter 1 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
 
 -- Iteration 17 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: rand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: rand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: rand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: rand() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
 
 -- Iteration 26 --
 
-Warning: rand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: rand() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===Done===
diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt
index 824b47b0cb..ed9c9a61c3 100644
--- a/ext/standard/tests/math/rand_variation2.phpt
+++ b/ext/standard/tests/math/rand_variation2.phpt
@@ -113,7 +113,7 @@ int(%i)
 
 -- Iteration 8 --
 
-Warning: rand() expects parameter 2 to be integer, float given in %s on line %d
+Warning: rand() expects parameter 2 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
 
 -- Iteration 17 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: rand() expects parameter 2 to be integer, array given in %s on line %d
+Warning: rand() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: rand() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
 
 -- Iteration 26 --
 
-Warning: rand() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: rand() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===Done===
diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt
index f199ff7eb6..aec4c7f27b 100644
--- a/ext/standard/tests/math/round_variation2.phpt
+++ b/ext/standard/tests/math/round_variation2.phpt
@@ -141,37 +141,37 @@ float(123)
 
 -- Iteration 17 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: round() expects parameter 2 to be integer, array given in %s on line %d
+Warning: round() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: round() expects parameter 2 to be integer, object given in %s on line %d
+Warning: round() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -182,6 +182,6 @@ float(123)
 
 -- Iteration 26 --
 
-Warning: round() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: round() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===Done===
\ No newline at end of file
diff --git a/ext/standard/tests/math/srand_error.phpt b/ext/standard/tests/math/srand_error.phpt
index ca9e4b939c..92140af82a 100644
--- a/ext/standard/tests/math/srand_error.phpt
+++ b/ext/standard/tests/math/srand_error.phpt
@@ -24,7 +24,7 @@ var_dump(srand("500ABC"));
 Warning: srand() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Notice: A non well formed numeric value encountered in %s on line %d
diff --git a/ext/standard/tests/math/srand_variation1.phpt b/ext/standard/tests/math/srand_variation1.phpt
index 522a8f5536..3a681e647a 100644
--- a/ext/standard/tests/math/srand_variation1.phpt
+++ b/ext/standard/tests/math/srand_variation1.phpt
@@ -113,7 +113,7 @@ NULL
 
 -- Iteration 8 --
 
-Warning: srand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: srand() expects parameter 1 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ NULL
 
 -- Iteration 17 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: srand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: srand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: srand() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ NULL
 
 -- Iteration 26 --
 
-Warning: srand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: srand() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===Done===