Skip to content

Commit f116be9

Browse files
committed
Add arginfo for some commands
1 parent 5c111dd commit f116be9

File tree

1 file changed

+39
-25
lines changed

1 file changed

+39
-25
lines changed

redis.c

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ ZEND_END_ARG_INFO()
401401
ZEND_BEGIN_ARG_INFO_EX(arginfo_zstore, 0, 0, 2)
402402
ZEND_ARG_INFO(0, key)
403403
ZEND_ARG_ARRAY_INFO(0, keys, 0)
404-
ZEND_ARG_ARRAY_INFO(0, weights, 0)
404+
ZEND_ARG_ARRAY_INFO(0, weights, 1)
405405
ZEND_ARG_INFO(0, aggregate)
406406
ZEND_END_ARG_INFO()
407407

@@ -537,6 +537,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_rawcommand, 0, 0, 1)
537537
#endif
538538
ZEND_END_ARG_INFO()
539539

540+
ZEND_BEGIN_ARG_INFO_EX(arginfo_pubsub, 0, 0, 1)
541+
ZEND_ARG_INFO(0, cmd)
542+
#if PHP_VERSION_ID >= 50600
543+
ZEND_ARG_VARIADIC_INFO(0, args)
544+
#else
545+
ZEND_ARG_INFO(0, ...)
546+
#endif
547+
ZEND_END_ARG_INFO()
548+
549+
ZEND_BEGIN_ARG_INFO_EX(arginfo_wait, 0, 0, 2)
550+
ZEND_ARG_INFO(0, numslaves)
551+
ZEND_ARG_INFO(0, timeout)
552+
ZEND_END_ARG_INFO()
553+
540554
/**
541555
* Argument info for the SCAN proper
542556
*/
@@ -770,38 +784,38 @@ static zend_function_entry redis_functions[] = {
770784
PHP_ME(Redis, getAuth, arginfo_void, ZEND_ACC_PUBLIC)
771785
PHP_ME(Redis, isConnected, arginfo_void, ZEND_ACC_PUBLIC)
772786
/* TODO: document getMode() and wait() in README? */
773-
PHP_ME(Redis, getMode, NULL, ZEND_ACC_PUBLIC)
774-
PHP_ME(Redis, wait, NULL, ZEND_ACC_PUBLIC)
775-
PHP_ME(Redis, pubsub, NULL, ZEND_ACC_PUBLIC)
787+
PHP_ME(Redis, getMode, arginfo_void, ZEND_ACC_PUBLIC)
788+
PHP_ME(Redis, wait, arginfo_wait, ZEND_ACC_PUBLIC)
789+
PHP_ME(Redis, pubsub, arginfo_pubsub, ZEND_ACC_PUBLIC)
776790

777791
/* aliases */
778792
PHP_MALIAS(Redis, open, connect, arginfo_connect, ZEND_ACC_PUBLIC)
779793
PHP_MALIAS(Redis, popen, pconnect, arginfo_pconnect, ZEND_ACC_PUBLIC)
780-
PHP_MALIAS(Redis, lLen, lSize, NULL, ZEND_ACC_PUBLIC)
781-
PHP_MALIAS(Redis, sGetMembers, sMembers, NULL, ZEND_ACC_PUBLIC)
794+
PHP_MALIAS(Redis, lLen, lSize, arginfo_key, ZEND_ACC_PUBLIC)
795+
PHP_MALIAS(Redis, sGetMembers, sMembers, arginfo_key, ZEND_ACC_PUBLIC)
782796
PHP_MALIAS(Redis, mget, getMultiple, arginfo_mget, ZEND_ACC_PUBLIC)
783-
PHP_MALIAS(Redis, expire, setTimeout, NULL, ZEND_ACC_PUBLIC)
784-
PHP_MALIAS(Redis, zunionstore, zUnion, NULL, ZEND_ACC_PUBLIC)
785-
PHP_MALIAS(Redis, zinterstore, zInter, NULL, ZEND_ACC_PUBLIC)
786-
787-
PHP_MALIAS(Redis, zRemove, zDelete, NULL, ZEND_ACC_PUBLIC)
788-
PHP_MALIAS(Redis, zRem, zDelete, NULL, ZEND_ACC_PUBLIC)
789-
PHP_MALIAS(Redis, zRemoveRangeByScore, zDeleteRangeByScore, NULL, ZEND_ACC_PUBLIC)
790-
PHP_MALIAS(Redis, zRemRangeByScore, zDeleteRangeByScore, NULL, ZEND_ACC_PUBLIC)
791-
PHP_MALIAS(Redis, zRemRangeByRank, zDeleteRangeByRank, NULL, ZEND_ACC_PUBLIC)
792-
PHP_MALIAS(Redis, zSize, zCard, NULL, ZEND_ACC_PUBLIC)
797+
PHP_MALIAS(Redis, expire, setTimeout, arginfo_set_timeout, ZEND_ACC_PUBLIC)
798+
PHP_MALIAS(Redis, zunionstore, zUnion, arginfo_zstore, ZEND_ACC_PUBLIC)
799+
PHP_MALIAS(Redis, zinterstore, zInter, arginfo_zstore, ZEND_ACC_PUBLIC)
800+
801+
PHP_MALIAS(Redis, zRemove, zDelete, arginfo_zrem, ZEND_ACC_PUBLIC)
802+
PHP_MALIAS(Redis, zRem, zDelete, arginfo_zrem, ZEND_ACC_PUBLIC)
803+
PHP_MALIAS(Redis, zRemoveRangeByScore, zDeleteRangeByScore, arginfo_key_min_max, ZEND_ACC_PUBLIC)
804+
PHP_MALIAS(Redis, zRemRangeByScore, zDeleteRangeByScore, arginfo_key_min_max, ZEND_ACC_PUBLIC)
805+
PHP_MALIAS(Redis, zRemRangeByRank, zDeleteRangeByRank, arginfo_key_min_max, ZEND_ACC_PUBLIC)
806+
PHP_MALIAS(Redis, zSize, zCard, arginfo_key, ZEND_ACC_PUBLIC)
793807
PHP_MALIAS(Redis, substr, getRange, arginfo_key_start_end, ZEND_ACC_PUBLIC)
794808
PHP_MALIAS(Redis, rename, renameKey, arginfo_key_newkey, ZEND_ACC_PUBLIC)
795809
PHP_MALIAS(Redis, del, delete, arginfo_del, ZEND_ACC_PUBLIC)
796-
PHP_MALIAS(Redis, keys, getKeys, NULL, ZEND_ACC_PUBLIC)
797-
PHP_MALIAS(Redis, lrem, lRemove, NULL, ZEND_ACC_PUBLIC)
798-
PHP_MALIAS(Redis, ltrim, listTrim, NULL, ZEND_ACC_PUBLIC)
799-
PHP_MALIAS(Redis, lindex, lGet, NULL, ZEND_ACC_PUBLIC)
800-
PHP_MALIAS(Redis, lrange, lGetRange, NULL, ZEND_ACC_PUBLIC)
801-
PHP_MALIAS(Redis, scard, sSize, NULL, ZEND_ACC_PUBLIC)
802-
PHP_MALIAS(Redis, srem, sRemove, NULL, ZEND_ACC_PUBLIC)
803-
PHP_MALIAS(Redis, sismember, sContains, NULL, ZEND_ACC_PUBLIC)
804-
PHP_MALIAS(Redis, zReverseRange, zRevRange, NULL, ZEND_ACC_PUBLIC)
810+
PHP_MALIAS(Redis, keys, getKeys, arginfo_keys, ZEND_ACC_PUBLIC)
811+
PHP_MALIAS(Redis, lrem, lRemove, arginfo_lrem, ZEND_ACC_PUBLIC)
812+
PHP_MALIAS(Redis, ltrim, listTrim, arginfo_ltrim, ZEND_ACC_PUBLIC)
813+
PHP_MALIAS(Redis, lindex, lGet, arginfo_lget, ZEND_ACC_PUBLIC)
814+
PHP_MALIAS(Redis, lrange, lGetRange, arginfo_key_start_end, ZEND_ACC_PUBLIC)
815+
PHP_MALIAS(Redis, scard, sSize, arginfo_key, ZEND_ACC_PUBLIC)
816+
PHP_MALIAS(Redis, srem, sRemove, arginfo_key_value, ZEND_ACC_PUBLIC)
817+
PHP_MALIAS(Redis, sismember, sContains, arginfo_key_value, ZEND_ACC_PUBLIC)
818+
PHP_MALIAS(Redis, zReverseRange, zRevRange, arginfo_zrange, ZEND_ACC_PUBLIC)
805819

806820
PHP_MALIAS(Redis, sendEcho, echo, arginfo_echo, ZEND_ACC_PUBLIC)
807821

0 commit comments

Comments
 (0)