Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e392dd8

Browse files
michael-grundermichael-grunder
authored
RedisCluster stub fixes (#2183)
RedisCluster stub fixes I can now run RedisCluster unit tests within a PHP build tree build in debug mode without any deprecation warnings or arginfo/zpp errors.
1 parent 8b1eafe commit e392dd8

9 files changed

Lines changed: 453 additions & 379 deletions

‎redis.stub.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,7 @@ public function script(string $command, mixed ...$args): mixed;
408408

409409
public function select(int $db): Redis|bool;
410410

411-
/** @return bool|Redis */
412-
public function set(string $key, mixed $value, mixed $opt = NULL);
411+
public function set(string $key, mixed $value, mixed $opt = NULL): Redis|string|bool;
413412

414413
/** @return Redis|int|false*/
415414
public function setBit(string $key, int $idx, bool $value);
@@ -432,7 +431,7 @@ public function slaveof(string $host = null, int $port = 6379): bool;
432431

433432
public function slowlog(string $mode, int $option = 0): mixed;
434433

435-
public function sort(string $key, array $options = null): mixed;
434+
public function sort(string $key, ?array $options = null): mixed;
436435

437436
/**
438437
* @deprecated

‎redis_arginfo.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 6d0479328ae627b9c45104a52014b3649e533015 */
2+
* Stub hash: 1810caef11b38440e073059e2d9c65f92fa8a9a5 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
55
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
@@ -744,7 +744,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_select, 0, 1, Re
744744
ZEND_ARG_TYPE_INFO(0, db, IS_LONG, 0)
745745
ZEND_END_ARG_INFO()
746746

747-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis_set, 0, 0, 2)
747+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_set, 0, 2, Redis, MAY_BE_STRING|MAY_BE_BOOL)
748748
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
749749
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
750750
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, opt, IS_MIXED, 0, "NULL")
@@ -788,7 +788,7 @@ ZEND_END_ARG_INFO()
788788

789789
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_sort, 0, 1, IS_MIXED, 0)
790790
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
791-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
791+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
792792
ZEND_END_ARG_INFO()
793793

794794
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_sortAsc, 0, 1, IS_ARRAY, 0)

‎redis_cluster.c‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,6 +1844,16 @@ PHP_METHOD(RedisCluster, _redir) {
18441844
/* {{{ proto bool RedisCluster::multi() */
18451845
PHP_METHOD(RedisCluster, multi) {
18461846
redisCluster *c = GET_CONTEXT();
1847+
zend_long value = MULTI;
1848+
1849+
ZEND_PARSE_PARAMETERS_START(0, 1)
1850+
Z_PARAM_OPTIONAL
1851+
Z_PARAM_LONG(value)
1852+
ZEND_PARSE_PARAMETERS_END();
1853+
1854+
if (value != MULTI) {
1855+
php_error_docref(NULL, E_WARNING, "RedisCluster does not support PIPELINING");
1856+
}
18471857

18481858
if (c->flags->mode == MULTI) {
18491859
php_error_docref(NULL, E_WARNING,

‎redis_cluster.stub.php‎

Lines changed: 161 additions & 159 deletions
Large diffs are not rendered by default.

‎redis_cluster_arginfo.h‎

Lines changed: 208 additions & 164 deletions
Large diffs are not rendered by default.

‎redis_cluster_legacy_arginfo.h‎

Lines changed: 57 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 59682d20ee8ebad4f8a5c914432f41dac0860770 */
2+
* Stub hash: 280323a9e3fc028641ad1d8bcba2514dfa90fac9 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster___construct, 0, 0, 1)
55
ZEND_ARG_INFO(0, name)
@@ -55,6 +55,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_bitcount, 0, 0, 1)
5555
ZEND_ARG_INFO(0, key)
5656
ZEND_ARG_INFO(0, start)
5757
ZEND_ARG_INFO(0, end)
58+
ZEND_ARG_INFO(0, bybit)
5859
ZEND_END_ARG_INFO()
5960

6061
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_bitop, 0, 0, 3)
@@ -108,7 +109,7 @@ ZEND_END_ARG_INFO()
108109

109110
#define arginfo_class_RedisCluster_clearlasterror arginfo_class_RedisCluster__masters
110111

111-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_client, 0, 0, 3)
112+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_client, 0, 0, 2)
112113
ZEND_ARG_INFO(0, node)
113114
ZEND_ARG_INFO(0, subcommand)
114115
ZEND_ARG_INFO(0, arg)
@@ -134,7 +135,10 @@ ZEND_END_ARG_INFO()
134135

135136
#define arginfo_class_RedisCluster_dbsize arginfo_class_RedisCluster_bgrewriteaof
136137

137-
#define arginfo_class_RedisCluster_decr arginfo_class_RedisCluster__prefix
138+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_decr, 0, 0, 1)
139+
ZEND_ARG_INFO(0, key)
140+
ZEND_ARG_INFO(0, by)
141+
ZEND_END_ARG_INFO()
138142

139143
#define arginfo_class_RedisCluster_decrby arginfo_class_RedisCluster_append
140144

@@ -168,7 +172,7 @@ ZEND_END_ARG_INFO()
168172

169173
#define arginfo_class_RedisCluster_exec arginfo_class_RedisCluster__masters
170174

171-
#define arginfo_class_RedisCluster_exists arginfo_class_RedisCluster__prefix
175+
#define arginfo_class_RedisCluster_exists arginfo_class_RedisCluster_del
172176

173177
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_expire, 0, 0, 2)
174178
ZEND_ARG_INFO(0, key)
@@ -286,7 +290,7 @@ ZEND_END_ARG_INFO()
286290

287291
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_hmget, 0, 0, 2)
288292
ZEND_ARG_INFO(0, key)
289-
ZEND_ARG_INFO(0, members)
293+
ZEND_ARG_INFO(0, keys)
290294
ZEND_END_ARG_INFO()
291295

292296
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_hmset, 0, 0, 2)
@@ -312,7 +316,7 @@ ZEND_END_ARG_INFO()
312316

313317
#define arginfo_class_RedisCluster_hvals arginfo_class_RedisCluster__prefix
314318

315-
#define arginfo_class_RedisCluster_incr arginfo_class_RedisCluster__prefix
319+
#define arginfo_class_RedisCluster_incr arginfo_class_RedisCluster_decr
316320

317321
#define arginfo_class_RedisCluster_incrby arginfo_class_RedisCluster_append
318322

@@ -362,10 +366,10 @@ ZEND_END_ARG_INFO()
362366

363367
#define arginfo_class_RedisCluster_lrange arginfo_class_RedisCluster_getrange
364368

365-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_lrem, 0, 0, 3)
369+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_lrem, 0, 0, 2)
366370
ZEND_ARG_INFO(0, key)
367-
ZEND_ARG_INFO(0, count)
368371
ZEND_ARG_INFO(0, value)
372+
ZEND_ARG_INFO(0, count)
369373
ZEND_END_ARG_INFO()
370374

371375
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_lset, 0, 0, 3)
@@ -386,7 +390,9 @@ ZEND_END_ARG_INFO()
386390

387391
#define arginfo_class_RedisCluster_msetnx arginfo_class_RedisCluster_mset
388392

389-
#define arginfo_class_RedisCluster_multi arginfo_class_RedisCluster__masters
393+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_multi, 0, 0, 0)
394+
ZEND_ARG_INFO(0, value)
395+
ZEND_END_ARG_INFO()
390396

391397
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_object, 0, 0, 2)
392398
ZEND_ARG_INFO(0, subcommand)
@@ -406,12 +412,9 @@ ZEND_END_ARG_INFO()
406412

407413
#define arginfo_class_RedisCluster_pfcount arginfo_class_RedisCluster__prefix
408414

409-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_pfmerge, 0, 0, 2)
410-
ZEND_ARG_INFO(0, key)
411-
ZEND_ARG_INFO(0, keys)
412-
ZEND_END_ARG_INFO()
415+
#define arginfo_class_RedisCluster_pfmerge arginfo_class_RedisCluster_hmget
413416

414-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_ping, 0, 0, 2)
417+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_ping, 0, 0, 1)
415418
ZEND_ARG_INFO(0, key_or_address)
416419
ZEND_ARG_INFO(0, message)
417420
ZEND_END_ARG_INFO()
@@ -453,12 +456,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_rawcommand, 0, 0, 2)
453456
ZEND_END_ARG_INFO()
454457

455458
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_rename, 0, 0, 2)
459+
ZEND_ARG_INFO(0, key_src)
460+
ZEND_ARG_INFO(0, key_dst)
461+
ZEND_END_ARG_INFO()
462+
463+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_renamenx, 0, 0, 2)
456464
ZEND_ARG_INFO(0, key)
457465
ZEND_ARG_INFO(0, newkey)
458466
ZEND_END_ARG_INFO()
459467

460-
#define arginfo_class_RedisCluster_renamenx arginfo_class_RedisCluster_rename
461-
462468
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_restore, 0, 0, 3)
463469
ZEND_ARG_INFO(0, key)
464470
ZEND_ARG_INFO(0, timeout)
@@ -475,7 +481,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_rpoplpush, 0, 0, 2)
475481
ZEND_ARG_INFO(0, dst)
476482
ZEND_END_ARG_INFO()
477483

478-
#define arginfo_class_RedisCluster_rpush arginfo_class_RedisCluster_lpush
484+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_rpush, 0, 0, 1)
485+
ZEND_ARG_INFO(0, key)
486+
ZEND_ARG_VARIADIC_INFO(0, elements)
487+
ZEND_END_ARG_INFO()
479488

480489
#define arginfo_class_RedisCluster_rpushx arginfo_class_RedisCluster_append
481490

@@ -510,7 +519,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_sdiffstore, 0, 0, 2)
510519
ZEND_ARG_VARIADIC_INFO(0, other_keys)
511520
ZEND_END_ARG_INFO()
512521

513-
#define arginfo_class_RedisCluster_set arginfo_class_RedisCluster_append
522+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_set, 0, 0, 2)
523+
ZEND_ARG_INFO(0, key)
524+
ZEND_ARG_INFO(0, value)
525+
ZEND_ARG_INFO(0, options)
526+
ZEND_END_ARG_INFO()
514527

515528
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_setbit, 0, 0, 3)
516529
ZEND_ARG_INFO(0, key)
@@ -520,11 +533,11 @@ ZEND_END_ARG_INFO()
520533

521534
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_setex, 0, 0, 3)
522535
ZEND_ARG_INFO(0, key)
536+
ZEND_ARG_INFO(0, expire)
523537
ZEND_ARG_INFO(0, value)
524-
ZEND_ARG_INFO(0, timeout)
525538
ZEND_END_ARG_INFO()
526539

527-
#define arginfo_class_RedisCluster_setnx arginfo_class_RedisCluster_setex
540+
#define arginfo_class_RedisCluster_setnx arginfo_class_RedisCluster_append
528541

529542
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_setoption, 0, 0, 2)
530543
ZEND_ARG_INFO(0, option)
@@ -544,9 +557,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_sintercard, 0, 0, 1)
544557
ZEND_ARG_INFO(0, limit)
545558
ZEND_END_ARG_INFO()
546559

547-
#define arginfo_class_RedisCluster_sinterstore arginfo_class_RedisCluster_sdiffstore
560+
#define arginfo_class_RedisCluster_sinterstore arginfo_class_RedisCluster_del
548561

549-
#define arginfo_class_RedisCluster_sismember arginfo_class_RedisCluster__prefix
562+
#define arginfo_class_RedisCluster_sismember arginfo_class_RedisCluster_append
550563

551564
#define arginfo_class_RedisCluster_slowlog arginfo_class_RedisCluster_script
552565

@@ -558,24 +571,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_smove, 0, 0, 3)
558571
ZEND_ARG_INFO(0, member)
559572
ZEND_END_ARG_INFO()
560573

561-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_sort, 0, 0, 2)
574+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_sort, 0, 0, 1)
562575
ZEND_ARG_INFO(0, key)
563576
ZEND_ARG_INFO(0, options)
564577
ZEND_END_ARG_INFO()
565578

566-
#define arginfo_class_RedisCluster_spop arginfo_class_RedisCluster__prefix
579+
#define arginfo_class_RedisCluster_spop arginfo_class_RedisCluster_lpop
567580

568581
#define arginfo_class_RedisCluster_srandmember arginfo_class_RedisCluster_lpop
569582

570583
#define arginfo_class_RedisCluster_srem arginfo_class_RedisCluster_lpush
571584

572-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_sscan, 0, 0, 3)
573-
ZEND_ARG_INFO(0, key)
574-
ZEND_ARG_INFO(1, iterator)
575-
ZEND_ARG_INFO(0, node)
576-
ZEND_ARG_INFO(0, pattern)
577-
ZEND_ARG_INFO(0, count)
578-
ZEND_END_ARG_INFO()
585+
#define arginfo_class_RedisCluster_sscan arginfo_class_RedisCluster_hscan
579586

580587
#define arginfo_class_RedisCluster_strlen arginfo_class_RedisCluster__prefix
581588

@@ -689,11 +696,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_xtrim, 0, 0, 2)
689696
ZEND_ARG_INFO(0, limit)
690697
ZEND_END_ARG_INFO()
691698

692-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_zadd, 0, 0, 3)
699+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_zadd, 0, 0, 2)
693700
ZEND_ARG_INFO(0, key)
694-
ZEND_ARG_INFO(0, score)
695-
ZEND_ARG_INFO(0, member)
696-
ZEND_ARG_VARIADIC_INFO(0, extra_args)
701+
ZEND_ARG_INFO(0, score_or_options)
702+
ZEND_ARG_VARIADIC_INFO(0, more_scores_and_mems)
697703
ZEND_END_ARG_INFO()
698704

699705
#define arginfo_class_RedisCluster_zcard arginfo_class_RedisCluster__prefix
@@ -707,7 +713,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_zincrby, 0, 0, 3)
707713
ZEND_END_ARG_INFO()
708714

709715
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_zinterstore, 0, 0, 2)
710-
ZEND_ARG_INFO(0, key)
716+
ZEND_ARG_INFO(0, dst)
711717
ZEND_ARG_INFO(0, keys)
712718
ZEND_ARG_INFO(0, weights)
713719
ZEND_ARG_INFO(0, aggregate)
@@ -732,12 +738,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_zrange, 0, 0, 3)
732738
ZEND_ARG_INFO(0, key)
733739
ZEND_ARG_INFO(0, start)
734740
ZEND_ARG_INFO(0, end)
735-
ZEND_ARG_INFO(0, options)
741+
ZEND_ARG_INFO(0, options_withscores)
736742
ZEND_END_ARG_INFO()
737743

738-
#define arginfo_class_RedisCluster_zrangebylex arginfo_class_RedisCluster_zrange
744+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_zrangebylex, 0, 0, 3)
745+
ZEND_ARG_INFO(0, key)
746+
ZEND_ARG_INFO(0, min)
747+
ZEND_ARG_INFO(0, max)
748+
ZEND_ARG_INFO(0, offset)
749+
ZEND_ARG_INFO(0, count)
750+
ZEND_END_ARG_INFO()
739751

740-
#define arginfo_class_RedisCluster_zrangebyscore arginfo_class_RedisCluster_zrange
752+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_zrangebyscore, 0, 0, 3)
753+
ZEND_ARG_INFO(0, key)
754+
ZEND_ARG_INFO(0, start)
755+
ZEND_ARG_INFO(0, end)
756+
ZEND_ARG_INFO(0, options)
757+
ZEND_END_ARG_INFO()
741758

742759
#define arginfo_class_RedisCluster_zrank arginfo_class_RedisCluster_hexists
743760

@@ -764,7 +781,7 @@ ZEND_END_ARG_INFO()
764781

765782
#define arginfo_class_RedisCluster_zscan arginfo_class_RedisCluster_hscan
766783

767-
#define arginfo_class_RedisCluster_zscore arginfo_class_RedisCluster__prefix
784+
#define arginfo_class_RedisCluster_zscore arginfo_class_RedisCluster_hexists
768785

769786
#define arginfo_class_RedisCluster_zunionstore arginfo_class_RedisCluster_zinterstore
770787

‎redis_commands.c‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ int redis_zrange_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
623623
zend_string *zkey;
624624
zval *z_ws = NULL, *z_ele;
625625

626-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sll|z", &key, &key_len,
626+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sll|z!", &key, &key_len,
627627
&start, &end, &z_ws) == FAILURE)
628628
{
629629
return FAILURE;
@@ -1861,10 +1861,10 @@ int redis_set_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
18611861
ZEND_HASH_FOREACH_STR_KEY_VAL(kt, zkey, v) {
18621862
ZVAL_DEREF(v);
18631863
/* Detect PX or EX argument and validate timeout */
1864-
if (zkey && (ZSTR_STRICMP_STATIC(zkey, "EX") ||
1865-
ZSTR_STRICMP_STATIC(zkey, "PX") ||
1866-
ZSTR_STRICMP_STATIC(zkey, "EXAT") ||
1867-
ZSTR_STRICMP_STATIC(zkey, "PXAT"))
1864+
if (zkey && (zend_string_equals_literal_ci(zkey, "EX") ||
1865+
zend_string_equals_literal_ci(zkey, "PX") ||
1866+
zend_string_equals_literal_ci(zkey, "EXAT") ||
1867+
zend_string_equals_literal_ci(zkey, "PXAT"))
18681868
) {
18691869
exp_set = 1;
18701870

@@ -1878,11 +1878,13 @@ int redis_set_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
18781878
expire = atol(Z_STRVAL_P(v));
18791879
}
18801880
} else if (Z_TYPE_P(v) == IS_STRING) {
1881-
if (ZVAL_STRICMP_STATIC(v, "KEEPTTL")) {
1881+
if (zend_string_equals_literal_ci(Z_STR_P(v), "KEEPTTL")) {
18821882
keep_ttl = 1;
1883-
} else if (ZVAL_STRICMP_STATIC((v), "GET")) {
1883+
} else if (zend_string_equals_literal_ci(Z_STR_P(v), "GET")) {
18841884
get = 1;
1885-
} else if (ZVAL_STRICMP_STATIC(v, "NX") || ZVAL_STRICMP_STATIC(v, "XX")) {
1885+
} else if (zend_string_equals_literal_ci(Z_STR_P(v), "NX") ||
1886+
zend_string_equals_literal_ci(Z_STR_P(v), "XX"))
1887+
{
18861888
set_type = Z_STRVAL_P(v);
18871889
}
18881890
}

‎redis_legacy_arginfo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 6d0479328ae627b9c45104a52014b3649e533015 */
2+
* Stub hash: 1810caef11b38440e073059e2d9c65f92fa8a9a5 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
55
ZEND_ARG_INFO(0, options)

‎tests/RedisClusterTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public function testFailedTransactions() {
390390
// watch and unwatch
391391
$this->redis->watch('x');
392392
$r->incr('x'); // other instance
393-
$this->redis->unwatch('x'); // cancel transaction watch
393+
$this->redis->unwatch(); // cancel transaction watch
394394

395395
// This should succeed as the watch has been cancelled
396396
$ret = $this->redis->multi()->get('x')->exec();

0 commit comments

Comments
 (0)