diff --git a/src/ClientContextInterface.php b/src/ClientContextInterface.php index 83dabea5..6c62962f 100644 --- a/src/ClientContextInterface.php +++ b/src/ClientContextInterface.php @@ -100,6 +100,7 @@ use Predis\Command\CommandInterface; * @method $this hvals($key) * @method $this hstrlen($key, $field) * @method $this jsonarrappend(string $key, string $path = '$', ...$value) + * @method $this jsonarrindex(string $key, string $path, string $value, int $start = 0, int $stop = 0) * @method $this jsondel(string $key, string $path = '$') * @method $this jsonget(string $key, string $indent = '', string $newline = '', string $space = '', string ...$paths) * @method $this jsonnumincrby(string $key, string $path, int $value) diff --git a/src/ClientInterface.php b/src/ClientInterface.php index 78505ac5..2495374b 100644 --- a/src/ClientInterface.php +++ b/src/ClientInterface.php @@ -109,6 +109,7 @@ use Predis\Response\Status; * @method array hvals(string $key) * @method int hstrlen(string $key, string $field) * @method array jsonarrappend(string $key, string $path = '$', ...$value) + * @method array jsonarrindex(string $key, string $path, string $value, int $start = 0, int $stop = 0) * @method int jsondel(string $key, string $path = '$') * @method string jsonget(string $key, string $indent = '', string $newline = '', string $space = '', string ...$paths) * @method string jsonnumincrby(string $key, string $path, int $value) diff --git a/src/Command/Redis/Json/JSONARRINDEX.php b/src/Command/Redis/Json/JSONARRINDEX.php new file mode 100644 index 00000000..4aab1827 --- /dev/null +++ b/src/Command/Redis/Json/JSONARRINDEX.php @@ -0,0 +1,28 @@ +getCommand(); + $command->setArguments($arguments); + + $this->assertSame($expected, $command->getArguments()); + } + + /** + * @group disconnected + */ + public function testParseResponse(): void + { + $this->assertSame(1, $this->getCommand()->parseResponse(1)); + } + + /** + * @group connected + * @dataProvider jsonProvider + * @param array $jsonArguments + * @param string $key + * @param string $path + * @param string $value + * @param int $start + * @param int $stop + * @param array $expectedIndices + * @return void + * @requiresRedisJsonVersion >= 1.0.0 + */ + public function testReturnsCorrectJsonArrayIndex( + array $jsonArguments, + string $key, + string $path, + string $value, + int $start, + int $stop, + array $expectedIndices + ): void { + $redis = $this->getClient(); + + $redis->jsonset(...$jsonArguments); + $this->assertSame($expectedIndices, $redis->jsonarrindex($key, $path, $value, $start, $stop)); + } + + public function jsonProvider(): array + { + return [ + 'on root level' => [ + ['key', '$', '{"key1":"value1","key2":["value1","value2"]}'], + 'key', + '$.key2', + '"value2"', + 0, + 0, + [1], + ], + 'on nested level' => [ + ['key', '$', '{"key1":{"key2":["value1","value2"]}}'], + 'key', + '$..key2', + '"value2"', + 0, + 0, + [1], + ], + 'with both level matching keys' => [ + ['key', '$', '{"key1":{"key2":["value1","value2"]},"key2":["value2"]}'], + 'key', + '$..key2', + '"value2"', + 0, + 0, + [0, 1], + ], + 'with non-array path' => [ + ['key', '$', '{"key1":"value1","key2":"value2"}'], + 'key', + '$.key2', + '"value2"', + 0, + 0, + [null], + ], + 'not found - limit by start and stop' => [ + ['key', '$', '{"key1":{"key2":["value1","value2"]},"key2":["value2"]}'], + 'key', + '$..key2', + '"value2"', + 0, + 1, + [0, -1], + ], + 'not found - with wrong value' => [ + ['key', '$', '{"key1":{"key2":["value1","value2"]},"key2":["value2"]}'], + 'key', + '$..key2', + '"value3"', + 0, + 0, + [-1, -1], + ], + ]; + } +}