Review parameter names in ext/zlib

Closes GH-6250
This commit is contained in:
Máté Kocsis 2020-10-01 10:34:18 +02:00
parent faea5ab837
commit e9c707298b
No known key found for this signature in database
GPG key ID: FD055E41728BF310
9 changed files with 56 additions and 56 deletions

View file

@ -15,7 +15,7 @@ function bzread($bz, int $length = 1024): string|false {}
* @param resource $bz
* @alias fwrite
*/
function bzwrite($bz, string $str, ?int $length = null): int|false {}
function bzwrite($bz, string $data, ?int $max_length = null): int|false {}
/**
* @param resource $bz

View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 9bcd75ddbde225e65ee9f00d86d16677d671b4e4 */
* Stub hash: e18326d2ddbe564858abb531fc41b7907fba35c4 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_bzopen, 0, 0, 2)
ZEND_ARG_INFO(0, file)
@ -13,8 +13,8 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_bzwrite, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_INFO(0, bz)
ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 1, "null")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bzflush, 0, 1, _IS_BOOL, 0)

View file

@ -823,13 +823,13 @@ function ftell($stream): int|false {}
function fflush($stream): bool {}
/** @param resource $stream */
function fwrite($stream, string $string, ?int $max_length = null): int|false {}
function fwrite($stream, string $data, ?int $max_length = null): int|false {}
/**
* @param resource $stream
* @alias fwrite
*/
function fputs($stream, string $string, ?int $max_length = null): int|false {}
function fputs($stream, string $data, ?int $max_length = null): int|false {}
/** @param resource|null $context */
function mkdir(string $directory, int $mode = 0777, bool $recursive = false, $context = null): bool {}
@ -855,7 +855,7 @@ function file_get_contents(string $filename, bool $use_include_path = false, $co
function unlink(string $filename, $context = null): bool {}
/** @param resource|null $context */
function file_put_contents(string $filename, mixed $content, int $flags = 0, $context = null): int|false {}
function file_put_contents(string $filename, mixed $data, int $flags = 0, $context = null): int|false {}
/** @param resource $stream */
function fputcsv($stream, array $fields, string $separator = ",", string $enclosure = "\"", string $escape = "\\"): int|false {}

View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: af5b921b66f7dd68ba8c771199825a439a07dba0 */
* Stub hash: 1b9d82b77bd589dc95f5f4db1780162ee92c89c6 */
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)
@ -1267,7 +1267,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_fwrite, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_INFO(0, stream)
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 1, "null")
ZEND_END_ARG_INFO()
@ -1317,7 +1317,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_file_put_contents, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, content, IS_MIXED, 0)
ZEND_ARG_TYPE_INFO(0, data, IS_MIXED, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, context, "null")
ZEND_END_ARG_INFO()

View file

@ -53,7 +53,7 @@ string(%d) "%a"
Warning: gzuncompress(): %s error in %s on line %d
bool(false)
gzuncompress(): Argument #2 ($max_decoded_len) must be greater than or equal to 0
gzuncompress(): Argument #2 ($max_length) must be greater than or equal to 0
Warning: gzuncompress(): %s error in %s on line %d
bool(false)

View file

@ -54,7 +54,7 @@ bool(false)
Warning: gzinflate(): data error in %s on line %d
bool(false)
gzinflate(): Argument #2 ($max_decoded_len) must be greater than or equal to 0
gzinflate(): Argument #2 ($max_length) must be greater than or equal to 0
Warning: gzinflate(): data error in %s on line %d
bool(false)

View file

@ -28,4 +28,4 @@ try {
?>
--EXPECT--
deflate_add(): Argument #1 ($context) must be of type DeflateContext, resource given
deflate_add(): Argument #3 ($flush_behavior) must be one of ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK, or ZLIB_FINISH
deflate_add(): Argument #3 ($flush_mode) must be one of ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK, or ZLIB_FINISH

View file

@ -23,7 +23,7 @@ function readgzfile(string $filename, int $use_include_path = 0): int|false {}
function zlib_encode(string $data, int $encoding, int $level = -1): string|false {}
function zlib_decode(string $data, int $max_decoded_len = 0): string|false {}
function zlib_decode(string $data, int $max_length = 0): string|false {}
function gzdeflate(string $data, int $level = -1, int $encoding = ZLIB_ENCODING_RAW): string|false {}
@ -31,85 +31,85 @@ function gzencode(string $data, int $level = -1, int $encoding = ZLIB_ENCODING_G
function gzcompress(string $data, int $level = -1, int $encoding = ZLIB_ENCODING_DEFLATE): string|false {}
function gzinflate(string $data, int $max_decoded_len = 0): string|false {}
function gzinflate(string $data, int $max_length = 0): string|false {}
function gzdecode(string $data, int $max_decoded_len = 0): string|false {}
function gzdecode(string $data, int $max_length = 0): string|false {}
function gzuncompress(string $data, int $max_decoded_len = 0): string|false {}
function gzuncompress(string $data, int $max_length = 0): string|false {}
/**
* @param resource $fp
* @param resource $stream
* @alias fwrite
*/
function gzwrite($fp, string $str, ?int $length = null): int|false {}
function gzwrite($stream, string $data, ?int $max_length = null): int|false {}
/**
* @param resource $fp
* @param resource $stream
* @alias fwrite
*/
function gzputs($fp, string $str, ?int $length = null): int|false {}
function gzputs($stream, string $data, ?int $max_length = null): int|false {}
/**
* @param resource $fp
* @param resource $stream
* @alias rewind
*/
function gzrewind($fp): bool {}
function gzrewind($stream): bool {}
/**
* @param resource $fp
* @param resource $stream
* @alias fclose
*/
function gzclose($fp): bool {}
function gzclose($stream): bool {}
/**
* @param resource $fp
* @param resource $stream
* @alias feof
*/
function gzeof($fp): bool {}
function gzeof($stream): bool {}
/**
* @param resource $fp
* @param resource $stream
* @alias fgetc
*/
function gzgetc($fp): string|false {}
function gzgetc($stream): string|false {}
/**
* @param resource $fp
* @param resource $stream
* @alias fpassthru
*/
function gzpassthru($fp): int {}
function gzpassthru($stream): int {}
/**
* @param resource $fp
* @param resource $stream
* @alias fseek
*/
function gzseek($fp, int $offset, int $whence = SEEK_SET): int {}
function gzseek($stream, int $offset, int $whence = SEEK_SET): int {}
/**
* @param resource $fp
* @param resource $stream
* @alias ftell
*/
function gztell($fp): int|false {}
function gztell($stream): int|false {}
/**
* @param resource $fp
* @param resource $stream
* @alias fread
*/
function gzread($fp, int $length): string|false {}
function gzread($stream, int $length): string|false {}
/**
* @param resource $fp
* @param resource $stream
* @alias fgets
*/
function gzgets($fp, int $length = 1024): string|false {}
function gzgets($stream, int $length = 1024): string|false {}
function deflate_init(int $encoding, array $options = []): DeflateContext|false {}
function deflate_add(DeflateContext $context, string $add, int $flush_behavior = ZLIB_SYNC_FLUSH): string|false {}
function deflate_add(DeflateContext $context, string $data, int $flush_mode = ZLIB_SYNC_FLUSH): string|false {}
function inflate_init(int $encoding, array $options = []): InflateContext|false {}
function inflate_add(InflateContext $context, string $encoded_data, int $flush_mode = ZLIB_SYNC_FLUSH): string|false {}
function inflate_add(InflateContext $context, string $data, int $flush_mode = ZLIB_SYNC_FLUSH): string|false {}
function inflate_get_status(InflateContext $context): int {}

View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: b31cdbe9a5d719194753bfe303d32319478048bb */
* Stub hash: e9347c139d418c36d889d2becf57535f1c76efed */
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)
@ -33,7 +33,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_zlib_decode, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_decoded_len, IS_LONG, 0, "0")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 0, "0")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gzdeflate, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
@ -61,15 +61,15 @@ ZEND_END_ARG_INFO()
#define arginfo_gzuncompress arginfo_zlib_decode
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gzwrite, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_INFO(0, fp)
ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
ZEND_ARG_INFO(0, stream)
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 1, "null")
ZEND_END_ARG_INFO()
#define arginfo_gzputs arginfo_gzwrite
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gzrewind, 0, 1, _IS_BOOL, 0)
ZEND_ARG_INFO(0, fp)
ZEND_ARG_INFO(0, stream)
ZEND_END_ARG_INFO()
#define arginfo_gzclose arginfo_gzrewind
@ -77,30 +77,30 @@ ZEND_END_ARG_INFO()
#define arginfo_gzeof arginfo_gzrewind
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gzgetc, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_INFO(0, fp)
ZEND_ARG_INFO(0, stream)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gzpassthru, 0, 1, IS_LONG, 0)
ZEND_ARG_INFO(0, fp)
ZEND_ARG_INFO(0, stream)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gzseek, 0, 2, IS_LONG, 0)
ZEND_ARG_INFO(0, fp)
ZEND_ARG_INFO(0, stream)
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whence, IS_LONG, 0, "SEEK_SET")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gztell, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_INFO(0, fp)
ZEND_ARG_INFO(0, stream)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gzread, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_INFO(0, fp)
ZEND_ARG_INFO(0, stream)
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
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, fp)
ZEND_ARG_INFO(0, stream)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "1024")
ZEND_END_ARG_INFO()
@ -111,8 +111,8 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_deflate_add, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, context, DeflateContext, 0)
ZEND_ARG_TYPE_INFO(0, add, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flush_behavior, IS_LONG, 0, "ZLIB_SYNC_FLUSH")
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flush_mode, IS_LONG, 0, "ZLIB_SYNC_FLUSH")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_inflate_init, 0, 1, InflateContext, MAY_BE_FALSE)
@ -122,7 +122,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_inflate_add, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_OBJ_INFO(0, context, InflateContext, 0)
ZEND_ARG_TYPE_INFO(0, encoded_data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flush_mode, IS_LONG, 0, "ZLIB_SYNC_FLUSH")
ZEND_END_ARG_INFO()