RediSearch 2.0.13 compatibility

Author: MacFJA

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Documentation on paginated responses
 - Throw custom exception is client is missing
 - Add compatibility for Predis version 2.x
+- `LOAD ALL` option on Aggregate command (RediSearch `2.0.13`)
 - (dev) Add `make clean` to remove all generated files
 - (dev) Add code coverage to `\MacFJA\RediSearch\Index`
 - (dev) Add integration test for document insertion

src/Redis/Command/AbstractCommand.php

@@ -33,7 +33,7 @@
  */
 abstract class AbstractCommand implements Command
 {
-    public const MAX_IMPLEMENTED_VERSION = '2.0.12';
+    public const MAX_IMPLEMENTED_VERSION = '2.0.13';
     public const MIN_IMPLEMENTED_VERSION = '2.0.0';
 
     /**

src/Redis/Command/Aggregate.php

@@ -32,6 +32,7 @@
 use MacFJA\RediSearch\Redis\Command\AggregateCommand\SortByOption;
 use MacFJA\RediSearch\Redis\Command\AggregateCommand\WithCursor;
 use MacFJA\RediSearch\Redis\Command\Option\CommandOption;
+use MacFJA\RediSearch\Redis\Command\Option\CustomValidatorOption as CV;
 use MacFJA\RediSearch\Redis\Command\Option\FlagOption;
 use MacFJA\RediSearch\Redis\Command\Option\NamedOption;
 use MacFJA\RediSearch\Redis\Command\Option\NamelessOption;
@@ -58,6 +59,7 @@ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VE
             'query' => new NamelessOption(null, '>=2.0.0'),
             'verbatim' => new FlagOption('VERBATIM', false, '>= 2.0.0'),
             'load' => new NumberedOption('LOAD', null, '>=2.0.0'),
+            'loadall' => CV::allowedValues(new NamedOption('LOAD', null, '>=2.0.13'), ['ALL']),
             'groupby' => [],
             'sortby' => new SortByOption(),
             'apply' => [],
@@ -157,6 +159,15 @@ public function setLoad(string ...$field): self
         return $this;
     }
 
+    public function setLoadAll(): self
+    {
+        $this->options['load']->setArguments(null);
+        $this->options['loadall']->setValue('ALL');
+        $this->lastAdded = $this->options['loadall'];
+
+        return $this;
+    }
+
     public function setWithCursor(?int $count = null, ?int $maxIdle = null): self
     {
         $this->options['cursor']

src/Redis/Command/Option/NumberedOption.php

@@ -44,9 +44,9 @@ public function __construct(string $name, ?array $arguments = null, ?string $ver
     }
 
     /**
-     * @param array<float|int|string> $arguments
+     * @param null|array<float|int|string> $arguments
      */
-    public function setArguments(array $arguments): void
+    public function setArguments(?array $arguments): void
     {
         $this->arguments = $arguments;
     }

tests/Redis/Command/AggregateTest.php

@@ -121,6 +121,48 @@ public function testSizeOptions(): void
         static::assertSame(10, $command->getSize());
     }
 
+    public function testLoadAll(): void
+    {
+        $command = new Aggregate('2.0.12');
+        $command
+            ->setIndex('idx')
+            ->setQuery('@text1:"hello world"')
+            ->setLoadAll()
+        ;
+
+        static::assertSame([
+            'idx',
+            '@text1:"hello world"',
+        ], $command->getArguments());
+
+        $command = new Aggregate('2.0.13');
+        $command
+            ->setIndex('idx')
+            ->setQuery('@text1:"hello world"')
+            ->setLoadAll()
+        ;
+
+        static::assertSame([
+            'idx',
+            '@text1:"hello world"',
+            'LOAD', 'ALL',
+        ], $command->getArguments());
+
+        $command = new Aggregate('2.0.13');
+        $command
+            ->setIndex('idx')
+            ->setQuery('@text1:"hello world"')
+            ->setLoad('foo', 'bar')
+            ->setLoadAll()
+        ;
+
+        static::assertSame([
+            'idx',
+            '@text1:"hello world"',
+            'LOAD', 'ALL',
+        ], $command->getArguments());
+    }
+
     public function testFullOption(): void
     {
         $command = new Aggregate();

tests/Redis/Command/Option/NumberedOptionTest.php

@@ -50,6 +50,12 @@ public function testGetSetArguments(): void
         $option = new NumberedOption('FOO', ['foo']);
         static::assertIsArray($option->getArguments());
         static::assertEquals(['foo'], $option->getArguments());
+
+        $option = new NumberedOption('FOO', ['foo']);
+        $option->setArguments(null);
+        static::assertNull($option->getArguments());
+        static::assertFalse($option->isValid());
+        static::assertSame([], $option->render());
     }
 
     public function testGetName(): void