Skip to content

Commit 60f2d9c

Browse files
vladvildanovvladvildanov
committed
Re-implement CLIENT command as container command
1 parent e8daf1a commit 60f2d9c

File tree

5 files changed

+242
-50
lines changed

5 files changed

+242
-50
lines changed

‎src/ClientContextInterface.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@
3838
use Predis\Command\Argument\TimeSeries\MRangeArguments;
3939
use Predis\Command\Argument\TimeSeries\RangeArguments;
4040
use Predis\Command\CommandInterface;
41-
use Predis\Command\Redis\Container\ACL;
42-
use Predis\Command\Redis\Container\FunctionContainer;
43-
use Predis\Command\Redis\Container\Json\JSONDEBUG;
44-
use Predis\Command\Redis\Container\Search\FTCONFIG;
45-
use Predis\Command\Redis\Container\Search\FTCURSOR;
41+
use Predis\Command\Container\ACL;
42+
use Predis\Command\Container\CLIENT;
43+
use Predis\Command\Container\FUNCTIONS;
44+
use Predis\Command\Container\Json\JSONDEBUG;
45+
use Predis\Command\Container\Search\FTCONFIG;
46+
use Predis\Command\Container\Search\FTCURSOR;
4647

4748
/**
4849
* Interface defining a client-side context such as a pipeline or transaction.
@@ -316,7 +317,6 @@
316317
* @method $this select($database)
317318
* @method $this bgrewriteaof()
318319
* @method $this bgsave()
319-
* @method $this client($subcommand, $argument = null)
320320
* @method $this config($subcommand, $argument = null)
321321
* @method $this dbsize()
322322
* @method $this flushall()
@@ -338,11 +338,12 @@
338338
* @method $this geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
339339
*
340340
* Container commands
341-
* @property FunctionContainer $function
342-
* @property FTCONFIG $ftconfig
343-
* @property FTCURSOR $ftcursor
344-
* @property JSONDEBUG $jsondebug
345-
* @property ACL $acl
341+
* @property CLIENT $client
342+
* @property FUNCTIONS $function
343+
* @property FTCONFIG $ftconfig
344+
* @property FTCURSOR $ftcursor
345+
* @property JSONDEBUG $jsondebug
346+
* @property ACL $acl
346347
*/
347348
interface ClientContextInterface
348349
{

‎src/ClientInterface.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@
3838
use Predis\Command\Argument\TimeSeries\MRangeArguments;
3939
use Predis\Command\Argument\TimeSeries\RangeArguments;
4040
use Predis\Command\CommandInterface;
41+
use Predis\Command\Container\ACL;
42+
use Predis\Command\Container\CLIENT;
43+
use Predis\Command\Container\FUNCTIONS;
44+
use Predis\Command\Container\Json\JSONDEBUG;
45+
use Predis\Command\Container\Search\FTCONFIG;
46+
use Predis\Command\Container\Search\FTCURSOR;
4147
use Predis\Command\FactoryInterface;
42-
use Predis\Command\Redis\Container\ACL;
43-
use Predis\Command\Redis\Container\FunctionContainer;
44-
use Predis\Command\Redis\Container\Json\JSONDEBUG;
45-
use Predis\Command\Redis\Container\Search\FTCONFIG;
46-
use Predis\Command\Redis\Container\Search\FTCURSOR;
4748
use Predis\Configuration\OptionsInterface;
4849
use Predis\Connection\ConnectionInterface;
4950
use Predis\Response\Status;
@@ -334,7 +335,6 @@
334335
* @method mixed select(int $database)
335336
* @method mixed bgrewriteaof()
336337
* @method mixed bgsave()
337-
* @method mixed client($subcommand, $argument = null)
338338
* @method mixed config($subcommand, $argument = null)
339339
* @method int dbsize()
340340
* @method mixed flushall()
@@ -356,11 +356,12 @@
356356
* @method int geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
357357
*
358358
* Container commands
359-
* @property FunctionContainer $function
360-
* @property FTCONFIG $ftconfig
361-
* @property FTCURSOR $ftcursor
362-
* @property JSONDEBUG $jsondebug
363-
* @property ACL $acl
359+
* @property CLIENT $client
360+
* @property FUNCTIONS $function
361+
* @property FTCONFIG $ftconfig
362+
* @property FTCURSOR $ftcursor
363+
* @property JSONDEBUG $jsondebug
364+
* @property ACL $acl
364365
*/
365366
interface ClientInterface
366367
{

‎src/Command/Container/CLIENT.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2023 Till Krüss
8+
*
9+
* For the full copyright and license information, please view the LICENSE
10+
* file that was distributed with this source code.
11+
*/
12+
13+
namespace Predis\Command\Container;
14+
15+
use Predis\Response\Status;
16+
17+
/**
18+
* @method string getName()
19+
* @method Status kill(...$arguments)
20+
* @method string list(string $type = null, int ...$clientId)
21+
* @method Status noTouch(bool $enable = null)
22+
* @method Status setInfo(string $modifier = null, string $value = null)
23+
* @method Status setName(string $connectionName)
24+
*/
25+
class CLIENT extends AbstractContainer
26+
{
27+
public function getContainerCommandId(): string
28+
{
29+
return 'CLIENT';
30+
}
31+
}

‎src/Command/Redis/CLIENT.php‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,73 @@ public function getId()
3030
return 'CLIENT';
3131
}
3232

33+
public function setArguments(array $arguments)
34+
{
35+
switch ($arguments[0]) {
36+
case 'LIST':
37+
$this->setListArguments($arguments);
38+
break;
39+
case 'NOTOUCH':
40+
$arguments[0] = 'NO-TOUCH';
41+
$this->setNoTouchArguments($arguments);
42+
break;
43+
case 'SETINFO':
44+
$this->setSetInfoArguments($arguments);
45+
break;
46+
default:
47+
parent::setArguments($arguments);
48+
}
49+
}
50+
51+
private function setListArguments(array $arguments): void
52+
{
53+
$processedArguments = [$arguments[0]];
54+
55+
if (array_key_exists(1, $arguments) && null !== $arguments[1]) {
56+
array_push($processedArguments, 'TYPE', strtoupper($arguments[1]));
57+
}
58+
59+
if (array_key_exists(2, $arguments)) {
60+
array_push($processedArguments, 'ID', $arguments[2]);
61+
}
62+
63+
if (count($arguments) > 3) {
64+
for ($i = 3, $iMax = count($arguments); $i < $iMax; $i++) {
65+
$processedArguments[] = $arguments[$i];
66+
}
67+
}
68+
69+
parent::setArguments($processedArguments);
70+
}
71+
72+
private function setNoTouchArguments(array $arguments): void
73+
{
74+
$processedArguments = [$arguments[0]];
75+
76+
if (array_key_exists(1, $arguments) && null !== $arguments[1]) {
77+
$modifier = ($arguments[1]) ? 'ON' : 'OFF';
78+
$processedArguments[] = $modifier;
79+
}
80+
81+
parent::setArguments($processedArguments);
82+
}
83+
84+
private function setSetInfoArguments(array $arguments): void
85+
{
86+
$processedArguments = [$arguments[0]];
87+
88+
if (
89+
array_key_exists(1, $arguments)
90+
&& null !== $arguments[1]
91+
&& array_key_exists(2, $arguments)
92+
&& null !== $arguments[2]
93+
) {
94+
array_push($processedArguments, strtoupper($arguments[1]), $arguments[2]);
95+
}
96+
97+
parent::setArguments($processedArguments);
98+
}
99+
33100
/**
34101
* {@inheritdoc}
35102
*/

0 commit comments

Comments
 (0)