54 files changed, 108 insertions, 108 deletions
diff --git a/ext/gd/tests/imagechar_error3.phpt b/ext/gd/tests/imagechar_error3.phpt
index aec65e9cfa..31b1c2386f 100644
--- a/ext/gd/tests/imagechar_error3.phpt
+++ b/ext/gd/tests/imagechar_error3.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 'string', 5, 5, 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagechar() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagechar() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagechar_error4.phpt b/ext/gd/tests/imagechar_error4.phpt
index a9485f7bb1..263da50e60 100644
--- a/ext/gd/tests/imagechar_error4.phpt
+++ b/ext/gd/tests/imagechar_error4.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 'string', 5, 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagechar() expects parameter 3 to be long, %s given in %s on line %d
+Warning: imagechar() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagechar_error5.phpt b/ext/gd/tests/imagechar_error5.phpt
index 8670d19472..8d47dc377b 100644
--- a/ext/gd/tests/imagechar_error5.phpt
+++ b/ext/gd/tests/imagechar_error5.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 5, 'string', 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagechar() expects parameter 4 to be long, %s given in %s on line %d
+Warning: imagechar() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagechar_error7.phpt b/ext/gd/tests/imagechar_error7.phpt
index fae23a71e7..1d7819265c 100644
--- a/ext/gd/tests/imagechar_error7.phpt
+++ b/ext/gd/tests/imagechar_error7.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 5, 5, 'C', 'font');
 
 ?>
 --EXPECTF--
-Warning: imagechar() expects parameter 6 to be long, %s given in %s on line %d
+Warning: imagechar() expects parameter 6 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecharup_error3.phpt b/ext/gd/tests/imagecharup_error3.phpt
index 7e811bade8..a44b766484 100644
--- a/ext/gd/tests/imagecharup_error3.phpt
+++ b/ext/gd/tests/imagecharup_error3.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 'string', 5, 5, 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagecharup() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagecharup() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecharup_error4.phpt b/ext/gd/tests/imagecharup_error4.phpt
index f76fdaca8a..f1824f1344 100644
--- a/ext/gd/tests/imagecharup_error4.phpt
+++ b/ext/gd/tests/imagecharup_error4.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 'string', 5, 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagecharup() expects parameter 3 to be long, %s given in %s on line %d
+Warning: imagecharup() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecharup_error5.phpt b/ext/gd/tests/imagecharup_error5.phpt
index b56525933b..73c2d075fe 100644
--- a/ext/gd/tests/imagecharup_error5.phpt
+++ b/ext/gd/tests/imagecharup_error5.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 5, 'string', 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagecharup() expects parameter 4 to be long, %s given in %s on line %d
+Warning: imagecharup() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecharup_error7.phpt b/ext/gd/tests/imagecharup_error7.phpt
index b61189a542..fe1fe073da 100644
--- a/ext/gd/tests/imagecharup_error7.phpt
+++ b/ext/gd/tests/imagecharup_error7.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 5, 5, 'C', 'font');
 
 ?>
 --EXPECTF--
-Warning: imagecharup() expects parameter 6 to be long, %s given in %s on line %d
+Warning: imagecharup() expects parameter 6 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocate_variation1.phpt b/ext/gd/tests/imagecolorallocate_variation1.phpt
index 552a0fc084..60d690bfbe 100644
--- a/ext/gd/tests/imagecolorallocate_variation1.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation1.phpt
@@ -137,27 +137,27 @@ NULL
 
 -- float 10.5 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, double given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, float given in %s on line %d
 NULL
 
 -- float -10.5 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, double given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, float given in %s on line %d
 NULL
 
 -- float 10.1234567e10 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, double given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, float given in %s on line %d
 NULL
 
 -- float 10.7654321E-10 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, double given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, float given in %s on line %d
 NULL
 
 -- float .5 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, double given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, float given in %s on line %d
 NULL
 
 -- empty array --
diff --git a/ext/gd/tests/imagecolorallocate_variation2.phpt b/ext/gd/tests/imagecolorallocate_variation2.phpt
index 84ff9e26ff..7de60bc19f 100644
--- a/ext/gd/tests/imagecolorallocate_variation2.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation2.phpt
@@ -126,22 +126,22 @@ int(2570)
 
 --empty array--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
 --int indexed array--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
 --associative array--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
 --nested arrays--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
 NULL
 
 --uppercase NULL--
@@ -164,42 +164,42 @@ int(2570)
 
 --empty string DQ--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 --empty string SQ--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 --string DQ--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 --string SQ--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 --mixed case string--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 --heredoc--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
 NULL
 
 --instance of classWithToString--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, object given in %s on line %d
 NULL
 
 --instance of classWithoutToString--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, object given in %s on line %d
 NULL
 
 --undefined var--
@@ -210,6 +210,6 @@ int(2570)
 
 --file resource--
 
-Warning: imagecolorallocate() expects parameter 2 to be long, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be integer, resource given in %s on line %d
 NULL
 ===DONE===
diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt
index c48dc29cf5..3fe1f50f82 100644
--- a/ext/gd/tests/imagecolorallocate_variation3.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation3.phpt
@@ -125,22 +125,22 @@ int(655370)
 
 --empty array--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
 NULL
 
 --int indexed array--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
 NULL
 
 --associative array--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
 NULL
 
 --nested arrays--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
 NULL
 
 --uppercase NULL--
@@ -163,42 +163,42 @@ int(655370)
 
 --empty string DQ--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
 NULL
 
 --empty string SQ--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
 NULL
 
 --string DQ--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
 NULL
 
 --string SQ--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
 NULL
 
 --mixed case string--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
 NULL
 
 --heredoc--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
 NULL
 
 --instance of classWithToString--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, object given in %s on line %d
 NULL
 
 --instance of classWithoutToString--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, object given in %s on line %d
 NULL
 
 --undefined var--
@@ -209,6 +209,6 @@ int(655370)
 
 --file resource--
 
-Warning: imagecolorallocate() expects parameter 3 to be long, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be integer, resource given in %s on line %d
 NULL
 ===DONE===
 \ No newline at end of file
diff --git a/ext/gd/tests/imagecolorallocate_variation4.phpt b/ext/gd/tests/imagecolorallocate_variation4.phpt
index 8b82d01a87..e4ef7c62a2 100644
--- a/ext/gd/tests/imagecolorallocate_variation4.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation4.phpt
@@ -125,22 +125,22 @@ int(657920)
 
 --empty array--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
 NULL
 
 --int indexed array--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
 NULL
 
 --associative array--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
 NULL
 
 --nested arrays--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
 NULL
 
 --uppercase NULL--
@@ -163,42 +163,42 @@ int(657920)
 
 --empty string DQ--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
 NULL
 
 --empty string SQ--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
 NULL
 
 --string DQ--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
 NULL
 
 --string SQ--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
 NULL
 
 --mixed case string--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
 NULL
 
 --heredoc--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
 NULL
 
 --instance of classWithToString--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, object given in %s on line %d
 NULL
 
 --instance of classWithoutToString--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, object given in %s on line %d
 NULL
 
 --undefined var--
@@ -209,6 +209,6 @@ int(657920)
 
 --file resource--
 
-Warning: imagecolorallocate() expects parameter 4 to be long, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be integer, resource given in %s on line %d
 NULL
 ===DONE===
diff --git a/ext/gd/tests/imagecolorallocatealpha_error2.phpt b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
index ba9e5de699..d0df2a7d6b 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error2.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, array(), 255, 255, 50);
 imagecolorallocatealpha($img, tmpfile(), 255, 255, 50);
 ?>
 --EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 2 to be integer, %s given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 2 to be long, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 2 to be integer, array given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 2 to be long, resource given in %s on line %d
-\ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 2 to be integer, resource given in %s on line %d
+\ No newline at end of file
diff --git a/ext/gd/tests/imagecolorallocatealpha_error3.phpt b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
index ee8f646e78..ab92960c20 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, array(), 255, 50);
 imagecolorallocatealpha($img, 255, tmpfile(), 255, 50);
 ?>
 --EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 3 to be long, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 3 to be integer, %s given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 3 to be long, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 3 to be integer, array given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 3 to be long, resource given in %s on line %d
-\ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 3 to be integer, resource given in %s on line %d
+\ No newline at end of file
diff --git a/ext/gd/tests/imagecolorallocatealpha_error4.phpt b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
index 2b5b471890..708e95e680 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error4.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, 255, array(), 50);
 imagecolorallocatealpha($img, 255, 255, tmpfile(), 50);
 ?>
 --EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 4 to be long, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 4 to be integer, %s given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 4 to be long, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 4 to be integer, array given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 4 to be long, resource given in %s on line %d
-\ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 4 to be integer, resource given in %s on line %d
+\ No newline at end of file
diff --git a/ext/gd/tests/imagecolorallocatealpha_error5.phpt b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
index 2d77833e9c..fd43410365 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error5.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, 255, 255, array());
 imagecolorallocatealpha($img, 255, 255, 255, tmpfile());
 ?>
 --EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 5 to be long, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 5 to be integer, %s given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 5 to be long, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 5 to be integer, array given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 5 to be long, resource given in %s on line %d
-\ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 5 to be integer, resource given in %s on line %d
+\ No newline at end of file
diff --git a/ext/gd/tests/imagecolorclosesthwb.phpt b/ext/gd/tests/imagecolorclosesthwb.phpt
index 4266514a85..79df5a11eb 100644
--- a/ext/gd/tests/imagecolorclosesthwb.phpt
+++ b/ext/gd/tests/imagecolorclosesthwb.phpt
@@ -26,5 +26,5 @@ NULL
 Warning: imagecolorclosesthwb() expects parameter 1 to be resource, null given in %s on line %d
 NULL
 
-Warning: imagecolorclosesthwb() expects parameter 2 to be long, string given in %s on line %d
+Warning: imagecolorclosesthwb() expects parameter 2 to be integer, string given in %s on line %d
 NULL
diff --git a/ext/gd/tests/imagecreatetruecolor_error1.phpt b/ext/gd/tests/imagecreatetruecolor_error1.phpt
index e161688ce0..7ec75aa66f 100644
--- a/ext/gd/tests/imagecreatetruecolor_error1.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error1.phpt
@@ -13,6 +13,6 @@ $image = imagecreatetruecolor('s', 30);
 $image = imagecreatetruecolor(30, 's');
 ?>
 --EXPECTF--
-Warning: imagecreatetruecolor() expects parameter 1 to be long, %s given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 1 to be integer, %s given in %s on line %d
 
-Warning: imagecreatetruecolor() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
index c5a5e69283..62ff43a62f 100644
--- a/ext/gd/tests/imagecreatetruecolor_error2.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -19,6 +19,6 @@ Warning: imagecreatetruecolor(): Invalid image dimensions in %s on line %d
 
 Warning: imagecreatetruecolor(): Invalid image dimensions in %s on line %d
 
-Warning: imagecreatetruecolor() expects parameter 1 to be long, double given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 1 to be integer, float given in %s on line %d
 
-Warning: imagecreatetruecolor() expects parameter 2 to be long, double given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 2 to be integer, float given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error2.phpt b/ext/gd/tests/imageellipse_error2.phpt
index 5b65bf8a5c..d9062f6531 100644
--- a/ext/gd/tests/imageellipse_error2.phpt
+++ b/ext/gd/tests/imageellipse_error2.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 'wrong param', 150, 300, 200, 16777215);
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imageellipse() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error3.phpt b/ext/gd/tests/imageellipse_error3.phpt
index cbac2f0e79..fca825ff2f 100644
--- a/ext/gd/tests/imageellipse_error3.phpt
+++ b/ext/gd/tests/imageellipse_error3.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 'wrong param', 300, 200, 16777215);
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 3 to be long, %s given in %s on line %d
+Warning: imageellipse() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error4.phpt b/ext/gd/tests/imageellipse_error4.phpt
index dec2e0fbdc..c8d6eb0fa0 100644
--- a/ext/gd/tests/imageellipse_error4.phpt
+++ b/ext/gd/tests/imageellipse_error4.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 'wrong param', 200, 16777215);
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 4 to be long, %s given in %s on line %d
+Warning: imageellipse() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error5.phpt b/ext/gd/tests/imageellipse_error5.phpt
index 4272470c6d..e4d2473225 100644
--- a/ext/gd/tests/imageellipse_error5.phpt
+++ b/ext/gd/tests/imageellipse_error5.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 300, 'wrong param', 16777215);
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 5 to be long, %s given in %s on line %d
+Warning: imageellipse() expects parameter 5 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error6.phpt b/ext/gd/tests/imageellipse_error6.phpt
index 8628525b6f..d3eebd140e 100644
--- a/ext/gd/tests/imageellipse_error6.phpt
+++ b/ext/gd/tests/imageellipse_error6.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 300, 200, 'wrong param');
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 6 to be long, %s given in %s on line %d
+Warning: imageellipse() expects parameter 6 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error2.phpt b/ext/gd/tests/imagefilltoborder_error2.phpt
index dcbf904708..8ad1f4004e 100644
--- a/ext/gd/tests/imagefilltoborder_error2.phpt
+++ b/ext/gd/tests/imagefilltoborder_error2.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 'wrong param', 50, imagecolorallocate( $image, 0, 0,
 
 ?> 
 --EXPECTF--
-Warning: imagefilltoborder() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error3.phpt b/ext/gd/tests/imagefilltoborder_error3.phpt
index 73f6cf7b89..b0e089cfa0 100644
--- a/ext/gd/tests/imagefilltoborder_error3.phpt
+++ b/ext/gd/tests/imagefilltoborder_error3.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 'wrong param', imagecolorallocate( $image, 0, 0,
 
 ?> 
 --EXPECTF--
-Warning: imagefilltoborder() expects parameter 3 to be long, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error4.phpt b/ext/gd/tests/imagefilltoborder_error4.phpt
index a5073d80bd..94a6123a96 100644
--- a/ext/gd/tests/imagefilltoborder_error4.phpt
+++ b/ext/gd/tests/imagefilltoborder_error4.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 50, 'wrong param', imagecolorallocate( $image, 25
 
 ?> 
 --EXPECTF--
-Warning: imagefilltoborder() expects parameter 4 to be long, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error5.phpt b/ext/gd/tests/imagefilltoborder_error5.phpt
index eff344a787..6f4255ae3b 100644
--- a/ext/gd/tests/imagefilltoborder_error5.phpt
+++ b/ext/gd/tests/imagefilltoborder_error5.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), 'wrong
 
 ?> 
 --EXPECTF--
-Warning: imagefilltoborder() expects parameter 5 to be long, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 5 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilter_error14.phpt b/ext/gd/tests/imagefilter_error14.phpt
index 64103954db..9db5c60506 100644
--- a/ext/gd/tests/imagefilter_error14.phpt
+++ b/ext/gd/tests/imagefilter_error14.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_COLORIZE, 'wrong parameter', 255, 255));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be long, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefilter_error16.phpt b/ext/gd/tests/imagefilter_error16.phpt
index 2a84c2f789..4ce425a479 100644
--- a/ext/gd/tests/imagefilter_error16.phpt
+++ b/ext/gd/tests/imagefilter_error16.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_CONTRAST, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be long, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefilter_error19.phpt b/ext/gd/tests/imagefilter_error19.phpt
index e36b817aa2..c79be0a17a 100644
--- a/ext/gd/tests/imagefilter_error19.phpt
+++ b/ext/gd/tests/imagefilter_error19.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_BRIGHTNESS, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be long, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefilter_error2.phpt b/ext/gd/tests/imagefilter_error2.phpt
index 62ac6620c6..2523168af5 100644
--- a/ext/gd/tests/imagefilter_error2.phpt
+++ b/ext/gd/tests/imagefilter_error2.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
 NULL
diff --git a/ext/gd/tests/imagefilter_error3.phpt b/ext/gd/tests/imagefilter_error3.phpt
index 67f6c199f3..4440f7d000 100644
--- a/ext/gd/tests/imagefilter_error3.phpt
+++ b/ext/gd/tests/imagefilter_error3.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_PIXELATE, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be long, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be integer, %unicode_string_optional% given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefilter_error5.phpt b/ext/gd/tests/imagefilter_error5.phpt
index a7d9443427..443f12b32b 100644
--- a/ext/gd/tests/imagefilter_error5.phpt
+++ b/ext/gd/tests/imagefilter_error5.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_SMOOTH, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be double, %unicode_string_optional% given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be float, %unicode_string_optional% given in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/imagefontheight_error1.phpt b/ext/gd/tests/imagefontheight_error1.phpt
index 88d1771648..34aa4a8903 100644
--- a/ext/gd/tests/imagefontheight_error1.phpt
+++ b/ext/gd/tests/imagefontheight_error1.phpt
@@ -12,4 +12,4 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 imagefontheight('string');
 ?>
 --EXPECTF--
-Warning: imagefontheight() expects parameter 1 to be long, %s given in %s on line %d
+Warning: imagefontheight() expects parameter 1 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefontwidth_error1.phpt b/ext/gd/tests/imagefontwidth_error1.phpt
index dd80034fcc..c1a1463b9b 100644
--- a/ext/gd/tests/imagefontwidth_error1.phpt
+++ b/ext/gd/tests/imagefontwidth_error1.phpt
@@ -12,4 +12,4 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 imagefontwidth('string');
 ?>
 --EXPECTF--
-Warning: imagefontwidth() expects parameter 1 to be long, %s given in %s on line %d
+Warning: imagefontwidth() expects parameter 1 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagegammacorrect_error3.phpt b/ext/gd/tests/imagegammacorrect_error3.phpt
index fd680aa130..6dcecbe04b 100644
--- a/ext/gd/tests/imagegammacorrect_error3.phpt
+++ b/ext/gd/tests/imagegammacorrect_error3.phpt
@@ -14,4 +14,4 @@ $gamma = imagegammacorrect($image, 'string', 5);
 
 ?>
 --EXPECTF--
-Warning: imagegammacorrect() expects parameter 2 to be double, %s given in %s on line %d
+Warning: imagegammacorrect() expects parameter 2 to be float, %s given in %s on line %d
diff --git a/ext/gd/tests/imagegammacorrect_error4.phpt b/ext/gd/tests/imagegammacorrect_error4.phpt
index 5476d4c85b..e7ff6b4528 100644
--- a/ext/gd/tests/imagegammacorrect_error4.phpt
+++ b/ext/gd/tests/imagegammacorrect_error4.phpt
@@ -14,4 +14,4 @@ $gamma = imagegammacorrect($image, 1, 'string');
 
 ?>
 --EXPECTF--
-Warning: imagegammacorrect() expects parameter 3 to be double, %s given in %s on line %d
+Warning: imagegammacorrect() expects parameter 3 to be float, %s given in %s on line %d
diff --git a/ext/gd/tests/imagelayereffect_error2.phpt b/ext/gd/tests/imagelayereffect_error2.phpt
index d8d331bfdc..bd1d5aaf1f 100644
--- a/ext/gd/tests/imagelayereffect_error2.phpt
+++ b/ext/gd/tests/imagelayereffect_error2.phpt
@@ -15,4 +15,4 @@ $image = imagecreatetruecolor(180, 30);
 $layer = imagelayereffect($image, 'IMG_EFFECT_REPLACE');
 ?>
 --EXPECTF--
-Warning: imagelayereffect() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagelayereffect() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error3.phpt b/ext/gd/tests/imagerectangle_error3.phpt
index d5dd4c1d80..eceab1e99b 100644
--- a/ext/gd/tests/imagerectangle_error3.phpt
+++ b/ext/gd/tests/imagerectangle_error3.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 'wrong param', 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error4.phpt b/ext/gd/tests/imagerectangle_error4.phpt
index 7ecc4167a8..5d8e1cecac 100644
--- a/ext/gd/tests/imagerectangle_error4.phpt
+++ b/ext/gd/tests/imagerectangle_error4.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 0, 'wrong param', 50, 50, imagecolorallocate($image, 255, 255, 255) );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 3 to be long, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error5.phpt b/ext/gd/tests/imagerectangle_error5.phpt
index b4288d270c..df9c457d6f 100644
--- a/ext/gd/tests/imagerectangle_error5.phpt
+++ b/ext/gd/tests/imagerectangle_error5.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 0, 0, 'wrong param', 50, imagecolorallocate($image, 255, 255, 255) );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 4 to be long, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error6.phpt b/ext/gd/tests/imagerectangle_error6.phpt
index aab378e557..a91c6bbc0c 100644
--- a/ext/gd/tests/imagerectangle_error6.phpt
+++ b/ext/gd/tests/imagerectangle_error6.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 0, 0, 50, 'wrong param', imagecolorallocate($image, 255, 255, 255) );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 5 to be long, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 5 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error7.phpt b/ext/gd/tests/imagerectangle_error7.phpt
index f6ed778db7..f819da6e6c 100644
--- a/ext/gd/tests/imagerectangle_error7.phpt
+++ b/ext/gd/tests/imagerectangle_error7.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 0, 0, 50, 50, 'wrong param' );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 6 to be long, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 6 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagesetthickness_error2.phpt b/ext/gd/tests/imagesetthickness_error2.phpt
index 4c8924e467..263e18bcc3 100644
--- a/ext/gd/tests/imagesetthickness_error2.phpt
+++ b/ext/gd/tests/imagesetthickness_error2.phpt
@@ -17,8 +17,8 @@ imagesetthickness($image, $image);
 
 ?>
 --EXPECTF--
-Warning: imagesetthickness() expects parameter 2 to be long, string given in %s on line %d
+Warning: imagesetthickness() expects parameter 2 to be integer, string given in %s on line %d
 
-Warning: imagesetthickness() expects parameter 2 to be long, array given in %s on line %d
+Warning: imagesetthickness() expects parameter 2 to be integer, array given in %s on line %d
 
-Warning: imagesetthickness() expects parameter 2 to be long, resource given in %s on line %d
-\ No newline at end of file
+Warning: imagesetthickness() expects parameter 2 to be integer, resource given in %s on line %d
+\ No newline at end of file
diff --git a/ext/gd/tests/imagestring_error3.phpt b/ext/gd/tests/imagestring_error3.phpt
index d9a9e47d24..464e46e8d2 100644
--- a/ext/gd/tests/imagestring_error3.phpt
+++ b/ext/gd/tests/imagestring_error3.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 'string', 5, 5, 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagestring() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestring_error4.phpt b/ext/gd/tests/imagestring_error4.phpt
index 40330b17be..f782b7bda4 100644
--- a/ext/gd/tests/imagestring_error4.phpt
+++ b/ext/gd/tests/imagestring_error4.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 'string', 5, 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 3 to be long, %s given in %s on line %d
+Warning: imagestring() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestring_error5.phpt b/ext/gd/tests/imagestring_error5.phpt
index 6f45c55a6f..d774314797 100644
--- a/ext/gd/tests/imagestring_error5.phpt
+++ b/ext/gd/tests/imagestring_error5.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 'string', 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 4 to be long, %s given in %s on line %d
+Warning: imagestring() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestring_error7.phpt b/ext/gd/tests/imagestring_error7.phpt
index 75ab2f6af5..2f44682a93 100644
--- a/ext/gd/tests/imagestring_error7.phpt
+++ b/ext/gd/tests/imagestring_error7.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 5, 'String', 'font');
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 6 to be long, %s given in %s on line %d
+Warning: imagestring() expects parameter 6 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestringup_error3.phpt b/ext/gd/tests/imagestringup_error3.phpt
index 27e9007d3f..e4cfe98c75 100644
--- a/ext/gd/tests/imagestringup_error3.phpt
+++ b/ext/gd/tests/imagestringup_error3.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 'string', 5, 5, 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestringup() expects parameter 2 to be long, %s given in %s on line %d
+Warning: imagestringup() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestringup_error4.phpt b/ext/gd/tests/imagestringup_error4.phpt
index af2b8c05f2..0b525cea26 100644
--- a/ext/gd/tests/imagestringup_error4.phpt
+++ b/ext/gd/tests/imagestringup_error4.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 1, 'string', 5, 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestringup() expects parameter 3 to be long, %s given in %s on line %d
+Warning: imagestringup() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestringup_error5.phpt b/ext/gd/tests/imagestringup_error5.phpt
index 6f45c55a6f..d774314797 100644
--- a/ext/gd/tests/imagestringup_error5.phpt
+++ b/ext/gd/tests/imagestringup_error5.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 'string', 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 4 to be long, %s given in %s on line %d
+Warning: imagestring() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagestringup_error7.phpt b/ext/gd/tests/imagestringup_error7.phpt
index 396f2ddd61..4609936567 100644
--- a/ext/gd/tests/imagestringup_error7.phpt
+++ b/ext/gd/tests/imagestringup_error7.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 1, 5, 5, 'String', 'font');
 
 ?>
 --EXPECTF--
-Warning: imagestringup() expects parameter 6 to be long, %s given in %s on line %d
+Warning: imagestringup() expects parameter 6 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt
index d65a995014..de3a62d0a5 100644
--- a/ext/gd/tests/imagetruecolortopalette_error3.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt
@@ -19,10 +19,10 @@ imagetruecolortopalette($image, true, null);
 
 ?>
 --EXPECTF--
-Warning: imagetruecolortopalette() expects parameter 3 to be long, string given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be integer, string given in %s on line %d
 
-Warning: imagetruecolortopalette() expects parameter 3 to be long, resource given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be integer, resource given in %s on line %d
 
-Warning: imagetruecolortopalette() expects parameter 3 to be long, array given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be integer, array given in %s on line %d
 
 Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d
 \ No newline at end of file