Review parameter names in ext/zlib

Author: kocsismate

ext/zlib/tests/005.phpt

@@ -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 ($length) must be greater than or equal to 0
 
 Warning: gzuncompress(): %s error in %s on line %d
 bool(false)

ext/zlib/tests/006.phpt

@@ -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 ($length) must be greater than or equal to 0
 
 Warning: gzinflate(): data error in %s on line %d
 bool(false)

ext/zlib/tests/deflate_add_error.phpt

@@ -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

ext/zlib/zlib.stub.php

@@ -23,93 +23,93 @@ 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 $length = 0): string|false {}
 
 function gzdeflate(string $data, int $level = -1, int $encoding = ZLIB_ENCODING_RAW): string|false {}
 
 function gzencode(string $data, int $level = -1, int $encoding = ZLIB_ENCODING_GZIP): string|false {}
 
 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 $length = 0): string|false {}
 
-function gzdecode(string $data, int $max_decoded_len = 0): string|false {}
+function gzdecode(string $data, int $length = 0): string|false {}
 
-function gzuncompress(string $data, int $max_decoded_len = 0): string|false {}
+function gzuncompress(string $data, int $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 $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 $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 {}
 

ext/zlib/zlib_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: b31cdbe9a5d719194753bfe303d32319478048bb */
+ * Stub hash: 6c2ddfdc11cef747d9657ca4004cf10cf79ea337 */
 
 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, 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,46 +61,46 @@ 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_INFO(0, stream)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, 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
 
 #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()