Skip to content

Commit a0e2f81

Browse files
tillkrusstillkruss
authored
Merge branch 'v2.x' into fix-prefixes-for-lmove-blmove
2 parents d631834 + 4dc7245 commit a0e2f81

29 files changed

+90
-88
lines changed

‎.github/workflows/tests.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- '8.1'
2929
- '8.2'
3030
- '8.3'
31+
- '8.4'
3132
redis:
3233
- 3
3334
- 4
@@ -69,7 +70,7 @@ jobs:
6970
run: vendor/bin/phpunit --coverage-clover build/logs/clover-default.xml --coverage-filter ./src
7071

7172
- name: Run tests using Relay
72-
if: ${{ matrix.redis >= '6' }}
73+
if: ${{ matrix.php != '8.4' && matrix.redis >= '6' }}
7374
run: vendor/bin/phpunit -c phpunit.relay.xml
7475

7576
- name: Run tests using Relay with coverage

‎src/Client.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ public function pipeline(...$arguments)
472472
*
473473
* @return Pipeline|array
474474
*/
475-
protected function createPipeline(array $options = null, $callable = null)
475+
protected function createPipeline(?array $options = null, $callable = null)
476476
{
477477
if (isset($options['atomic']) && $options['atomic']) {
478478
$class = Atomic::class;
@@ -520,12 +520,12 @@ public function transaction(...$arguments)
520520
/**
521521
* Actual transaction context initializer method.
522522
*
523-
* @param array $options Options for the context.
524-
* @param mixed $callable Optional callable used to execute the context.
523+
* @param array|null $options Options for the context.
524+
* @param mixed $callable Optional callable used to execute the context.
525525
*
526526
* @return MultiExecTransaction|array
527527
*/
528-
protected function createTransaction(array $options = null, $callable = null)
528+
protected function createTransaction(?array $options = null, $callable = null)
529529
{
530530
$transaction = new MultiExecTransaction($this, $options);
531531

@@ -552,12 +552,12 @@ public function pubSubLoop(...$arguments)
552552
/**
553553
* Actual publish/subscribe context initializer method.
554554
*
555-
* @param array $options Options for the context.
556-
* @param mixed $callable Optional callable used to execute the context.
555+
* @param array|null $options Options for the context.
556+
* @param mixed $callable Optional callable used to execute the context.
557557
*
558558
* @return PubSubConsumer|null
559559
*/
560-
protected function createPubSub(array $options = null, $callable = null)
560+
protected function createPubSub(?array $options = null, $callable = null)
561561
{
562562
if ($this->connection instanceof RelayConnection) {
563563
$pubsub = new RelayPubSubConsumer($this, $options);

‎src/ClientContextInterface.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
* @method $this randomkey()
6666
* @method $this rename($key, $target)
6767
* @method $this renamenx($key, $target)
68-
* @method $this scan($cursor, array $options = null)
69-
* @method $this sort($key, array $options = null)
68+
* @method $this scan($cursor, ?array $options = null)
69+
* @method $this sort($key, ?array $options = null)
7070
* @method $this sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
7171
* @method $this ttl($key)
7272
* @method $this type($key)
@@ -163,7 +163,7 @@
163163
* @method $this hmget($key, array $fields)
164164
* @method $this hmset($key, array $dictionary)
165165
* @method $this hrandfield(string $key, int $count = 1, bool $withValues = false)
166-
* @method $this hscan($key, $cursor, array $options = null)
166+
* @method $this hscan($key, $cursor, ?array $options = null)
167167
* @method $this hset($key, $field, $value)
168168
* @method $this hsetnx($key, $field, $value)
169169
* @method $this hvals($key)
@@ -225,7 +225,7 @@
225225
* @method $this spop($key, $count = null)
226226
* @method $this srandmember($key, $count = null)
227227
* @method $this srem($key, $member)
228-
* @method $this sscan($key, $cursor, array $options = null)
228+
* @method $this sscan($key, $cursor, ?array $options = null)
229229
* @method $this sunion(array|string $keys)
230230
* @method $this sunionstore($destination, array|string $keys)
231231
* @method $this tdigestadd(string $key, float ...$value)
@@ -255,7 +255,7 @@
255255
* @method $this tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
256256
* @method $this tsdel(string $key, int $fromTimestamp, int $toTimestamp)
257257
* @method $this tsdeleterule(string $sourceKey, string $destKey)
258-
* @method $this tsget(string $key, GetArguments $arguments = null)
258+
* @method $this tsget(string $key, ?GetArguments $arguments = null)
259259
* @method $this tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
260260
* @method $this tsinfo(string $key, ?InfoArguments $arguments = null)
261261
* @method $this tsmadd(mixed ...$keyTimestampValue)
@@ -277,22 +277,22 @@
277277
* @method $this zmpop(array $keys, string $modifier = 'min', int $count = 1)
278278
* @method $this zmscore(string $key, string ...$member)
279279
* @method $this zrandmember(string $key, int $count = 1, bool $withScores = false)
280-
* @method $this zrange($key, $start, $stop, array $options = null)
281-
* @method $this zrangebyscore($key, $min, $max, array $options = null)
280+
* @method $this zrange($key, $start, $stop, ?array $options = null)
281+
* @method $this zrangebyscore($key, $min, $max, ?array $options = null)
282282
* @method $this zrangestore(string $destination, string $source, int|string $min, string|int $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
283283
* @method $this zrank($key, $member)
284284
* @method $this zrem($key, $member)
285285
* @method $this zremrangebyrank($key, $start, $stop)
286286
* @method $this zremrangebyscore($key, $min, $max)
287-
* @method $this zrevrange($key, $start, $stop, array $options = null)
288-
* @method $this zrevrangebyscore($key, $max, $min, array $options = null)
287+
* @method $this zrevrange($key, $start, $stop, ?array $options = null)
288+
* @method $this zrevrangebyscore($key, $max, $min, ?array $options = null)
289289
* @method $this zrevrank($key, $member)
290290
* @method $this zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
291291
* @method $this zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
292292
* @method $this zscore($key, $member)
293-
* @method $this zscan($key, $cursor, array $options = null)
294-
* @method $this zrangebylex($key, $start, $stop, array $options = null)
295-
* @method $this zrevrangebylex($key, $start, $stop, array $options = null)
293+
* @method $this zscan($key, $cursor, ?array $options = null)
294+
* @method $this zrangebylex($key, $start, $stop, ?array $options = null)
295+
* @method $this zrevrangebylex($key, $start, $stop, ?array $options = null)
296296
* @method $this zremrangebylex($key, $min, $max)
297297
* @method $this zlexcount($key, $min, $max)
298298
* @method $this pexpiretime(string $key)
@@ -312,7 +312,7 @@
312312
* @method $this evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
313313
* @method $this evalsha_ro(string $sha1, array $keys, ...$argument)
314314
* @method $this script($subcommand, $argument = null)
315-
* @method $this shutdown(bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
315+
* @method $this shutdown(?bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
316316
* @method $this auth($password)
317317
* @method $this echo($message)
318318
* @method $this ping($message = null)
@@ -335,8 +335,8 @@
335335
* @method $this geohash($key, array $members)
336336
* @method $this geopos($key, array $members)
337337
* @method $this geodist($key, $member1, $member2, $unit = null)
338-
* @method $this georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
339-
* @method $this georadiusbymember($key, $member, $radius, $unit, array $options = null)
338+
* @method $this georadius($key, $longitude, $latitude, $radius, $unit, ?array $options = null)
339+
* @method $this georadiusbymember($key, $member, $radius, $unit, ?array $options = null)
340340
* @method $this geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
341341
* @method $this geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
342342
*

‎src/ClientInterface.php

+20-20
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
* @method string|null randomkey()
7575
* @method mixed rename(string $key, string $target)
7676
* @method int renamenx(string $key, string $target)
77-
* @method array scan($cursor, array $options = null)
78-
* @method array sort(string $key, array $options = null)
77+
* @method array scan($cursor, ?array $options = null)
78+
* @method array sort(string $key, ?array $options = null)
7979
* @method array sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
8080
* @method int ttl(string $key)
8181
* @method mixed type(string $key)
@@ -172,7 +172,7 @@
172172
* @method array hmget(string $key, array $fields)
173173
* @method mixed hmset(string $key, array $dictionary)
174174
* @method array hrandfield(string $key, int $count = 1, bool $withValues = false)
175-
* @method array hscan(string $key, $cursor, array $options = null)
175+
* @method array hscan(string $key, $cursor, ?array $options = null)
176176
* @method int hset(string $key, string $field, string $value)
177177
* @method int hsetnx(string $key, string $field, string $value)
178178
* @method array hvals(string $key)
@@ -231,10 +231,10 @@
231231
* @method string[] smembers(string $key)
232232
* @method array smismember(string $key, string ...$members)
233233
* @method int smove(string $source, string $destination, string $member)
234-
* @method string|array|null spop(string $key, int $count = null)
235-
* @method string|null srandmember(string $key, int $count = null)
234+
* @method string|array|null spop(string $key, ?int $count = null)
235+
* @method string|null srandmember(string $key, ?int $count = null)
236236
* @method int srem(string $key, array|string $member)
237-
* @method array sscan(string $key, int $cursor, array $options = null)
237+
* @method array sscan(string $key, int $cursor, ?array $options = null)
238238
* @method string[] sunion(array|string $keys)
239239
* @method int sunionstore(string $destination, array|string $keys)
240240
* @method int touch(string[]|string $keyOrKeys, string ...$keys = null)
@@ -265,7 +265,7 @@
265265
* @method int tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
266266
* @method int tsdel(string $key, int $fromTimestamp, int $toTimestamp)
267267
* @method Status tsdeleterule(string $sourceKey, string $destKey)
268-
* @method array tsget(string $key, GetArguments $arguments = null)
268+
* @method array tsget(string $key, ?GetArguments $arguments = null)
269269
* @method int tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
270270
* @method array tsinfo(string $key, ?InfoArguments $arguments = null)
271271
* @method array tsmadd(mixed ...$keyTimestampValue)
@@ -275,12 +275,12 @@
275275
* @method array tsqueryindex(string ...$filterExpression)
276276
* @method array tsrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
277277
* @method array tsrevrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
278-
* @method string xadd(string $key, array $dictionary, string $id = '*', array $options = null)
278+
* @method string xadd(string $key, array $dictionary, string $id = '*', ?array $options = null)
279279
* @method int xdel(string $key, string ...$id)
280280
* @method int xlen(string $key)
281281
* @method array xrevrange(string $key, string $end, string $start, ?int $count = null)
282282
* @method array xrange(string $key, string $start, string $end, ?int $count = null)
283-
* @method string xtrim(string $key, array|string $strategy, string $threshold, array $options = null)
283+
* @method string xtrim(string $key, array|string $strategy, string $threshold, ?array $options = null)
284284
* @method int zadd(string $key, array $membersAndScoresDictionary)
285285
* @method int zcard(string $key)
286286
* @method string zcount(string $key, int|string $min, int|string $max)
@@ -295,22 +295,22 @@
295295
* @method array zpopmin(string $key, int $count = 1)
296296
* @method array zpopmax(string $key, int $count = 1)
297297
* @method mixed zrandmember(string $key, int $count = 1, bool $withScores = false)
298-
* @method array zrange(string $key, int|string $start, int|string $stop, array $options = null)
299-
* @method array zrangebyscore(string $key, int|string $min, int|string $max, array $options = null)
298+
* @method array zrange(string $key, int|string $start, int|string $stop, ?array $options = null)
299+
* @method array zrangebyscore(string $key, int|string $min, int|string $max, ?array $options = null)
300300
* @method int zrangestore(string $destination, string $source, int|string $min, int|string $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
301301
* @method int|null zrank(string $key, string $member)
302302
* @method int zrem(string $key, string ...$member)
303303
* @method int zremrangebyrank(string $key, int|string $start, int|string $stop)
304304
* @method int zremrangebyscore(string $key, int|string $min, int|string $max)
305-
* @method array zrevrange(string $key, int|string $start, int|string $stop, array $options = null)
306-
* @method array zrevrangebyscore(string $key, int|string $max, int|string $min, array $options = null)
305+
* @method array zrevrange(string $key, int|string $start, int|string $stop, ?array $options = null)
306+
* @method array zrevrangebyscore(string $key, int|string $max, int|string $min, ?array $options = null)
307307
* @method int|null zrevrank(string $key, string $member)
308308
* @method array zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
309309
* @method int zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
310310
* @method string|null zscore(string $key, string $member)
311-
* @method array zscan(string $key, int $cursor, array $options = null)
312-
* @method array zrangebylex(string $key, string $start, string $stop, array $options = null)
313-
* @method array zrevrangebylex(string $key, string $start, string $stop, array $options = null)
311+
* @method array zscan(string $key, int $cursor, ?array $options = null)
312+
* @method array zrangebylex(string $key, string $start, string $stop, ?array $options = null)
313+
* @method array zrevrangebylex(string $key, string $start, string $stop, ?array $options = null)
314314
* @method int zremrangebylex(string $key, string $min, string $max)
315315
* @method int zlexcount(string $key, string $min, string $max)
316316
* @method int pexpiretime(string $key)
@@ -330,10 +330,10 @@
330330
* @method mixed evalsha(string $script, int $numkeys, string ...$keyOrArg = null)
331331
* @method mixed evalsha_ro(string $sha1, array $keys, ...$argument)
332332
* @method mixed script($subcommand, $argument = null)
333-
* @method Status shutdown(bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
333+
* @method Status shutdown(?bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
334334
* @method mixed auth(string $password)
335335
* @method string echo(string $message)
336-
* @method mixed ping(string $message = null)
336+
* @method mixed ping(?string $message = null)
337337
* @method mixed select(int $database)
338338
* @method mixed bgrewriteaof()
339339
* @method mixed bgsave()
@@ -353,8 +353,8 @@
353353
* @method array geohash(string $key, array $members)
354354
* @method array geopos(string $key, array $members)
355355
* @method string|null geodist(string $key, $member1, $member2, $unit = null)
356-
* @method array georadius(string $key, $longitude, $latitude, $radius, $unit, array $options = null)
357-
* @method array georadiusbymember(string $key, $member, $radius, $unit, array $options = null)
356+
* @method array georadius(string $key, $longitude, $latitude, $radius, $unit, ?array $options = null)
357+
* @method array georadiusbymember(string $key, $member, $radius, $unit, ?array $options = null)
358358
* @method array geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
359359
* @method int geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
360360
*

‎src/Cluster/PredisStrategy.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class PredisStrategy extends ClusterStrategy
2323
protected $distributor;
2424

2525
/**
26-
* @param DistributorInterface $distributor Optional distributor instance.
26+
* @param DistributorInterface|null $distributor Optional distributor instance.
2727
*/
28-
public function __construct(DistributorInterface $distributor = null)
28+
public function __construct(?DistributorInterface $distributor = null)
2929
{
3030
parent::__construct();
3131

‎src/Cluster/RedisStrategy.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class RedisStrategy extends ClusterStrategy
2525
protected $hashGenerator;
2626

2727
/**
28-
* @param HashGeneratorInterface $hashGenerator Hash generator instance.
28+
* @param HashGeneratorInterface|null $hashGenerator Hash generator instance.
2929
*/
30-
public function __construct(HashGeneratorInterface $hashGenerator = null)
30+
public function __construct(?HashGeneratorInterface $hashGenerator = null)
3131
{
3232
parent::__construct();
3333

‎src/Command/Processor/KeyPrefixProcessor.php

+1
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ public function __construct($prefix)
201201
'ZMSCORE' => $prefixFirst,
202202
'LMOVE' => $prefixFirstTwo,
203203
'BLMOVE' => $prefixFirstTwo,
204+
'GEOSEARCH' => $prefixFirst,
204205

205206
/* ---------------- Redis 7.0 ---------------- */
206207
'EXPIRETIME' => $prefixFirst,

‎src/Command/Redis/Container/FunctionContainer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
* @method string dump()
2020
* @method Status flush(?string $mode = null)
2121
* @method Status kill()
22-
* @method array list(string $libraryNamePattern = null, bool $withCode = false)
22+
* @method array list(?string $libraryNamePattern = null, bool $withCode = false)
2323
* @method string load(string $functionCode, bool $replace = 'false')
24-
* @method Status restore(string $value, string $policy = null)
24+
* @method Status restore(string $value, ?string $policy = null)
2525
* @method array stats()
2626
*/
2727
class FunctionContainer extends AbstractContainer

‎src/Command/Strategy/SubcommandStrategyResolver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class SubcommandStrategyResolver implements StrategyResolverInterface
2323
*/
2424
private $separator;
2525

26-
public function __construct(string $separator = null)
26+
public function __construct(?string $separator = null)
2727
{
2828
$this->separator = $separator;
2929
}

‎src/CommunicationException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct(
3232
NodeConnectionInterface $connection,
3333
$message = '',
3434
$code = 0,
35-
Exception $innerException = null
35+
?Exception $innerException = null
3636
) {
3737
parent::__construct(
3838
is_null($message) ? '' : $message,

‎src/Configuration/Options.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class Options implements OptionsInterface
4141
protected $input;
4242

4343
/**
44-
* @param array $options Named array of client options
44+
* @param array|null $options Named array of client options
4545
*/
46-
public function __construct(array $options = null)
46+
public function __construct(?array $options = null)
4747
{
4848
$this->input = $options ?? [];
4949
}

0 commit comments

Comments
 (0)