Skip to content

Commit 9caa029

Browse files
committed
Add arginfo for some commands
1 parent 659450a commit 9caa029

File tree

1 file changed

+88
-14
lines changed

1 file changed

+88
-14
lines changed

redis.c

Lines changed: 88 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_key, 0, 0, 1)
9494
ZEND_ARG_INFO(0, key)
9595
ZEND_END_ARG_INFO()
9696

97+
ZEND_BEGIN_ARG_INFO_EX(arginfo_value, 0, 0, 1)
98+
ZEND_ARG_INFO(0, value)
99+
ZEND_END_ARG_INFO()
100+
97101
ZEND_BEGIN_ARG_INFO_EX(arginfo_set, 0, 0, 2)
98102
ZEND_ARG_INFO(0, key)
99103
ZEND_ARG_INFO(0, value)
@@ -171,6 +175,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_blrpop, 0, 0, 2)
171175
// Can't have variadic keys before timeout.
172176
#if PHP_VERSION_ID >= 50600
173177
ZEND_ARG_VARIADIC_INFO(0, extra_args)
178+
#else
179+
ZEND_ARG_INFO(0, ...)
174180
#endif
175181
ZEND_END_ARG_INFO()
176182

@@ -224,6 +230,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_nkeys, 0, 0, 1)
224230
ZEND_ARG_INFO(0, key)
225231
#if PHP_VERSION_ID >= 50600
226232
ZEND_ARG_VARIADIC_INFO(0, other_keys)
233+
#else
234+
ZEND_ARG_INFO(0, ...)
227235
#endif
228236
ZEND_END_ARG_INFO()
229237

@@ -232,6 +240,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dst_nkeys, 0, 0, 2)
232240
ZEND_ARG_INFO(0, key)
233241
#if PHP_VERSION_ID >= 50600
234242
ZEND_ARG_VARIADIC_INFO(0, other_keys)
243+
#else
244+
ZEND_ARG_INFO(0, ...)
235245
#endif
236246
ZEND_END_ARG_INFO()
237247

@@ -273,6 +283,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_bitop, 0, 0, 3)
273283
ZEND_ARG_INFO(0, key)
274284
#if PHP_VERSION_ID >= 50600
275285
ZEND_ARG_VARIADIC_INFO(0, other_keys)
286+
#else
287+
ZEND_ARG_INFO(0, ...)
276288
#endif
277289
ZEND_END_ARG_INFO()
278290

@@ -322,6 +334,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_zrem, 0, 0, 2)
322334
ZEND_ARG_INFO(0, member)
323335
#if PHP_VERSION_ID >= 50600
324336
ZEND_ARG_VARIADIC_INFO(0, other_members)
337+
#else
338+
ZEND_ARG_INFO(0, ...)
325339
#endif
326340
ZEND_END_ARG_INFO()
327341

@@ -369,6 +383,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_hdel, 0, 0, 2)
369383
ZEND_ARG_INFO(0, member)
370384
#if PHP_VERSION_ID >= 50600
371385
ZEND_ARG_VARIADIC_INFO(0, other_members)
386+
#else
387+
ZEND_ARG_INFO(0, ...)
372388
#endif
373389
ZEND_END_ARG_INFO()
374390

@@ -404,9 +420,67 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_watch, 0, 0, 1)
404420
ZEND_ARG_INFO(0, key)
405421
#if PHP_VERSION_ID >= 50600
406422
ZEND_ARG_VARIADIC_INFO(0, other_keys)
423+
#else
424+
ZEND_ARG_INFO(0, ...)
425+
#endif
426+
ZEND_END_ARG_INFO()
427+
428+
ZEND_BEGIN_ARG_INFO_EX(arginfo_publish, 0, 0, 2)
429+
ZEND_ARG_INFO(0, channel)
430+
ZEND_ARG_INFO(0, message)
431+
ZEND_END_ARG_INFO()
432+
433+
ZEND_BEGIN_ARG_INFO_EX(arginfo_subscribe, 0, 0, 1)
434+
ZEND_ARG_ARRAY_INFO(0, channels, 0)
435+
ZEND_END_ARG_INFO()
436+
437+
ZEND_BEGIN_ARG_INFO_EX(arginfo_psubscribe, 0, 0, 1)
438+
ZEND_ARG_ARRAY_INFO(0, patterns, 0)
439+
ZEND_END_ARG_INFO()
440+
441+
ZEND_BEGIN_ARG_INFO_EX(arginfo_unsubscribe, 0, 0, 1)
442+
ZEND_ARG_INFO(0, channel)
443+
#if PHP_VERSION_ID >= 50600
444+
ZEND_ARG_VARIADIC_INFO(0, other_channels)
445+
#else
446+
ZEND_ARG_INFO(0, ...)
447+
#endif
448+
ZEND_END_ARG_INFO()
449+
450+
ZEND_BEGIN_ARG_INFO_EX(arginfo_punsubscribe, 0, 0, 1)
451+
ZEND_ARG_INFO(0, pattern)
452+
#if PHP_VERSION_ID >= 50600
453+
ZEND_ARG_VARIADIC_INFO(0, other_patterns)
454+
#else
455+
ZEND_ARG_INFO(0, ...)
456+
#endif
457+
ZEND_END_ARG_INFO()
458+
459+
ZEND_BEGIN_ARG_INFO_EX(arginfo_script, 0, 0, 1)
460+
ZEND_ARG_INFO(0, cmd)
461+
#if PHP_VERSION_ID >= 50600
462+
ZEND_ARG_VARIADIC_INFO(0, args)
463+
#else
464+
ZEND_ARG_INFO(0, ...)
407465
#endif
408466
ZEND_END_ARG_INFO()
409467

468+
ZEND_BEGIN_ARG_INFO_EX(arginfo_restore, 0, 0, 3)
469+
ZEND_ARG_INFO(0, ttl)
470+
ZEND_ARG_INFO(0, key)
471+
ZEND_ARG_INFO(0, value)
472+
ZEND_END_ARG_INFO()
473+
474+
ZEND_BEGIN_ARG_INFO_EX(arginfo_migrate, 0, 0, 5)
475+
ZEND_ARG_INFO(0, host)
476+
ZEND_ARG_INFO(0, port)
477+
ZEND_ARG_INFO(0, key)
478+
ZEND_ARG_INFO(0, db)
479+
ZEND_ARG_INFO(0, timeout)
480+
ZEND_ARG_INFO(0, copy)
481+
ZEND_ARG_INFO(0, replace)
482+
ZEND_END_ARG_INFO()
483+
410484
/**
411485
* Argument info for the SCAN proper
412486
*/
@@ -571,29 +645,29 @@ static zend_function_entry redis_functions[] = {
571645
PHP_ME(Redis, watch, arginfo_watch, ZEND_ACC_PUBLIC)
572646
PHP_ME(Redis, unwatch, arginfo_void, ZEND_ACC_PUBLIC)
573647

574-
PHP_ME(Redis, publish, NULL, ZEND_ACC_PUBLIC)
575-
PHP_ME(Redis, subscribe, NULL, ZEND_ACC_PUBLIC)
576-
PHP_ME(Redis, psubscribe, NULL, ZEND_ACC_PUBLIC)
577-
PHP_ME(Redis, unsubscribe, NULL, ZEND_ACC_PUBLIC)
578-
PHP_ME(Redis, punsubscribe, NULL, ZEND_ACC_PUBLIC)
648+
PHP_ME(Redis, publish, arginfo_publish, ZEND_ACC_PUBLIC)
649+
PHP_ME(Redis, subscribe, arginfo_subscribe, ZEND_ACC_PUBLIC)
650+
PHP_ME(Redis, psubscribe, arginfo_psubscribe, ZEND_ACC_PUBLIC)
651+
PHP_ME(Redis, unsubscribe, arginfo_unsubscribe, ZEND_ACC_PUBLIC)
652+
PHP_ME(Redis, punsubscribe, arginfo_punsubscribe, ZEND_ACC_PUBLIC)
579653

580654
PHP_ME(Redis, time, arginfo_void, ZEND_ACC_PUBLIC)
581-
PHP_ME(Redis, role, NULL, ZEND_ACC_PUBLIC)
655+
PHP_ME(Redis, role, arginfo_void, ZEND_ACC_PUBLIC)
582656
PHP_ME(Redis, eval, arginfo_eval, ZEND_ACC_PUBLIC)
583657
PHP_ME(Redis, evalsha, arginfo_evalsha, ZEND_ACC_PUBLIC)
584-
PHP_ME(Redis, script, NULL, ZEND_ACC_PUBLIC)
658+
PHP_ME(Redis, script, arginfo_script, ZEND_ACC_PUBLIC)
585659

586-
PHP_ME(Redis, debug, NULL, ZEND_ACC_PUBLIC)
587-
PHP_ME(Redis, dump, NULL, ZEND_ACC_PUBLIC)
588-
PHP_ME(Redis, restore, NULL, ZEND_ACC_PUBLIC)
589-
PHP_ME(Redis, migrate, NULL, ZEND_ACC_PUBLIC)
660+
PHP_ME(Redis, debug, arginfo_key, ZEND_ACC_PUBLIC)
661+
PHP_ME(Redis, dump, arginfo_key, ZEND_ACC_PUBLIC)
662+
PHP_ME(Redis, restore, arginfo_restore, ZEND_ACC_PUBLIC)
663+
PHP_ME(Redis, migrate, arginfo_migrate, ZEND_ACC_PUBLIC)
590664

591665
PHP_ME(Redis, getLastError, arginfo_void, ZEND_ACC_PUBLIC)
592666
PHP_ME(Redis, clearLastError, arginfo_void, ZEND_ACC_PUBLIC)
593667

594-
PHP_ME(Redis, _prefix, NULL, ZEND_ACC_PUBLIC)
595-
PHP_ME(Redis, _serialize, NULL, ZEND_ACC_PUBLIC)
596-
PHP_ME(Redis, _unserialize, NULL, ZEND_ACC_PUBLIC)
668+
PHP_ME(Redis, _prefix, arginfo_key, ZEND_ACC_PUBLIC)
669+
PHP_ME(Redis, _serialize, arginfo_value, ZEND_ACC_PUBLIC)
670+
PHP_ME(Redis, _unserialize, arginfo_value, ZEND_ACC_PUBLIC)
597671

598672
PHP_ME(Redis, client, NULL, ZEND_ACC_PUBLIC)
599673
PHP_ME(Redis, command, NULL, ZEND_ACC_PUBLIC)

0 commit comments

Comments
 (0)