diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-17 15:09:26 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-17 15:09:26 +0100 |
| commit | 92a969421cfa26bfdc5a62cb5ea5002d2c7b09f9 (patch) | |
| tree | 6915d54c52cd19eb1b78f24bc026e24b5a1da526 | |
| parent | db538775e16bdc154d195469d658f6bee9809c5a (diff) | |
| parent | d80118dc163e2fce6990b997ff7100974358481c (diff) | |
| download | php-git-92a969421cfa26bfdc5a62cb5ea5002d2c7b09f9.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
imagecolortransparent() cannot return null
| -rw-r--r-- | ext/gd/gd.stub.php | 2 | ||||
| -rw-r--r-- | ext/gd/gd_arginfo.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/gd/gd.stub.php b/ext/gd/gd.stub.php index 531ccb7989..593b678a43 100644 --- a/ext/gd/gd.stub.php +++ b/ext/gd/gd.stub.php @@ -178,7 +178,7 @@ function imagefill(GdImage $image, int $x, int $y, int $color): bool {} function imagecolorstotal(GdImage $image): int {} -function imagecolortransparent(GdImage $image, ?int $color = null): ?int {} +function imagecolortransparent(GdImage $image, ?int $color = null): int {} function imageinterlace(GdImage $image, ?bool $enable = null): bool {} diff --git a/ext/gd/gd_arginfo.h b/ext/gd/gd_arginfo.h index fdc509901c..20fe428657 100644 --- 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: a2e5f8b612433e77d623bbab6b1d3d32fca7966c */ + * Stub hash: a53aa5d7eafd82e0b0adf0b220f0a548e4ac2a84 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gd_info, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -358,7 +358,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecolorstotal, 0, 1, IS_LONG, 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_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecolortransparent, 0, 1, IS_LONG, 0) 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() |