Update ext/gd parameter names

Closes GH-6308.

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 462b1259689b54ef5df4e363e4467d9a28c5a4ca..4c2df61f9e3654aa60273c64699a3ec5c05a7090 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1140,7 +1140,7 @@ PHP_FUNCTION(imagecopyresampled)
 PHP_FUNCTION(imagegrabwindow)
 {
        HWND window;
-       zend_long client_area = 0;
+       zend_bool client_area = 0;
        RECT rc = {0};
        int Width, Height;
        HDC             hdc;
@@ -1150,7 +1150,7 @@ PHP_FUNCTION(imagegrabwindow)
        zend_long lwindow_handle;
        gdImagePtr im = NULL;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &lwindow_handle, &client_area) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|b", &lwindow_handle, &client_area) == FAILURE) {
                RETURN_THROWS();
        }
 
@@ -1269,9 +1269,9 @@ PHP_FUNCTION(imagerotate)
        gdImagePtr im_dst, im_src;
        double degrees;
        zend_long color;
-       zend_long ignoretransparent = 0;
+       zend_bool ignoretransparent = 0;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "Odl|l", &SIM, gd_image_ce,  &degrees, &color, &ignoretransparent) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "Odl|b", &SIM, gd_image_ce,  &degrees, &color, &ignoretransparent) == FAILURE) {
                RETURN_THROWS();
        }
 
@@ -2579,11 +2579,11 @@ PHP_FUNCTION(imagecolortransparent)
 PHP_FUNCTION(imageinterlace)
 {
        zval *IM;
-       zend_long INT = 0;
+       zend_bool INT = 0;
        zend_bool INT_IS_NULL = 1;
        gdImagePtr im;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l!", &IM, gd_image_ce, &INT, &INT_IS_NULL) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|b!", &IM, gd_image_ce, &INT, &INT_IS_NULL) == FAILURE) {
                RETURN_THROWS();
        }
 

diff --git a/ext/gd/gd.stub.php b/ext/gd/gd.stub.php
index 26c8db9b1250471264e63fae6ac0623cb55c5553..fe0d5658eef70998d4fbd41d902f754609cf7508 100644 (file)
--- a/ext/gd/gd.stub.php
+++ b/ext/gd/gd.stub.php
@@ -10,59 +10,60 @@ function gd_info(): array {}
 
 function imageloadfont(string $filename): int|false {}
 
-function imagesetstyle(GdImage $im, array $styles): bool {}
+function imagesetstyle(GdImage $image, array $style): bool {}
 
-function imagecreatetruecolor(int $x_size, int $y_size): GdImage|false {}
+function imagecreatetruecolor(int $width, int $height): GdImage|false {}
 
-function imageistruecolor(GdImage $im): bool {}
+function imageistruecolor(GdImage $image): bool {}
 
-function imagetruecolortopalette(GdImage $im, bool $ditherFlag, int $colorWanted): bool {}
+function imagetruecolortopalette(GdImage $image, bool $dither, int $num_colors): bool {}
 
-function imagepalettetotruecolor(GdImage $im): bool {}
+function imagepalettetotruecolor(GdImage $image): bool {}
 
-function imagecolormatch(GdImage $im1, GdImage $im2): bool {}
+function imagecolormatch(GdImage $image1, GdImage $image2): bool {}
 
-function imagesetthickness(GdImage $im, int $thickness): bool {}
+function imagesetthickness(GdImage $image, int $thickness): bool {}
 
-function imagefilledellipse(GdImage $im, int $cx, int $cy, int $w, int $h, int $color): bool {}
+function imagefilledellipse(GdImage $image, int $center_x, int $center_y, int $width, int $height, int $color): bool {}
 
-function imagefilledarc(GdImage $im, int $cx, int $cy, int $w, int $h, int $s, int $e, int $col, int $style): bool {}
+function imagefilledarc(GdImage $image, int $center_x, int $center_y, int $width, int $height, int $start_angle, int $end_angle, int $color, int $style): bool {}
 
-function imagealphablending(GdImage $im, bool $blend): bool {}
+function imagealphablending(GdImage $image, bool $enable): bool {}
 
-function imagesavealpha(GdImage $im, bool $save): bool {}
+function imagesavealpha(GdImage $image, bool $enable): bool {}
 
-function imagelayereffect(GdImage $im, int $effect): bool {}
+function imagelayereffect(GdImage $image, int $effect): bool {}
 
-function imagecolorallocatealpha(GdImage $im, int $red, int $green, int $blue, int $alpha): int|false {}
+function imagecolorallocatealpha(GdImage $image, int $red, int $green, int $blue, int $alpha): int|false {}
 
-function imagecolorresolvealpha(GdImage $im, int $red, int $green, int $blue, int $alpha): int|false {}
+function imagecolorresolvealpha(GdImage $image, int $red, int $green, int $blue, int $alpha): int|false {}
 
-function imagecolorclosestalpha(GdImage $im, int $red, int $green, int $blue, int $alpha): int|false {}
+function imagecolorclosestalpha(GdImage $image, int $red, int $green, int $blue, int $alpha): int|false {}
 
-function imagecolorexactalpha(GdImage $im, int $red, int $green, int $blue, int $alpha): int|false {}
+function imagecolorexactalpha(GdImage $image, int $red, int $green, int $blue, int $alpha): int|false {}
 
-function imagecopyresampled(GdImage $dst_im, GdImage $src_im, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_w, int $dst_h, int $src_w, int $src_h): bool {}
+function imagecopyresampled(GdImage $dst_image, GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_width, int $dst_height, int $src_width, int $src_height): bool {}
 
 #ifdef PHP_WIN32
 
-function imagegrabwindow(int $handle, int $client_area = 0): GdImage|false {}
+function imagegrabwindow(int $handle, bool $client_area = false): GdImage|false {}
 
 function imagegrabscreen(): GdImage|false {}
 
 #endif
 
-function imagerotate(GdImage $im, float $angle, int $bgdcolor, int $ignoretransparent = 0): GdImage|false {}
+// TODO: $ignore_transparent is ignored???
+function imagerotate(GdImage $image, float $angle, int $background_color, bool $ignore_transparent = false): GdImage|false {}
 
-function imagesettile(GdImage $im, GdImage $tile): bool {}
+function imagesettile(GdImage $image, GdImage $tile): bool {}
 
-function imagesetbrush(GdImage $im, GdImage $brush): bool {}
+function imagesetbrush(GdImage $image, GdImage $brush): bool {}
 
-function imagecreate(int $x_size, int $y_size): GdImage|false {}
+function imagecreate(int $width, int $height): GdImage|false {}
 
 function imagetypes(): int {}
 
-function imagecreatefromstring(string $image): GdImage|false {}
+function imagecreatefromstring(string $data): GdImage|false {}
 
 function imagecreatefromgif(string $filename): GdImage|false {}
 
@@ -90,7 +91,7 @@ function imagecreatefromgd(string $filename): GdImage|false {}
 
 function imagecreatefromgd2(string $filename): GdImage|false {}
 
-function imagecreatefromgd2part(string $filename, int $srcX, int $srcY, int $width, int $height): GdImage|false {}
+function imagecreatefromgd2part(string $filename, int $x, int $y, int $width, int $height): GdImage|false {}
 
 #ifdef HAVE_GD_BMP
 function imagecreatefrombmp(string $filename): GdImage|false {}
@@ -100,156 +101,157 @@ function imagecreatefrombmp(string $filename): GdImage|false {}
 function imagecreatefromtga(string $filename): GdImage|false {}
 #endif
 
-function imagexbm(GdImage $im, ?string $filename, ?int $foreground = null): bool {}
+function imagexbm(GdImage $image, ?string $filename, ?int $foreground_color = null): bool {}
 
-/** @param resource|string|null $to */
-function imagegif(GdImage $im, $to = null): bool {}
+/** @param resource|string|null $file */
+function imagegif(GdImage $image, $file = null): bool {}
 
 #ifdef HAVE_GD_PNG
-/** @param resource|string|null $to */
-function imagepng(GdImage $im, $to = null, int $quality = -1, int $filters = -1): bool {}
+/** @param resource|string|null $file */
+function imagepng(GdImage $image, $file = null, int $quality = -1, int $filters = -1): bool {}
 #endif
 
 #ifdef HAVE_GD_WEBP
-/** @param resource|string|null $to */
-function imagewebp(GdImage $im, $to = null, int $quality = -1): bool {}
+/** @param resource|string|null $file */
+function imagewebp(GdImage $image, $file = null, int $quality = -1): bool {}
 #endif
 
 #ifdef HAVE_GD_JPG
-/** @param resource|string|null $to */
-function imagejpeg(GdImage $im, $to = null, int $quality = -1): bool {}
+/** @param resource|string|null $file */
+function imagejpeg(GdImage $image, $file = null, int $quality = -1): bool {}
 #endif
 
-/** @param resource|string|null $to */
-function imagewbmp(GdImage $im, $to = null, ?int $foreground = null): bool {}
+/** @param resource|string|null $file */
+function imagewbmp(GdImage $image, $file = null, ?int $foreground_color = null): bool {}
 
-function imagegd(GdImage $im, string $to = UNKNOWN): bool {}
+function imagegd(GdImage $image, string $file = UNKNOWN): bool {}
 
-function imagegd2(GdImage $im, string $to = UNKNOWN, int $chunk_size = UNKNOWN, int $type = UNKNOWN): bool {}
+function imagegd2(GdImage $image, string $file = UNKNOWN, int $chunk_size = UNKNOWN, int $mode = UNKNOWN): bool {}
 
 #ifdef HAVE_GD_BMP
-/** @param resource|string|null $to */
-function imagebmp(GdImage $im, $to = null, bool $compressed = true): bool {}
+/** @param resource|string|null $file */
+function imagebmp(GdImage $image, $file = null, bool $compressed = true): bool {}
 #endif
 
-function imagedestroy(GdImage $im): bool {}
+function imagedestroy(GdImage $image): bool {}
 
-function imagecolorallocate(GdImage $im, int $red, int $green, int $blue): int|false {}
+function imagecolorallocate(GdImage $image, int $red, int $green, int $blue): int|false {}
 
 function imagepalettecopy(GdImage $dst, GdImage $src): void {}
 
-function imagecolorat(GdImage $im, int $x, int $y): int|false {}
+function imagecolorat(GdImage $image, int $x, int $y): int|false {}
 
-function imagecolorclosest(GdImage $im, int $red, int $green, int $blue): int|false {}
+function imagecolorclosest(GdImage $image, int $red, int $green, int $blue): int|false {}
 
-function imagecolorclosesthwb(GdImage $im, int $red, int $green, int $blue): int|false {}
+function imagecolorclosesthwb(GdImage $image, int $red, int $green, int $blue): int|false {}
 
-function imagecolordeallocate(GdImage $im, int $index): bool {}
+function imagecolordeallocate(GdImage $image, int $color): bool {}
 
-function imagecolorresolve(GdImage $im, int $red, int $green, int $blue): int|false {}
+function imagecolorresolve(GdImage $image, int $red, int $green, int $blue): int|false {}
 
-function imagecolorexact(GdImage $im, int $red, int $green, int $blue): int|false {}
+function imagecolorexact(GdImage $image, int $red, int $green, int $blue): int|false {}
 
-function imagecolorset(GdImage $im, int $color, int $red, int $green, int $blue, int $alpha = 0): ?bool {}
+function imagecolorset(GdImage $image, int $color, int $red, int $green, int $blue, int $alpha = 0): ?bool {}
 
-function imagecolorsforindex(GdImage $im, int $index): array|false {}
+function imagecolorsforindex(GdImage $image, int $color): array|false {}
 
-function imagegammacorrect(GdImage $im, float $inputgamma, float $outputgamma): bool {}
+function imagegammacorrect(GdImage $image, float $input_gamma, float $output_gamma): bool {}
 
-function imagesetpixel(GdImage $im, int $x, int $y, int $col): bool {}
+function imagesetpixel(GdImage $image, int $x, int $y, int $color): bool {}
 
-function imageline(GdImage $im, int $x1, int $y1, int $x2, int $y2, int $col): bool {}
+function imageline(GdImage $image, int $x1, int $y1, int $x2, int $y2, int $color): bool {}
 
-function imagedashedline(GdImage $im, int $x1, int $y1, int $x2, int $y2, int $col): bool {}
+function imagedashedline(GdImage $image, int $x1, int $y1, int $x2, int $y2, int $color): bool {}
 
-function imagerectangle(GdImage $im, int $x1, int $y1, int $x2, int $y2, int $col): bool {}
+function imagerectangle(GdImage $image, int $x1, int $y1, int $x2, int $y2, int $color): bool {}
 
-function imagefilledrectangle(GdImage $im, int $x1, int $y1, int $x2, int $y2, int $col): bool {}
+function imagefilledrectangle(GdImage $image, int $x1, int $y1, int $x2, int $y2, int $color): bool {}
 
-function imagearc(GdImage $im, int $cx, int $cy, int $w, int $h, int $s, int $e, int $col): bool {}
+function imagearc(GdImage $image, int $center_x, int $center_y, int $width, int $height, int $start_angle, int $end_angle, int $color): bool {}
 
-function imageellipse(GdImage $im, int $cx, int $cy, int $w, int $h, int $color): bool {}
+function imageellipse(GdImage $image, int $center_x, int $center_y, int $width, int $height, int $color): bool {}
 
-function imagefilltoborder(GdImage $im, int $x, int $y, int $border, int $col): bool {}
+function imagefilltoborder(GdImage $image, int $x, int $y, int $border_color, int $color): bool {}
 
-function imagefill(GdImage $im, int $x, int $y, int $col): bool {}
+function imagefill(GdImage $image, int $x, int $y, int $color): bool {}
 
-function imagecolorstotal(GdImage $im): int {}
+function imagecolorstotal(GdImage $image): int {}
 
-function imagecolortransparent(GdImage $im, ?int $col = null): ?int {}
+function imagecolortransparent(GdImage $image, ?int $color = null): ?int {}
 
-function imageinterlace(GdImage $im, ?int $interlace = null): ?int {}
+function imageinterlace(GdImage $image, ?bool $enable = null): ?int {}
 
-function imagepolygon(GdImage $im, array $points, int $num_points_or_col, ?int $col = null): bool {}
+function imagepolygon(GdImage $image, array $points, int $num_points_or_color, ?int $color = null): bool {}
 
-function imageopenpolygon(GdImage $im, array $points, int $num_points_or_col, ?int $col = null): bool {}
+function imageopenpolygon(GdImage $image, array $points, int $num_points_or_color, ?int $color = null): bool {}
 
-function imagefilledpolygon(GdImage $im, array $points, int $num_points_or_col, ?int $col = null): bool {}
+function imagefilledpolygon(GdImage $image, array $points, int $num_points_or_color, ?int $color = null): bool {}
 
 function imagefontwidth(int $font): int {}
 
 function imagefontheight(int $font): int {}
 
-function imagechar(GdImage $im, int $font, int $x, int $y, string $c, int $col): bool {}
+function imagechar(GdImage $image, int $font, int $x, int $y, string $char, int $color): bool {}
 
-function imagecharup(GdImage $im, int $font, int $x, int $y, string $c, int $col): bool {}
+function imagecharup(GdImage $image, int $font, int $x, int $y, string $char, int $color): bool {}
 
-function imagestring(GdImage $im, int $font, int $x, int $y, string $str, int $col): bool {}
+function imagestring(GdImage $image, int $font, int $x, int $y, string $string, int $color): bool {}
 
-function imagestringup(GdImage $im, int $font, int $x, int $y, string $str, int $col): bool {}
+function imagestringup(GdImage $image, int $font, int $x, int $y, string $string, int $color): bool {}
 
-function imagecopy(GdImage $dst_im, GdImage $src_im, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_w, int $src_h): bool {}
+function imagecopy(GdImage $dst_image, GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height): bool {}
 
-function imagecopymerge(GdImage $dst_im, GdImage $src_im, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_w, int $src_h, int $pct): bool {}
+function imagecopymerge(GdImage $dst_image, GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height, int $pct): bool {}
 
-function imagecopymergegray(GdImage $dst_im, GdImage $src_im, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_w, int $src_h, int $pct): bool {}
+function imagecopymergegray(GdImage $dst_image, GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height, int $pct): bool {}
 
-function imagecopyresized(GdImage $dst_im, GdImage $src_im, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_w, int $dst_h, int $src_w, int $src_h): bool {}
+function imagecopyresized(GdImage $dst_image, GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_width, int $dst_height, int $src_width, int $src_height): bool {}
 
-function imagesx(GdImage $im): int {}
+function imagesx(GdImage $image): int {}
 
-function imagesy(GdImage $im): int {}
+function imagesy(GdImage $image): int {}
 
-function imagesetclip(GdImage $im, int $x1, int $x2, int $y1, int $y2): bool {}
+function imagesetclip(GdImage $image, int $x1, int $x2, int $y1, int $y2): bool {}
 
-function imagegetclip(GdImage $im): array {}
+function imagegetclip(GdImage $image): array {}
 
 #ifdef HAVE_GD_FREETYPE
-function imageftbbox(float $size, float $angle, string $font_file, string $text, array $extrainfo = []): array|false {}
+function imageftbbox(float $size, float $angle, string $font_filename, string $string, array $options = []): array|false {}
 
-function imagefttext(GdImage $im, float $size, float $angle, int $x, int $y, int $col, string $font_file, string $text, array $extrainfo = []): array|false {}
+function imagefttext(GdImage $image, float $size, float $angle, int $x, int $y, int $color, string $font_filename, string $text, array $options = []): array|false {}
 
 /** @alias imageftbbox */
-function imagettfbbox(float $size, float $angle, string $font_file, string $text, array $extrainfo = []): array|false {}
+function imagettfbbox(float $size, float $angle, string $font_filename, string $string, array $options = []): array|false {}
 
 /** @alias imagefttext */
-function imagettftext(GdImage $im, float $size, float $angle, int $x, int $y, int $col, string $font_file, string $text, array $extrainfo = []): array|false {}
+function imagettftext(GdImage $image, float $size, float $angle, int $x, int $y, int $color, string $font_filename, string $text, array $options = []): array|false {}
 #endif
 
-/** @param array|int|float|bool $filter_args */
-function imagefilter(GdImage $im, int $filtertype, ...$filter_args): bool {}
+/** @param array|int|float|bool $args */
+function imagefilter(GdImage $image, int $filter, ...$args): bool {}
 
-function imageconvolution(GdImage $im, array $matrix3x3, float $div, float $offset): bool {}
+function imageconvolution(GdImage $image, array $matrix, float $divisor, float $offset): bool {}
 
-function imageflip(GdImage $im, int $mode): bool {}
+function imageflip(GdImage $image, int $mode): bool {}
 
-function imageantialias(GdImage $im, bool $on): bool {}
+function imageantialias(GdImage $image, bool $enable): bool {}
 
-function imagecrop(GdImage $im, array $rect): GdImage|false {}
+function imagecrop(GdImage $image, array $rectangle): GdImage|false {}
 
-function imagecropauto(GdImage $im, int $mode = IMG_CROP_DEFAULT, float $threshold = 0.5, int $color = -1): GdImage|false {}
+function imagecropauto(GdImage $image, int $mode = IMG_CROP_DEFAULT, float $threshold = 0.5, int $color = -1): GdImage|false {}
 
-function imagescale(GdImage $im, int $new_width, int $new_height = -1, int $mode = IMG_BILINEAR_FIXED): GdImage|false {}
+function imagescale(GdImage $image, int $width, int $height = -1, int $mode = IMG_BILINEAR_FIXED): GdImage|false {}
 
-function imageaffine(GdImage $im, array $affine, ?array $clip = null): GdImage|false {}
+function imageaffine(GdImage $image, array $affine, ?array $clip = null): GdImage|false {}
 
 /** @param array|float $options */
 function imageaffinematrixget(int $type, $options): array|false {}
 
-function imageaffinematrixconcat(array $m1, array $m2): array|false {}
+function imageaffinematrixconcat(array $matrix1, array $matrix2): array|false {}
 
-function imagegetinterpolation(GdImage $im): int {}
+function imagegetinterpolation(GdImage $image): int {}
 
-function imagesetinterpolation(GdImage $im, int $method = IMG_BILINEAR_FIXED): bool {}
+function imagesetinterpolation(GdImage $image, int $method = IMG_BILINEAR_FIXED): bool {}
+
+function imageresolution(GdImage $image, ?int $resolution_x = null, ?int $resolution_y = null): array|bool {}
 
-function imageresolution(GdImage $im, ?int $res_x = null, ?int $res_y = null): array|bool {}

diff --git a/ext/gd/gd_arginfo.h b/ext/gd/gd_arginfo.h
index bd6255b0836f29438dd6a2dad81071f0233d89c6..4d59767b4eb93cfa803b993f9915aaa971fc56a1 100644 (file)
--- a/ext/gd/gd_arginfo.h
+++ b/ext/gd/gd_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 20849891a4907e348f1a509388ab08b0b7f6633d */
+ * Stub hash: 59256d0de105f1a2f5d5fc1e20f8090031b42a76 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gd_info, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -9,75 +9,72 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imageloadfont, 0, 1, MAY_BE_LONG
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetstyle, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, styles, IS_ARRAY, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, style, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatetruecolor, 0, 2, GdImage, MAY_BE_FALSE)
-       ZEND_ARG_TYPE_INFO(0, x_size, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, y_size, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imageistruecolor, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagetruecolortopalette, 0, 3, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, ditherFlag, _IS_BOOL, 0)
-       ZEND_ARG_TYPE_INFO(0, colorWanted, IS_LONG, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, dither, _IS_BOOL, 0)
+       ZEND_ARG_TYPE_INFO(0, num_colors, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_imagepalettetotruecolor arginfo_imageistruecolor
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecolormatch, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im1, GdImage, 0)
-       ZEND_ARG_OBJ_INFO(0, im2, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image1, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image2, GdImage, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetthickness, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, thickness, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagefilledellipse, 0, 6, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, cx, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, cy, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, w, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, h, IS_LONG, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, center_x, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, center_y, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagefilledarc, 0, 9, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, cx, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, cy, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, w, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, h, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, s, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, e, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, col, IS_LONG, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, center_x, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, center_y, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, start_angle, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, end_angle, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, style, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagealphablending, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, blend, _IS_BOOL, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, enable, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesavealpha, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, save, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_imagesavealpha arginfo_imagealphablending
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagelayereffect, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, effect, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imagecolorallocatealpha, 0, 5, MAY_BE_LONG|MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, red, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, green, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, blue, IS_LONG, 0)
@@ -91,22 +88,22 @@ ZEND_END_ARG_INFO()
 #define arginfo_imagecolorexactalpha arginfo_imagecolorallocatealpha
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecopyresampled, 0, 10, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, dst_im, GdImage, 0)
-       ZEND_ARG_OBJ_INFO(0, src_im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, dst_image, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, src_image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, dst_x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, dst_y, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, src_x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, src_y, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, dst_w, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, dst_h, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, src_w, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, src_h, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, dst_width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, dst_height, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, src_width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, src_height, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #if defined(PHP_WIN32)
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagegrabwindow, 0, 1, GdImage, MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, handle, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, client_area, IS_LONG, 0, "0")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, client_area, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 #endif
 
@@ -116,19 +113,19 @@ ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagerotate, 0, 3, GdImage, MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, angle, IS_DOUBLE, 0)
-       ZEND_ARG_TYPE_INFO(0, bgdcolor, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ignoretransparent, IS_LONG, 0, "0")
+       ZEND_ARG_TYPE_INFO(0, background_color, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ignore_transparent, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesettile, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_OBJ_INFO(0, tile, GdImage, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetbrush, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_OBJ_INFO(0, brush, GdImage, 0)
 ZEND_END_ARG_INFO()
 
@@ -138,7 +135,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagetypes, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromstring, 0, 1, GdImage, MAY_BE_FALSE)
-       ZEND_ARG_TYPE_INFO(0, image, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromgif, 0, 1, GdImage, MAY_BE_FALSE)
@@ -179,8 +176,8 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromgd2part, 0, 5, GdImage, MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, srcX, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, srcY, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -198,20 +195,20 @@ ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagexbm, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 1)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, foreground, IS_LONG, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, foreground_color, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagegif, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, to, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, file, "null")
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GD_PNG)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagepng, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, to, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, file, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, quality, IS_LONG, 0, "-1")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filters, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
@@ -219,42 +216,42 @@ ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GD_WEBP)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagewebp, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, to, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, file, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, quality, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_JPG)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagejpeg, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, to, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, file, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, quality, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagewbmp, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, to, "null")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, foreground, IS_LONG, 1, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, file, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, foreground_color, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagegd, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagegd2, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, chunk_size, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GD_BMP)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagebmp, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, to, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, file, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, compressed, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 #endif
@@ -262,7 +259,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_imagedestroy arginfo_imageistruecolor
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imagecolorallocate, 0, 4, MAY_BE_LONG|MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, red, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, green, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, blue, IS_LONG, 0)
@@ -274,7 +271,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagepalettecopy, 0, 2, IS_VOID,
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imagecolorat, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -284,8 +281,8 @@ ZEND_END_ARG_INFO()
 #define arginfo_imagecolorclosesthwb arginfo_imagecolorallocate
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecolordeallocate, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_imagecolorresolve arginfo_imagecolorallocate
@@ -293,7 +290,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_imagecolorexact arginfo_imagecolorallocate
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecolorset, 0, 5, _IS_BOOL, 1)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, red, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, green, IS_LONG, 0)
@@ -302,30 +299,30 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecolorset, 0, 5, _IS_BOOL, 1
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imagecolorsforindex, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagegammacorrect, 0, 3, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, inputgamma, IS_DOUBLE, 0)
-       ZEND_ARG_TYPE_INFO(0, outputgamma, IS_DOUBLE, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, input_gamma, IS_DOUBLE, 0)
+       ZEND_ARG_TYPE_INFO(0, output_gamma, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetpixel, 0, 4, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, col, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imageline, 0, 6, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, x1, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y1, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, x2, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y2, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, col, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_imagedashedline arginfo_imageline
@@ -335,47 +332,47 @@ ZEND_END_ARG_INFO()
 #define arginfo_imagefilledrectangle arginfo_imageline
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagearc, 0, 8, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, cx, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, cy, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, w, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, h, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, s, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, e, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, col, IS_LONG, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, center_x, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, center_y, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, height, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, start_angle, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, end_angle, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_imageellipse arginfo_imagefilledellipse
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagefilltoborder, 0, 5, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, border, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, col, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, border_color, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_imagefill arginfo_imagesetpixel
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecolorstotal, 0, 1, IS_LONG, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecolortransparent, 0, 1, IS_LONG, 1)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, col, IS_LONG, 1, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, color, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imageinterlace, 0, 1, IS_LONG, 1)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, interlace, IS_LONG, 1, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagepolygon, 0, 3, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, points, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, num_points_or_col, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, col, IS_LONG, 1, "null")
+       ZEND_ARG_TYPE_INFO(0, num_points_or_color, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, color, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_imageopenpolygon arginfo_imagepolygon
@@ -389,47 +386,47 @@ ZEND_END_ARG_INFO()
 #define arginfo_imagefontheight arginfo_imagefontwidth
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagechar, 0, 6, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, font, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, c, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, col, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, char, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_imagecharup arginfo_imagechar
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagestring, 0, 6, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, font, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, col, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_imagestringup arginfo_imagestring
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecopy, 0, 8, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, dst_im, GdImage, 0)
-       ZEND_ARG_OBJ_INFO(0, src_im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, dst_image, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, src_image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, dst_x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, dst_y, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, src_x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, src_y, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, src_w, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, src_h, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, src_width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, src_height, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecopymerge, 0, 9, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, dst_im, GdImage, 0)
-       ZEND_ARG_OBJ_INFO(0, src_im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, dst_image, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, src_image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, dst_x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, dst_y, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, src_x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, src_y, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, src_w, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, src_h, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, src_width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, src_height, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, pct, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -442,7 +439,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_imagesy arginfo_imagecolorstotal
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetclip, 0, 5, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, x1, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, x2, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y1, IS_LONG, 0)
@@ -450,30 +447,30 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetclip, 0, 5, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagegetclip, 0, 1, IS_ARRAY, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GD_FREETYPE)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imageftbbox, 0, 4, MAY_BE_ARRAY|MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, size, IS_DOUBLE, 0)
        ZEND_ARG_TYPE_INFO(0, angle, IS_DOUBLE, 0)
-       ZEND_ARG_TYPE_INFO(0, font_file, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, text, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, extrainfo, IS_ARRAY, 0, "[]")
+       ZEND_ARG_TYPE_INFO(0, font_filename, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_FREETYPE)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imagefttext, 0, 8, MAY_BE_ARRAY|MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, size, IS_DOUBLE, 0)
        ZEND_ARG_TYPE_INFO(0, angle, IS_DOUBLE, 0)
        ZEND_ARG_TYPE_INFO(0, x, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, y, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, col, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, font_file, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, font_filename, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, text, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, extrainfo, IS_ARRAY, 0, "[]")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 #endif
 
@@ -486,49 +483,46 @@ ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagefilter, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, filtertype, IS_LONG, 0)
-       ZEND_ARG_VARIADIC_INFO(0, filter_args)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, filter, IS_LONG, 0)
+       ZEND_ARG_VARIADIC_INFO(0, args)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imageconvolution, 0, 4, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, matrix3x3, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, div, IS_DOUBLE, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, matrix, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, divisor, IS_DOUBLE, 0)
        ZEND_ARG_TYPE_INFO(0, offset, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imageflip, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imageantialias, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, on, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_imageantialias arginfo_imagealphablending
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecrop, 0, 2, GdImage, MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, rect, IS_ARRAY, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, rectangle, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecropauto, 0, 1, GdImage, MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "IMG_CROP_DEFAULT")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, threshold, IS_DOUBLE, 0, "0.5")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, color, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagescale, 0, 2, GdImage, MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO(0, new_width, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, new_height, IS_LONG, 0, "-1")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO(0, width, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, height, IS_LONG, 0, "-1")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "IMG_BILINEAR_FIXED")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imageaffine, 0, 2, GdImage, MAY_BE_FALSE)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO(0, affine, IS_ARRAY, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, clip, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
@@ -539,21 +533,21 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imageaffinematrixget, 0, 2, MAY_
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imageaffinematrixconcat, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
-       ZEND_ARG_TYPE_INFO(0, m1, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, m2, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, matrix1, IS_ARRAY, 0)
+       ZEND_ARG_TYPE_INFO(0, matrix2, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_imagegetinterpolation arginfo_imagecolorstotal
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetinterpolation, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, method, IS_LONG, 0, "IMG_BILINEAR_FIXED")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imageresolution, 0, 1, MAY_BE_ARRAY|MAY_BE_BOOL)
-       ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, res_x, IS_LONG, 1, "null")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, res_y, IS_LONG, 1, "null")
+       ZEND_ARG_OBJ_INFO(0, image, GdImage, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resolution_x, IS_LONG, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resolution_y, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 

diff --git a/ext/gd/tests/bug55005.phpt b/ext/gd/tests/bug55005.phpt
index da218e4d97eb82725e5d75499857f38725a13190..4514b80fed3b583db51bc6814319f98cd143d88c 100644 (file)
--- a/ext/gd/tests/bug55005.phpt
+++ b/ext/gd/tests/bug55005.phpt
@@ -17,5 +17,5 @@ trycatch_dump(
 );
 ?>
 --EXPECT--
-!! [ValueError] imagefilledpolygon(): Argument #3 ($num_points_or_col) must be greater than or equal to 3
-!! [ValueError] imagepolygon(): Argument #3 ($num_points_or_col) must be greater than or equal to 3
+!! [ValueError] imagefilledpolygon(): Argument #3 ($num_points_or_color) must be greater than or equal to 3
+!! [ValueError] imagepolygon(): Argument #3 ($num_points_or_color) must be greater than or equal to 3

diff --git a/ext/gd/tests/bug72697.phpt b/ext/gd/tests/bug72697.phpt
index 369e5c6c83881fe1eaf848414ab363602cba8570..6861437df27766b6d6a6456558b1f9089050d7e2 100644 (file)
--- a/ext/gd/tests/bug72697.phpt
+++ b/ext/gd/tests/bug72697.phpt
@@ -19,5 +19,5 @@ trycatch_dump(
 ?>
 DONE
 --EXPECT--
-!! [ValueError] imagetruecolortopalette(): Argument #3 ($colorWanted) must be greater than 0 and less than 2147483647
+!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647
 DONE

diff --git a/ext/gd/tests/bug72709.phpt b/ext/gd/tests/bug72709.phpt
index 02df1bb7c7668f18196fd42df8f5754045be3068..8915e4f57b6934b7236cfa9d4bf19230533a3e26 100644 (file)
--- a/ext/gd/tests/bug72709.phpt
+++ b/ext/gd/tests/bug72709.phpt
@@ -20,5 +20,5 @@ imagedestroy($im);
 ?>
 ====DONE====
 --EXPECT--
-imagesetstyle(): Argument #2 ($styles) cannot be empty
+imagesetstyle(): Argument #2 ($style) cannot be empty
 ====DONE====

diff --git a/ext/gd/tests/bug72730.phpt b/ext/gd/tests/bug72730.phpt
index d021f70a4803b095fd2cbd5443d6c948ba30a413..bbc01eb68baa6fd7764d4e043bd95dea5fb59f07 100644 (file)
--- a/ext/gd/tests/bug72730.phpt
+++ b/ext/gd/tests/bug72730.phpt
@@ -17,4 +17,4 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imagegammacorrect(): Argument #2 ($inputgamma) must be greater than 0
+!! [ValueError] imagegammacorrect(): Argument #2 ($input_gamma) must be greater than 0

diff --git a/ext/gd/tests/colorclosest.phpt b/ext/gd/tests/colorclosest.phpt
index 8541151442a911f632d859ee19462a784bfb44f7..4c750d5150212dd5703a8ad05b16ef000f847800 100644 (file)
--- a/ext/gd/tests/colorclosest.phpt
+++ b/ext/gd/tests/colorclosest.phpt
@@ -84,7 +84,7 @@ print_r(imagecolorsforindex($im, $c));
 ?>
 --EXPECT--
 FF00FF
-imagecolorsforindex(): Argument #2 ($index) is out of range
+imagecolorsforindex(): Argument #2 ($color) is out of range
 Array
 (
     [red] => 255
@@ -107,7 +107,7 @@ Array
     [alpha] => 0
 )
 64FF00FF
-imagecolorsforindex(): Argument #2 ($index) is out of range
+imagecolorsforindex(): Argument #2 ($color) is out of range
 Array
 (
     [red] => 255

diff --git a/ext/gd/tests/colormatch.phpt b/ext/gd/tests/colormatch.phpt
index 5641bc01017feb4ec6131e5d4030e5a9cc57b910..7ddf2c87a184adffe6a8e1ad85972b2bf873c871 100644 (file)
--- a/ext/gd/tests/colormatch.phpt
+++ b/ext/gd/tests/colormatch.phpt
@@ -21,5 +21,5 @@ echo "ok\n";
 imagedestroy($im);
 ?>
 --EXPECT--
-imagecolormatch(): Argument #2 ($im2) must have at least one color
+imagecolormatch(): Argument #2 ($image2) must have at least one color
 ok

diff --git a/ext/gd/tests/createfromstring.phpt b/ext/gd/tests/createfromstring.phpt
index d4d63149f13f1287f5e3a918128809a75cc12b56..6586d17c31d7f7648df9b4d78cccb6790db54df8 100644 (file)
--- a/ext/gd/tests/createfromstring.phpt
+++ b/ext/gd/tests/createfromstring.phpt
@@ -62,6 +62,6 @@ $im = imagecreatefromstring(' asdf jklp foo');
 --EXPECTF--
 createfromstring truecolor png: ok
 createfromstring palette png: ok
-imagecreatefromstring(): Argument #1 ($image) cannot be empty
+imagecreatefromstring(): Argument #1 ($data) cannot be empty
 
 Warning: imagecreatefromstring(): Data is not in a recognized format in %screatefromstring.php on line %d

diff --git a/ext/gd/tests/imagebmp_nullbyte_injection.phpt b/ext/gd/tests/imagebmp_nullbyte_injection.phpt
index 9f0398b5da9d0f80c41acd49e4107341bf114749..979bf86bcae147b9cce1cf0e6fc7c722eba2a155 100644 (file)
--- a/ext/gd/tests/imagebmp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagebmp_nullbyte_injection.phpt
@@ -15,4 +15,4 @@ try {
 }
 ?>
 --EXPECT--
-imagebmp(): Argument #2 ($to) must not contain null bytes
+imagebmp(): Argument #2 ($file) must not contain null bytes

diff --git a/ext/gd/tests/imagecolordeallocate_error3.phpt b/ext/gd/tests/imagecolordeallocate_error3.phpt
index 92568667b0353f272728980151c1dae38465a9a4..3fe8ad7f3da748420b29618dae11b61f8c4e0da1 100644 (file)
--- a/ext/gd/tests/imagecolordeallocate_error3.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error3.phpt
@@ -22,4 +22,4 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imagecolordeallocate(): Argument #2 ($index) must be between 0 and 1
+!! [ValueError] imagecolordeallocate(): Argument #2 ($color) must be between 0 and 1

diff --git a/ext/gd/tests/imagecolordeallocate_error4.phpt b/ext/gd/tests/imagecolordeallocate_error4.phpt
index 1a4b9e61c5aade457cb38100630eadb51ef75307..3f94e172dce66d8f29488008c88717d6f7ee691c 100644 (file)
--- a/ext/gd/tests/imagecolordeallocate_error4.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error4.phpt
@@ -22,4 +22,4 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imagecolordeallocate(): Argument #2 ($index) must be between 0 and 1
+!! [ValueError] imagecolordeallocate(): Argument #2 ($color) must be between 0 and 1

diff --git a/ext/gd/tests/imagecolormatch_error2.phpt b/ext/gd/tests/imagecolormatch_error2.phpt
index f356b716c6147f67f3a3183870fa9f0c9adf180c..c9a75f7822bb49113903f192782ffedf8f31c576 100644 (file)
--- a/ext/gd/tests/imagecolormatch_error2.phpt
+++ b/ext/gd/tests/imagecolormatch_error2.phpt
@@ -22,4 +22,4 @@ try {
 
 ?>
 --EXPECT--
-imagecolormatch(): Argument #1 ($im1) must be TrueColor
+imagecolormatch(): Argument #1 ($image1) must be TrueColor

diff --git a/ext/gd/tests/imagecolormatch_error3.phpt b/ext/gd/tests/imagecolormatch_error3.phpt
index a3f556a3e12bad02347718757b4944e65bb6890e..25bc70c6a26e9ee5e27721173223142e2f7e5daa 100644 (file)
--- a/ext/gd/tests/imagecolormatch_error3.phpt
+++ b/ext/gd/tests/imagecolormatch_error3.phpt
@@ -22,4 +22,4 @@ try {
 
 ?>
 --EXPECT--
-imagecolormatch(): Argument #2 ($im2) must be Palette
+imagecolormatch(): Argument #2 ($image2) must be Palette

diff --git a/ext/gd/tests/imagecolormatch_error4.phpt b/ext/gd/tests/imagecolormatch_error4.phpt
index f1392c9149e90553b50ce61fcdaeadc57c76010b..b37d827cf3db24dc3f656ff23e8490637eda6929 100644 (file)
--- a/ext/gd/tests/imagecolormatch_error4.phpt
+++ b/ext/gd/tests/imagecolormatch_error4.phpt
@@ -22,4 +22,4 @@ try {
 
 ?>
 --EXPECT--
-imagecolormatch(): Argument #2 ($im2) must be the same size as argument #1 ($im1)
+imagecolormatch(): Argument #2 ($image2) must be the same size as argument #1 ($im1)

diff --git a/ext/gd/tests/imageconvolution_error2.phpt b/ext/gd/tests/imageconvolution_error2.phpt
index b9c32af1e440816965132bcd2ac2595abd5eed91..32c2618aaf87de0343b39e5d2b20def80752ed81 100644 (file)
--- a/ext/gd/tests/imageconvolution_error2.phpt
+++ b/ext/gd/tests/imageconvolution_error2.phpt
@@ -27,4 +27,4 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imageconvolution(): Argument #2 ($matrix3x3) must be a 3x3 array
+!! [ValueError] imageconvolution(): Argument #2 ($matrix) must be a 3x3 array

diff --git a/ext/gd/tests/imageconvolution_error3.phpt b/ext/gd/tests/imageconvolution_error3.phpt
index 2ad99f961782e4e7e243451359041ecdee4876da..000c0912f54cbf6e4610cf2274b643c2bf20884a 100644 (file)
--- a/ext/gd/tests/imageconvolution_error3.phpt
+++ b/ext/gd/tests/imageconvolution_error3.phpt
@@ -35,5 +35,5 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imageconvolution(): Argument #2 ($matrix3x3) must be a 3x3 array, matrix[2] only has 2 elements
-!! [ValueError] imageconvolution(): Argument #2 ($matrix3x3) must be a 3x3 array, matrix[2][2] cannot be found (missing integer key)
+!! [ValueError] imageconvolution(): Argument #2 ($matrix) must be a 3x3 array, matrix[2] only has 2 elements
+!! [ValueError] imageconvolution(): Argument #2 ($matrix) must be a 3x3 array, matrix[2][2] cannot be found (missing integer key)

diff --git a/ext/gd/tests/imagecreate_error.phpt b/ext/gd/tests/imagecreate_error.phpt
index 3e16c1f034193b6c7c13076be2ac791139b44b1f..1e068205e95b0cca6291330a35ff910e54db6a7c 100644 (file)
--- a/ext/gd/tests/imagecreate_error.phpt
+++ b/ext/gd/tests/imagecreate_error.phpt
@@ -17,5 +17,5 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imagecreate(): Argument #1 ($x_size) must be greater than 0
-!! [ValueError] imagecreate(): Argument #2 ($y_size) must be greater than 0
+!! [ValueError] imagecreate(): Argument #1 ($width) must be greater than 0
+!! [ValueError] imagecreate(): Argument #2 ($height) must be greater than 0

diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
index 09870e282647539ba536f2d805555359be6fef0a..d0e4933e7aeb2f475447b81af92f3a8cb499772b 100644 (file)
--- a/ext/gd/tests/imagecreatetruecolor_error2.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -19,5 +19,5 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imagecreatetruecolor(): Argument #1 ($x_size) must be greater than 0
-!! [ValueError] imagecreatetruecolor(): Argument #2 ($y_size) must be greater than 0
+!! [ValueError] imagecreatetruecolor(): Argument #1 ($width) must be greater than 0
+!! [ValueError] imagecreatetruecolor(): Argument #2 ($height) must be greater than 0

diff --git a/ext/gd/tests/imagegd2_nullbyte_injection.phpt b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
index 38065dab0ab01ed1e16e468ff44c53824cc79096..6daabbb199ae8ce50ddac3aec1e1ba76e193e408 100644 (file)
--- a/ext/gd/tests/imagegd2_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
@@ -14,4 +14,4 @@ try {
 }
 ?>
 --EXPECT--
-imagegd(): Argument #2 ($to) must not contain any null bytes
+imagegd(): Argument #2 ($file) must not contain any null bytes

diff --git a/ext/gd/tests/imagegd_nullbyte_injection.phpt b/ext/gd/tests/imagegd_nullbyte_injection.phpt
index 4a77b15ee0dfba24bd4c33c4d5c30d6f1fcc404e..0560152c95aea67901dbbbd94ce496aacd6c3116 100644 (file)
--- a/ext/gd/tests/imagegd_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt
@@ -14,4 +14,4 @@ try {
 }
 ?>
 --EXPECT--
-imagegd(): Argument #2 ($to) must not contain any null bytes
+imagegd(): Argument #2 ($file) must not contain any null bytes

diff --git a/ext/gd/tests/imagegif_nullbyte_injection.phpt b/ext/gd/tests/imagegif_nullbyte_injection.phpt
index 4b164392c218d78acc68a935d02f99acd3eaedf0..459078865a34b84db590a12e51b9fc11ab8fba04 100644 (file)
--- a/ext/gd/tests/imagegif_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegif_nullbyte_injection.phpt
@@ -14,4 +14,4 @@ try {
 }
 ?>
 --EXPECT--
-imagegif(): Argument #2 ($to) must not contain null bytes
+imagegif(): Argument #2 ($file) must not contain null bytes

diff --git a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
index be385b8bdc4ccf7c513095ac442f2d617f49fd31..0473712274fbd1c07c4f4447ad52efa3c7d71411 100644 (file)
--- a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
@@ -18,4 +18,4 @@ try {
 }
 ?>
 --EXPECT--
-imagejpeg(): Argument #2 ($to) must not contain null bytes
+imagejpeg(): Argument #2 ($file) must not contain null bytes

diff --git a/ext/gd/tests/imagepng_nullbyte_injection.phpt b/ext/gd/tests/imagepng_nullbyte_injection.phpt
index 8a415478ddcef4be6e9c5d4d02dd2604fd735a5d..6ef99e67a27e2a8174db4f5a58aa5fd1ed304bdd 100644 (file)
--- a/ext/gd/tests/imagepng_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagepng_nullbyte_injection.phpt
@@ -18,4 +18,4 @@ try {
 }
 ?>
 --EXPECT--
-imagepng(): Argument #2 ($to) must not contain null bytes
+imagepng(): Argument #2 ($file) must not contain null bytes

diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt
index 3fd8be0c3adb3f7cb572a41a2e7bd2e918337ca4..0af49bf38c55a6e7a7acb66bb7b71cc763f07edf 100644 (file)
--- a/ext/gd/tests/imagetruecolortopalette_error3.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt
@@ -19,4 +19,4 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imagetruecolortopalette(): Argument #3 ($colorWanted) must be greater than 0 and less than 2147483647
+!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647

diff --git a/ext/gd/tests/imagetruecolortopalette_error4.phpt b/ext/gd/tests/imagetruecolortopalette_error4.phpt
index dd24aecc8154bcd7734bffaf599e74bdde6453a5..1d539cd4abaa51de7400c85fdec2f8ce214cffae 100644 (file)
--- a/ext/gd/tests/imagetruecolortopalette_error4.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error4.phpt
@@ -20,5 +20,5 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [ValueError] imagetruecolortopalette(): Argument #3 ($colorWanted) must be greater than 0 and less than 2147483647
-!! [ValueError] imagetruecolortopalette(): Argument #3 ($colorWanted) must be greater than 0 and less than 2147483647
+!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647
+!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647

diff --git a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
index d7c3f0c41617b2db62d4d430a1ea4a0669c52ed9..73ef5272f33a9ce36ffd5ca3cb23c049c78644e9 100644 (file)
--- a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
@@ -18,4 +18,4 @@ try {
 }
 ?>
 --EXPECT--
-imagewbmp(): Argument #2 ($to) must not contain null bytes
+imagewbmp(): Argument #2 ($file) must not contain null bytes

diff --git a/ext/gd/tests/imagewebp_nullbyte_injection.phpt b/ext/gd/tests/imagewebp_nullbyte_injection.phpt
index 52ecc5994124748be10055cef05a6e512e5c35dd..4a0e69c164edb537b9282bc24d06791da5be8764 100644 (file)
--- a/ext/gd/tests/imagewebp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewebp_nullbyte_injection.phpt
@@ -18,4 +18,4 @@ try {
 }
 ?>
 --EXPECT--
-imagewebp(): Argument #2 ($to) must not contain null bytes
+imagewebp(): Argument #2 ($file) must not contain null bytes