archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fix the return type of imagecolorexactalpha()
  String default values are enclosed in quotes rather than apostrophes
This commit is contained in:
Máté Kocsis 2021-10-12 09:53:30 +02:00
commit 220f0f55cf
No known key found for this signature in database
GPG key ID: FD055E41728BF310
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/gd/gd.stub.php
View file

@ -53,7 +53,7 @@ function imagecolorresolvealpha(GdImage $image, int $red, int $green, int $blue,
function imagecolorclosestalpha(GdImage $image, int $red, int $green, int $blue, int $alpha): int {} function imagecolorclosestalpha(GdImage $image, int $red, int $green, int $blue, int $alpha): int {}
function imagecolorexactalpha(GdImage $image, int $red, int $green, int $blue, int $alpha): int|false {} function imagecolorexactalpha(GdImage $image, int $red, int $green, int $blue, int $alpha): int {}
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 {} 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 {}

4
ext/gd/gd_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* This is a generated file, edit the .stub.php file instead.
* Stub hash: 722e0701b4ded4747d71433c11b9575e41826be3 */ * Stub hash: 4de3d369fad259705acc5bf5de0e935b7e142ec7 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gd_info, 0, 0, IS_ARRAY, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gd_info, 0, 0, IS_ARRAY, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
@ -91,7 +91,7 @@ ZEND_END_ARG_INFO()
#define arginfo_imagecolorclosestalpha arginfo_imagecolorresolvealpha #define arginfo_imagecolorclosestalpha arginfo_imagecolorresolvealpha
#define arginfo_imagecolorexactalpha arginfo_imagecolorallocatealpha #define arginfo_imagecolorexactalpha arginfo_imagecolorresolvealpha
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecopyresampled, 0, 10, _IS_BOOL, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecopyresampled, 0, 10, _IS_BOOL, 0)
ZEND_ARG_OBJ_INFO(0, dst_image, GdImage, 0) ZEND_ARG_OBJ_INFO(0, dst_image, GdImage, 0)

2
ext/standard/basic_functions.stub.php
View file

@ -867,7 +867,7 @@ function parse_str(string $string, &$result): void {}
* @return array<int, string|null> * @return array<int, string|null>
* @refcount 1 * @refcount 1
*/ */
function str_getcsv(string $string, string $separator = ",", string $enclosure = "\"", string $escape = '\\'): array {} function str_getcsv(string $string, string $separator = ",", string $enclosure = "\"", string $escape = "\\"): array {}
/** @refcount 1 */ /** @refcount 1 */
function str_repeat(string $string, int $times): string {} function str_repeat(string $string, int $times): string {}

4
ext/standard/basic_functions_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* This is a generated file, edit the .stub.php file instead.
* Stub hash: f2f7f736c9af03e8aa625dae91203fb0961a6634 */ * Stub hash: 96393b26861733e5c7fc9a12095a29c07ed73928 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@ -1024,7 +1024,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_str_getcsv, 0, 1, IS_ARRAY, 0)
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, separator, IS_STRING, 0, "\",\"") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, separator, IS_STRING, 0, "\",\"")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enclosure, IS_STRING, 0, "\"\\\"\"") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enclosure, IS_STRING, 0, "\"\\\"\"")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, escape, IS_STRING, 0, "\'\\\\\'") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, escape, IS_STRING, 0, "\"\\\\\"")
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_str_repeat, 0, 2, IS_STRING, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_str_repeat, 0, 2, IS_STRING, 0)