More arginfo for RedisCluster

This commit finally fixes issue #1055

1 files changed, 86 insertions, 77 deletions

diff --git a/redis_cluster.c b/redis_cluster.c
index b4d4068e..a431dc32 100644
--- a/redis_cluster.c
+++ b/redis_cluster.c
@@ -65,6 +65,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_keys, 0, 0, 1)
     ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_cluster, 0, 0, 1)
+    ZEND_ARG_INFO(0, arg)
+#if PHP_VERSION_ID >= 50600
+    ZEND_ARG_VARIADIC_INFO(0, other_args)
+#else
+    ZEND_ARG_INFO(0, ...)
+#endif
+ZEND_END_ARG_INFO()
+
 /* Argument info for HSCAN, SSCAN, HSCAN */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_kscan_cl, 0, 0, 2)
     ZEND_ARG_INFO(0, str_key)
@@ -132,76 +141,76 @@ zend_function_entry redis_cluster_functions[] = {
     PHP_ME(RedisCluster, ttl, arginfo_key, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, pttl, arginfo_key, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, zcard, arginfo_key, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zcount, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zremrangebyscore, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zscore, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zadd, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zincrby, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zcount, arginfo_key_min_max, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zremrangebyscore, arginfo_key_min_max, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zscore, arginfo_key_member, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zadd, arginfo_zadd, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zincrby, arginfo_zincrby, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, hlen, arginfo_key, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, hkeys, arginfo_key, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, hvals, arginfo_key, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hget, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hget, arginfo_key_member, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, hgetall, arginfo_key, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hexists, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hincrby, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hset, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hsetnx, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hmget, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hmset, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hdel, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hincrbyfloat, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, hstrlen, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hexists, arginfo_key_member, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hincrby, arginfo_key_member_value, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hset, arginfo_key_member_value, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hsetnx, arginfo_key_member_value, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hmget, arginfo_hmget, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hmset, arginfo_hmset, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hdel, arginfo_key_members, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hincrbyfloat, arginfo_key_member_value, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, hstrlen, arginfo_key_member, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, dump, arginfo_key, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrank, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrevrank, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrank, arginfo_key_member, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrevrank, arginfo_key_member, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, incr, arginfo_key, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, decr, arginfo_key, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, incrby, arginfo_key_value, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, decrby, arginfo_key_value, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, incrbyfloat, arginfo_key_value, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, expire, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, pexpire, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, expireat, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, pexpireat, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, expire, arginfo_expire, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, pexpire, arginfo_key_timestamp, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, expireat, arginfo_key_timestamp, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, pexpireat, arginfo_key_timestamp, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, append, arginfo_key_value, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, getbit, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, setbit, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, bitop, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, bitpos, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, getbit, arginfo_key_offset, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, setbit, arginfo_key_offset_value, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, bitop, arginfo_bitop, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, bitpos, arginfo_bitpos, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, bitcount, arginfo_key, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, lget, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, getrange, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, ltrim, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, lrange, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zremrangebyrank, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, publish, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, rename, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, renamenx, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, pfcount, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, pfadd, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, pfmerge, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, setrange, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, restore, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, smove, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrange, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrevrange, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrangebyscore, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrevrangebyscore, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrangebylex, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrevrangebylex, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zlexcount, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zremrangebylex, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zunionstore, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zinterstore, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, zrem, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, sort, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, object, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, subscribe, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, psubscribe, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, unsubscribe, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, punsubscribe, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, eval, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, evalsha, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, lget, arginfo_lindex, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, getrange, arginfo_key_start_end, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, ltrim, arginfo_ltrim, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, lrange, arginfo_key_start_end, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zremrangebyrank, arginfo_key_min_max, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, publish, arginfo_publish, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, rename, arginfo_key_newkey, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, renamenx, arginfo_key_newkey, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, pfcount, arginfo_key, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, pfadd, arginfo_pfadd, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, pfmerge, arginfo_pfmerge, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, setrange, arginfo_key_offset_value, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, restore, arginfo_restore, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, smove, arginfo_smove, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrange, arginfo_zrange, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrevrange, arginfo_zrange, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrangebyscore, arginfo_zrangebyscore, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrevrangebyscore, arginfo_zrangebyscore, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrangebylex, arginfo_zrangebylex, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrevrangebylex, arginfo_zrangebylex, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zlexcount, arginfo_key_min_max, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zremrangebylex, arginfo_key_min_max, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zunionstore, arginfo_zstore, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zinterstore, arginfo_zstore, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, zrem, arginfo_key_members, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, sort, arginfo_sort, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, object, arginfo_object, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, subscribe, arginfo_subscribe, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, psubscribe, arginfo_psubscribe, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, unsubscribe, arginfo_unsubscribe, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, punsubscribe, arginfo_punsubscribe, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, eval, arginfo_eval, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, evalsha, arginfo_evalsha, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, scan, arginfo_scan_cl, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, sscan, arginfo_kscan_cl, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, zscan, arginfo_kscan_cl, ZEND_ACC_PUBLIC)
@@ -210,8 +219,8 @@ zend_function_entry redis_cluster_functions[] = {
     PHP_ME(RedisCluster, getmode, arginfo_void, ZEND_ACC_PUBLIC) 
     PHP_ME(RedisCluster, getlasterror, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, clearlasterror, arginfo_void, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, getoption, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, setoption, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, getoption, arginfo_getoption, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, setoption, arginfo_setoption, ZEND_ACC_PUBLIC)
     
     PHP_ME(RedisCluster, _prefix, arginfo_key, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, _serialize, arginfo_value, ZEND_ACC_PUBLIC)
@@ -222,7 +231,7 @@ zend_function_entry redis_cluster_functions[] = {
     PHP_ME(RedisCluster, multi, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, exec, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, discard, arginfo_void, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, watch, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, watch, arginfo_watch, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, unwatch, arginfo_void, ZEND_ACC_PUBLIC)
 
     PHP_ME(RedisCluster, save, arginfo_void, ZEND_ACC_PUBLIC)
@@ -230,28 +239,28 @@ zend_function_entry redis_cluster_functions[] = {
     PHP_ME(RedisCluster, flushdb, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, flushall, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, dbsize, arginfo_void, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, bgrewriteaof, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, bgrewriteaof, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, lastsave, arginfo_void, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, info, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, info, arginfo_info, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, role, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, time, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, randomkey, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, ping, arginfo_void, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, echo, arginfo_echo, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, command, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, rawcommand, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, cluster, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, client, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, config, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, pubsub, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, script, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, slowlog, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, geoadd, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, geohash, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, geopos, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, geodist, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, georadius, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(RedisCluster, georadiusbymember, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, command, arginfo_command, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, rawcommand, arginfo_rawcommand, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, cluster, arginfo_cluster, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, client, arginfo_client, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, config, arginfo_config, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, pubsub, arginfo_pubsub, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, script, arginfo_script, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, slowlog, arginfo_slowlog, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, geoadd, arginfo_geoadd, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, geohash, arginfo_key_members, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, geopos, arginfo_key_members, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, geodist, arginfo_geodist, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, georadius, arginfo_georadius, ZEND_ACC_PUBLIC)
+    PHP_ME(RedisCluster, georadiusbymember, arginfo_georadiusbymember, ZEND_ACC_PUBLIC)
     PHP_FE_END
 };