use zend_parse_parameters_none

remicollet · michael-grunder · commit a26b14dbe3ba · 2021-10-05T14:34:58.000-07:00
diff --git a/redis.c b/redis.c
@@ -986,7 +986,7 @@ PHP_MINFO_FUNCTION(redis)
     Public constructor */
 PHP_METHOD(Redis, __construct)
 {
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {
+    if (zend_parse_parameters_none() == FAILURE) {
         RETURN_FALSE;
     }
 }
@@ -996,7 +996,7 @@ PHP_METHOD(Redis, __construct)
     Public Destructor
  */
 PHP_METHOD(Redis,__destruct) {
-    if(zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {
+    if (zend_parse_parameters_none() == FAILURE) {
         RETURN_FALSE;
     }
 
@@ -3488,8 +3488,9 @@ PHP_METHOD(Redis, getAuth) {
     RedisSock *redis_sock;
     zval zret;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE)
+    if (zend_parse_parameters_none() == FAILURE) {
         RETURN_FALSE;
+    }
 
     redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU);
     if (redis_sock == NULL)
diff --git a/redis_commands.c b/redis_commands.c
@@ -3946,7 +3946,8 @@ int
 redis_sentinel_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
                     char *kw, char **cmd, int *cmd_len, short *slot, void **ctx)
 {
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {
+    if (zend_parse_parameters_none() == FAILURE) {
+
         return FAILURE;
     }
     *cmd_len = REDIS_CMD_SPPRINTF(cmd, "SENTINEL", "s", kw, strlen(kw));

Original file line number	Diff line number	Diff line change
`@@ -986,7 +986,7 @@ PHP_MINFO_FUNCTION(redis)`
`986`	`986`	`Public constructor */`
`987`	`987`	`PHP_METHOD(Redis, __construct)`
`988`	`988`	`{`
`989`		`- if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {`
	`989`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`990`	`990`	`RETURN_FALSE;`
`991`	`991`	`}`
`992`	`992`	`}`
`@@ -996,7 +996,7 @@ PHP_METHOD(Redis, __construct)`
`996`	`996`	`Public Destructor`
`997`	`997`	`*/`
`998`	`998`	`PHP_METHOD(Redis,__destruct) {`
`999`		`- if(zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {`
	`999`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`1000`	`1000`	`RETURN_FALSE;`
`1001`	`1001`	`}`
`1002`	`1002`
`@@ -3488,8 +3488,9 @@ PHP_METHOD(Redis, getAuth) {`
`3488`	`3488`	`RedisSock *redis_sock;`
`3489`	`3489`	`zval zret;`
`3490`	`3490`
`3491`		`- if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE)`
	`3491`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`3492`	`3492`	`RETURN_FALSE;`
	`3493`	`+ }`
`3493`	`3494`
`3494`	`3495`	`redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`3495`	`3496`	`if (redis_sock == NULL)`
Original file line number	Diff line number	Diff line change
`@@ -3946,7 +3946,8 @@ int`
`3946`	`3946`	`redis_sentinel_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`3947`	`3947`	`char kw, char cmd, int cmd_len, short slot, void *ctx)`
`3948`	`3948`	`{`
`3949`		`- if (zend_parse_parameters(ZEND_NUM_ARGS(), "") == FAILURE) {`
	`3949`	`+ if (zend_parse_parameters_none() == FAILURE) {`
	`3950`	`+`
`3950`	`3951`	`return FAILURE;`
`3951`	`3952`	`}`
`3952`	`3953`	`*cmd_len = REDIS_CMD_SPPRINTF(cmd, "SENTINEL", "s", kw, strlen(kw));`