diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-18 15:47:31 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-18 15:47:31 +0100 |
| commit | 2b677aaa34d59256d2bbb5b18a0f2bc670c4f72a (patch) | |
| tree | 619bf081a7d7677cb4c3a0e1318a6a4d56528310 | |
| parent | 50eca61f68815005f3b0f808578cc1ce3b4297f0 (diff) | |
| parent | 7290dc4dcf25d4a37fc1d412a5b5a8828cc06c77 (diff) | |
| download | php-git-2b677aaa34d59256d2bbb5b18a0f2bc670c4f72a.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Sync gzgets signature with fgets
| -rw-r--r-- | ext/zlib/zlib.stub.php | 4 | ||||
| -rw-r--r-- | ext/zlib/zlib_arginfo.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/zlib/zlib.stub.php b/ext/zlib/zlib.stub.php index cb7e978249..c047a53541 100644 --- a/ext/zlib/zlib.stub.php +++ b/ext/zlib/zlib.stub.php @@ -99,9 +99,9 @@ function gzread($stream, int $length): string|false {} /** * @param resource $stream - * @implementation-alias fgets + * @alias fgets */ -function gzgets($stream, int $length = 1024): string|false {} +function gzgets($stream, ?int $length = null): string|false {} function deflate_init(int $encoding, array $options = []): DeflateContext|false {} diff --git a/ext/zlib/zlib_arginfo.h b/ext/zlib/zlib_arginfo.h index 0a4be7f767..9f5129feb0 100644 --- a/ext/zlib/zlib_arginfo.h +++ b/ext/zlib/zlib_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 940858ddc4ddc7edb1e00960334ffa473224fd85 */ + * Stub hash: 5862b97739c885589779f8ba3d13b4e390d72811 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ob_gzhandler, 0, 2, MAY_BE_STRING|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) @@ -101,7 +101,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gzgets, 0, 1, MAY_BE_STRING|MAY_BE_FALSE) ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "1024") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_deflate_init, 0, 1, DeflateContext, MAY_BE_FALSE) |