Skip to content

Refactor/zend parse parameters #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjdev merged 2 commits into from
Jun 11, 2025
Merged

Refactor/zend parse parameters #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc3adc
refactor: zend parse parameters sets the return value on error to false
kjdev Jun 11, 2025
c121499
test: change error messages
kjdev Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ Warning: zstd_compress() expects at least 1 parameter, 0 given in %s on line %d
bool(false)
*** Testing with incorrect parameters ***

Warning: zstd_compress(): expects parameter to be string. in %s on line %d
Warning: zstd_compress() expects parameter 1 to be string, object given in %s on line %d
bool(false)
===Done===
4 changes: 2 additions & 2 deletions tests/005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ Warning: zstd_uncompress() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)
*** Testing with incorrect arguments ***

Warning: zstd_uncompress(): expects parameter to be string. in %s on line %d
Warning: zstd_uncompress(): it was not compressed by zstd in %s on line %d
bool(false)

Warning: zstd_uncompress(): expects parameter to be string. in %s on line %d
Warning: zstd_uncompress() expects parameter 1 to be string, object given in %s on line %d
bool(false)
===DONE===
43 changes: 7 additions & 36 deletions zstd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,25 +337,11 @@ ZEND_FUNCTION(zstd_compress)
char *input;
size_t input_len;

#if PHP_VERSION_ID < 80000
zval *data;
if (zend_parse_parameters(ZEND_NUM_ARGS(),
"z|l", &data, &level) == FAILURE) {
RETURN_FALSE;
}
if (Z_TYPE_P(data) != IS_STRING) {
zend_error(E_WARNING, "zstd_compress(): expects parameter to be string.");
RETURN_FALSE;
}
input = Z_STRVAL_P(data);
input_len = Z_STRLEN_P(data);
#else
ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_STRING(input, input_len)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(level)
ZEND_PARSE_PARAMETERS_END();
#endif
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

if (!zstd_check_compress_level(level)) {
RETURN_FALSE;
Expand Down Expand Up @@ -386,24 +372,9 @@ ZEND_FUNCTION(zstd_uncompress)
char *input;
size_t input_len;

#if PHP_VERSION_ID < 80000
zval *data;
if (zend_parse_parameters(ZEND_NUM_ARGS(),
"z", &data) == FAILURE) {
RETURN_FALSE;
}
if (Z_TYPE_P(data) != IS_STRING) {
zend_error(E_WARNING,
"zstd_uncompress(): expects parameter to be string.");
RETURN_FALSE;
}
input = Z_STRVAL_P(data);
input_len = Z_STRLEN_P(data);
#else
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STRING(input, input_len)
ZEND_PARSE_PARAMETERS_END();
#endif
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

size = ZSTD_getFrameContentSize(input, input_len);
if (size == ZSTD_CONTENTSIZE_ERROR) {
Expand Down Expand Up @@ -496,7 +467,7 @@ ZEND_FUNCTION(zstd_compress_dict)
Z_PARAM_STRING(dict, dict_len)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(level)
ZEND_PARSE_PARAMETERS_END();
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

if (!zstd_check_compress_level(level)) {
RETURN_FALSE;
Expand Down Expand Up @@ -552,7 +523,7 @@ ZEND_FUNCTION(zstd_uncompress_dict)
ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_STRING(input, input_len)
Z_PARAM_STRING(dict, dict_len)
ZEND_PARSE_PARAMETERS_END();
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

size = ZSTD_getFrameContentSize(input, input_len);
if (size == 0) {
Expand Down Expand Up @@ -646,7 +617,7 @@ ZEND_FUNCTION(zstd_compress_init)
ZEND_PARSE_PARAMETERS_START(0, 1)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(level)
ZEND_PARSE_PARAMETERS_END();
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

if (!zstd_check_compress_level(level)) {
RETURN_FALSE;
Expand Down Expand Up @@ -692,7 +663,7 @@ ZEND_FUNCTION(zstd_compress_add)
Z_PARAM_STRING(in_buf, in_size)
Z_PARAM_OPTIONAL
Z_PARAM_BOOL(end)
ZEND_PARSE_PARAMETERS_END();
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

#if PHP_VERSION_ID >= 80000
ctx = php_zstd_context_from_obj(obj);
Expand Down Expand Up @@ -762,7 +733,7 @@ ZEND_FUNCTION(zstd_uncompress_add)
Z_PARAM_OBJECT_OF_CLASS(obj, php_zstd_uncompress_context_ce)
#endif
Z_PARAM_STRING(in_buf, in_size)
ZEND_PARSE_PARAMETERS_END();
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);

#if PHP_VERSION_ID >= 80000
ctx = php_zstd_context_from_obj(obj);
Expand Down
Loading