Commit 42f994cd05d for php.net
commit 42f994cd05da353c93cd65775026859f664289a3
Author: David CARLIER <devnexen@gmail.com>
Date: Sun Dec 21 06:57:10 2025 +0000
ext/zlib: minor internal changes. (#20654)
consolidate encoding error exception b/w inflate_init()/deflate_init().
diff --git a/ext/zlib/tests/inflate_init_error.phpt b/ext/zlib/tests/inflate_init_error.phpt
index 8faed763be4..9854f745390 100644
--- a/ext/zlib/tests/inflate_init_error.phpt
+++ b/ext/zlib/tests/inflate_init_error.phpt
@@ -13,4 +13,4 @@
?>
--EXPECT--
-Encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE
+inflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
diff --git a/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt b/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt
index da2a11849c0..507e6842cb5 100644
--- a/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt
+++ b/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt
@@ -16,5 +16,5 @@
}
?>
--EXPECT--
-Encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE
+inflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
deflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 0b08cea7d69..68c5572931b 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -887,7 +887,7 @@ PHP_FUNCTION(inflate_init)
case PHP_ZLIB_ENCODING_DEFLATE:
break;
default:
- zend_value_error("Encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE");
+ zend_argument_value_error(1, "must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE");
RETURN_THROWS();
}