Sitelet https://github.com/phpredis/phpredis/commit/e5660be
Skip to content

Commit e5660be

Browse files
yatsukhnenkoyatsukhnenko
committed
More arginfo for RedisCluster + remove duplicates
1 parent 3c60e1f commit e5660be

4 files changed

Lines changed: 22 additions & 37 deletions

File tree

‎common.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,4 +681,21 @@ typedef struct {
681681
} redis_object;
682682
#endif
683683

684+
/** Argument info for any function expecting 0 args */
685+
ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
686+
ZEND_END_ARG_INFO()
687+
688+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key, 0, 0, 1)
689+
ZEND_ARG_INFO(0, key)
690+
ZEND_END_ARG_INFO()
691+
692+
ZEND_BEGIN_ARG_INFO_EX(arginfo_value, 0, 0, 1)
693+
ZEND_ARG_INFO(0, value)
694+
ZEND_END_ARG_INFO()
695+
696+
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_value, 0, 0, 2)
697+
ZEND_ARG_INFO(0, key)
698+
ZEND_ARG_INFO(0, value)
699+
ZEND_END_ARG_INFO()
700+
684701
#endif

‎redis.c‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ PHP_INI_BEGIN()
6868
PHP_INI_ENTRY("redis.clusters.read_timeout", "", PHP_INI_ALL, NULL)
6969
PHP_INI_END()
7070

71-
/** Argument info for any function expecting 0 args */
72-
ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
73-
ZEND_END_ARG_INFO()
74-
7571
/** {{{ Argument info for commands in redis 1.0 */
7672
ZEND_BEGIN_ARG_INFO_EX(arginfo_connect, 0, 0, 2)
7773
ZEND_ARG_INFO(0, host)
@@ -90,14 +86,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_echo, 0, 0, 1)
9086
ZEND_ARG_INFO(0, msg)
9187
ZEND_END_ARG_INFO()
9288

93-
ZEND_BEGIN_ARG_INFO_EX(arginfo_key, 0, 0, 1)
94-
ZEND_ARG_INFO(0, key)
95-
ZEND_END_ARG_INFO()
96-
97-
ZEND_BEGIN_ARG_INFO_EX(arginfo_value, 0, 0, 1)
98-
ZEND_ARG_INFO(0, value)
99-
ZEND_END_ARG_INFO()
100-
10189
ZEND_BEGIN_ARG_INFO_EX(arginfo_set, 0, 0, 2)
10290
ZEND_ARG_INFO(0, key)
10391
ZEND_ARG_INFO(0, value)
@@ -111,11 +99,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_key_expire_value, 0, 0, 3)
11199
ZEND_ARG_INFO(0, value)
112100
ZEND_END_ARG_INFO()
113101

114-
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_value, 0, 0, 2)
115-
ZEND_ARG_INFO(0, key)
116-
ZEND_ARG_INFO(0, value)
117-
ZEND_END_ARG_INFO()
118-
119102
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_newkey, 0, 0, 2)
120103
ZEND_ARG_INFO(0, key)
121104
ZEND_ARG_INFO(0, newkey)

‎redis_array.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
extern zend_class_entry *redis_ce;
4242
zend_class_entry *redis_array_ce;
4343

44-
ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
45-
ZEND_END_ARG_INFO()
46-
4744
ZEND_BEGIN_ARG_INFO_EX(arginfo_ctor, 0, 0, 1)
4845
ZEND_ARG_INFO(0, name_or_hosts)
4946
ZEND_ARG_ARRAY_INFO(0, options, 0)

‎redis_cluster.c‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,6 @@ zend_class_entry *redis_cluster_exception_ce;
4040
/* Handlers for RedisCluster */
4141
zend_object_handlers RedisCluster_handlers;
4242

43-
ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
44-
ZEND_END_ARG_INFO()
45-
46-
ZEND_BEGIN_ARG_INFO_EX(arginfo_key, 0, 0, 1)
47-
ZEND_ARG_INFO(0, key)
48-
ZEND_END_ARG_INFO()
49-
50-
ZEND_BEGIN_ARG_INFO_EX(arginfo_key_value, 0, 0, 2)
51-
ZEND_ARG_INFO(0, key)
52-
ZEND_ARG_INFO(0, value)
53-
ZEND_END_ARG_INFO()
54-
5543
ZEND_BEGIN_ARG_INFO_EX(arginfo_ctor, 0, 0, 1)
5644
ZEND_ARG_INFO(0, name)
5745
ZEND_ARG_ARRAY_INFO(0, seeds, 0)
@@ -208,11 +196,11 @@ zend_function_entry redis_cluster_functions[] = {
208196
PHP_ME(RedisCluster, getoption, NULL, ZEND_ACC_PUBLIC)
209197
PHP_ME(RedisCluster, setoption, NULL, ZEND_ACC_PUBLIC)
210198

211-
PHP_ME(RedisCluster, _prefix, NULL, ZEND_ACC_PUBLIC)
212-
PHP_ME(RedisCluster, _serialize, NULL, ZEND_ACC_PUBLIC)
213-
PHP_ME(RedisCluster, _unserialize, NULL, ZEND_ACC_PUBLIC)
214-
PHP_ME(RedisCluster, _masters, NULL, ZEND_ACC_PUBLIC)
215-
PHP_ME(RedisCluster, _redir, NULL, ZEND_ACC_PUBLIC)
199+
PHP_ME(RedisCluster, _prefix, arginfo_key, ZEND_ACC_PUBLIC)
200+
PHP_ME(RedisCluster, _serialize, arginfo_value, ZEND_ACC_PUBLIC)
201+
PHP_ME(RedisCluster, _unserialize, arginfo_value, ZEND_ACC_PUBLIC)
202+
PHP_ME(RedisCluster, _masters, arginfo_void, ZEND_ACC_PUBLIC)
203+
PHP_ME(RedisCluster, _redir, arginfo_void, ZEND_ACC_PUBLIC)
216204

217205
PHP_ME(RedisCluster, multi, arginfo_void, ZEND_ACC_PUBLIC)
218206
PHP_ME(RedisCluster, exec, arginfo_void, ZEND_ACC_PUBLIC)

0 commit comments

Comments
 (0)