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".

11 files changed, 52 insertions, 52 deletions

diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt
index bf8dbbff9c..7885a01f54 100644
--- a/ext/standard/tests/dir/closedir_variation1.phpt
+++ b/ext/standard/tests/dir/closedir_variation1.phpt
@@ -92,22 +92,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --
diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
index a2d482f43e..7b6dbde9d8 100644
--- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
@@ -116,19 +116,19 @@ rmdir($directory);
 *** Testing dir() : unexpected values for $context argument ***
 
 -- Iteration 1 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --
diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt
index 24f429f187..609f0691cf 100644
--- a/ext/standard/tests/dir/dir_variation2.phpt
+++ b/ext/standard/tests/dir/dir_variation2.phpt
@@ -110,19 +110,19 @@ rmdir($directory);
 *** Testing dir() : unexpected values for $context argument ***
 
 -- Iteration 1 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --
diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
index 3d54638e0d..5e5201782a 100644
--- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
@@ -120,22 +120,22 @@ rmdir($path);
 
 -- Iteration 1 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --
diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt
index 7728aa3757..80b90d5ecb 100644
--- a/ext/standard/tests/dir/opendir_variation2.phpt
+++ b/ext/standard/tests/dir/opendir_variation2.phpt
@@ -114,22 +114,22 @@ rmdir($path);
 
 -- Iteration 1 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --
diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt
index 2815e8d26f..d2f138649e 100644
--- a/ext/standard/tests/dir/readdir_variation1.phpt
+++ b/ext/standard/tests/dir/readdir_variation1.phpt
@@ -90,22 +90,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --
diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt
index b4f52bbab1..e7e3d7d7b1 100644
--- a/ext/standard/tests/dir/rewinddir_variation1.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation1.phpt
@@ -91,22 +91,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --
diff --git a/ext/standard/tests/dir/scandir_variation2-mb.phpt b/ext/standard/tests/dir/scandir_variation2-mb.phpt
index 9e9df97802..7ee58ad450 100644
--- a/ext/standard/tests/dir/scandir_variation2-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation2-mb.phpt
@@ -229,37 +229,37 @@ array(2) {
 
 -- Iteration 16 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: scandir() expects parameter 2 to be integer, array given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: scandir() expects parameter 2 to be integer, object given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 23 --
@@ -280,6 +280,6 @@ array(2) {
 
 -- Iteration 25 --
 
-Warning: scandir() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===DONE===
diff --git a/ext/standard/tests/dir/scandir_variation2.phpt b/ext/standard/tests/dir/scandir_variation2.phpt
index bed9512e77..a3ee88a3be 100644
--- a/ext/standard/tests/dir/scandir_variation2.phpt
+++ b/ext/standard/tests/dir/scandir_variation2.phpt
@@ -229,37 +229,37 @@ array(2) {
 
 -- Iteration 16 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: scandir() expects parameter 2 to be integer, array given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: scandir() expects parameter 2 to be integer, object given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 23 --
@@ -280,6 +280,6 @@ array(2) {
 
 -- Iteration 25 --
 
-Warning: scandir() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===DONE===
diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
index c2b2ed5a17..4ad753c6b2 100644
--- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
@@ -114,22 +114,22 @@ rmdir($dir);
 
 -- Iteration 1 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --
diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt
index 5be4466bfc..74f84cd90c 100644
--- a/ext/standard/tests/dir/scandir_variation3.phpt
+++ b/ext/standard/tests/dir/scandir_variation3.phpt
@@ -108,22 +108,22 @@ rmdir($dir);
 
 -- Iteration 1 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --