Use constant instead of hardcoded version

MacFJA · MacFJA · commit 4383b4657a09 · 2021-10-10T10:37:57.000+02:00
diff --git a/src/Index.php b/src/Index.php
@@ -24,6 +24,7 @@
 use function count;
 use function is_array;
 use function is_string;
+use MacFJA\RediSearch\Redis\Command\AbstractCommand;
 use MacFJA\RediSearch\Redis\Command\AliasAdd;
 use MacFJA\RediSearch\Redis\Command\AliasDel;
 use MacFJA\RediSearch\Redis\Command\AliasUpdate;
@@ -54,7 +55,7 @@ public function __construct(string $index, ClientInterface $client)
     {
         $this->client = $client;
         $this->index = $index;
-        $this->version = Initializer::getRediSearchVersion($client) ?? '2.0.0';
+        $this->version = Initializer::getRediSearchVersion($client) ?? AbstractCommand::MIN_IMPLEMENTED_VERSION;
         $this->getInfo();
     }
 
diff --git a/src/IndexBuilder.php b/src/IndexBuilder.php
@@ -29,6 +29,7 @@
 use function is_float;
 use function is_int;
 use function is_string;
+use MacFJA\RediSearch\Redis\Command\AbstractCommand;
 use MacFJA\RediSearch\Redis\Command\AddFieldOptionTrait;
 use MacFJA\RediSearch\Redis\Command\Create;
 use MacFJA\RediSearch\Redis\Command\CreateCommand\CreateCommandFieldOption;
@@ -167,7 +168,7 @@ public function addField(CreateCommandFieldOption ...$option): self
         return $this;
     }
 
-    public function create(ClientInterface $client, string $rediSearchVersion = '2.0.0'): ResponseInterface
+    public function create(ClientInterface $client, string $rediSearchVersion = AbstractCommand::MIN_IMPLEMENTED_VERSION): ResponseInterface
     {
         $command = $this->getCommand($rediSearchVersion);
 
@@ -180,7 +181,7 @@ public function create(ClientInterface $client, string $rediSearchVersion = '2.0
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function getCommand(string $rediSearchVersion = '2.0.0'): Create
+    public function getCommand(string $rediSearchVersion = AbstractCommand::MIN_IMPLEMENTED_VERSION): Create
     {
         if (!is_string($this->index)) {
             throw new RuntimeException('The index name is missing');
diff --git a/src/Redis/Command/AbstractCommand.php b/src/Redis/Command/AbstractCommand.php
@@ -46,7 +46,7 @@ abstract class AbstractCommand extends Command
     /**
      * @param array<array<CommandOption>|CommandOption|mixed> $options
      */
-    public function __construct(array $options, string $rediSearchVersion = '2.0.0')
+    public function __construct(array $options, string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         $this->rediSearchVersion = $rediSearchVersion;
 
diff --git a/src/Redis/Command/Aggregate.php b/src/Redis/Command/Aggregate.php
@@ -43,7 +43,7 @@ class Aggregate extends AbstractCommand implements PaginatedCommand
 {
     use ArrayResponseTrait;
 
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/AliasAdd.php b/src/Redis/Command/AliasAdd.php
@@ -29,7 +29,7 @@
  */
 class AliasAdd extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'alias' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/AliasDel.php b/src/Redis/Command/AliasDel.php
@@ -29,7 +29,7 @@
  */
 class AliasDel extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'alias' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/AliasUpdate.php b/src/Redis/Command/AliasUpdate.php
@@ -29,7 +29,7 @@
  */
 class AliasUpdate extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'alias' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/Alter.php b/src/Redis/Command/Alter.php
@@ -32,7 +32,7 @@ class Alter extends AbstractCommand
 {
     use AddFieldOptionTrait;
 
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/Config.php b/src/Redis/Command/Config.php
@@ -29,7 +29,7 @@
  */
 class Config extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'action' => CustomValidatorOption::allowedValues(new NamelessOption(null, '>=2.0.0'), ['GET', 'HELP']),
diff --git a/src/Redis/Command/ConfigSet.php b/src/Redis/Command/ConfigSet.php
@@ -31,7 +31,7 @@
  */
 class ConfigSet extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'action' => new FlagOption('SET', true, '>=2.0.0'),
diff --git a/src/Redis/Command/Create.php b/src/Redis/Command/Create.php
@@ -37,7 +37,7 @@ class Create extends AbstractCommand
     use LanguageOptionTrait;
     use AddFieldOptionTrait;
 
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/CursorDel.php b/src/Redis/Command/CursorDel.php
@@ -30,7 +30,7 @@
  */
 class CursorDel extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'type' => new FlagOption('DEL', true, '>=2.0.0'),
diff --git a/src/Redis/Command/CursorRead.php b/src/Redis/Command/CursorRead.php
@@ -39,7 +39,7 @@ class CursorRead extends AbstractCommand
 {
     use ArrayResponseTrait;
 
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'type' => new FlagOption('READ', true, '>=2.0.0'),
@@ -85,7 +85,7 @@ public function getId()
     /**
      * @param array<array<mixed>|int> $data
      */
-    public static function transformResponse(array $data, ?int $count, string $index, string $rediSearchVersion = '2.0.0'): CursorResponse
+    public static function transformResponse(array $data, ?int $count, string $index, string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION): CursorResponse
     {
         [$rawResult, $cursorId] = $data;
 
diff --git a/src/Redis/Command/DictAdd.php b/src/Redis/Command/DictAdd.php
@@ -28,7 +28,7 @@
  */
 class DictAdd extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'dict' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/DictDel.php b/src/Redis/Command/DictDel.php
@@ -28,7 +28,7 @@
  */
 class DictDel extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'dict' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/DictDump.php b/src/Redis/Command/DictDump.php
@@ -28,7 +28,7 @@
  */
 class DictDump extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'dict' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/DropIndex.php b/src/Redis/Command/DropIndex.php
@@ -30,7 +30,7 @@
  */
 class DropIndex extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/Explain.php b/src/Redis/Command/Explain.php
@@ -28,7 +28,7 @@
  */
 class Explain extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/Info.php b/src/Redis/Command/Info.php
@@ -29,7 +29,7 @@
  */
 class Info extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/Search.php b/src/Redis/Command/Search.php
@@ -50,7 +50,7 @@ class Search extends AbstractCommand implements PaginatedCommand
     use LanguageOptionTrait;
     use ArrayResponseTrait;
 
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct(
             [
diff --git a/src/Redis/Command/SpellCheck.php b/src/Redis/Command/SpellCheck.php
@@ -34,7 +34,7 @@
  */
 class SpellCheck extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/SugAdd.php b/src/Redis/Command/SugAdd.php
@@ -31,7 +31,7 @@
  */
 class SugAdd extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'dictionary' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/SugDel.php b/src/Redis/Command/SugDel.php
@@ -28,7 +28,7 @@
  */
 class SugDel extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'dictionary' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/SugGet.php b/src/Redis/Command/SugGet.php
@@ -35,7 +35,7 @@
  */
 class SugGet extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'dictionary' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/SugLen.php b/src/Redis/Command/SugLen.php
@@ -28,7 +28,7 @@
  */
 class SugLen extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'dictionary' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/SynDump.php b/src/Redis/Command/SynDump.php
@@ -25,7 +25,7 @@
 
 class SynDump extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/SynUpdate.php b/src/Redis/Command/SynUpdate.php
@@ -26,7 +26,7 @@
 
 class SynUpdate extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Command/TagVals.php b/src/Redis/Command/TagVals.php
@@ -28,7 +28,7 @@
  */
 class TagVals extends AbstractCommand
 {
-    public function __construct(string $rediSearchVersion = '2.0.0')
+    public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)
     {
         parent::__construct([
             'index' => new NamelessOption(null, '>=2.0.0'),
diff --git a/src/Redis/Response/CursorResponse.php b/src/Redis/Response/CursorResponse.php
@@ -23,6 +23,7 @@
 
 use function count;
 use Iterator;
+use MacFJA\RediSearch\Redis\Command\AbstractCommand;
 use MacFJA\RediSearch\Redis\Command\CursorRead;
 use Predis\ClientInterface;
 use Predis\Response\ResponseInterface;
@@ -54,7 +55,7 @@ class CursorResponse implements ResponseInterface, Iterator
     /**
      * @param array<AggregateResponseItem> $items
      */
-    public function __construct(int $cursorId, int $totalCount, array $items, int $size, string $index, string $redisVersion = '2.0.0')
+    public function __construct(int $cursorId, int $totalCount, array $items, int $size, string $index, string $redisVersion = AbstractCommand::MIN_IMPLEMENTED_VERSION)
     {
         $this->totalCount = $totalCount;
         $this->items = $items;
diff --git a/src/Suggestions.php b/src/Suggestions.php
@@ -23,6 +23,7 @@
 
 use function is_int;
 use function is_string;
+use MacFJA\RediSearch\Redis\Command\AbstractCommand;
 use MacFJA\RediSearch\Redis\Command\SugAdd;
 use MacFJA\RediSearch\Redis\Command\SugDel;
 use MacFJA\RediSearch\Redis\Command\SugGet;
@@ -50,7 +51,7 @@ public function __construct(string $dictionary, ClientInterface $client)
         $this->dictionary = $dictionary;
         $this->client = $client;
         $this->length = $client->executeCommand((new SugLen())->setDictionary($dictionary));
-        $this->version = Initializer::getRediSearchVersion($client) ?? '2.0.0';
+        $this->version = Initializer::getRediSearchVersion($client) ?? AbstractCommand::MIN_IMPLEMENTED_VERSION;
     }
 
     public function add(string $suggestion, float $score, bool $increment = false, ?string $payload = null): void

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ abstract class AbstractCommand extends Command`
`46`	`46`	`/**`
`47`	`47`	`* @param array<array<CommandOption>\|CommandOption\|mixed> $options`
`48`	`48`	`*/`
`49`		`- public function __construct(array $options, string $rediSearchVersion = '2.0.0')`
	`49`	`+ public function __construct(array $options, string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`50`	`50`	`{`
`51`	`51`	`$this->rediSearchVersion = $rediSearchVersion;`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class Aggregate extends AbstractCommand implements PaginatedCommand`
`43`	`43`	`{`
`44`	`44`	`use ArrayResponseTrait;`
`45`	`45`
`46`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`46`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`47`	`47`	`{`
`48`	`48`	`parent::__construct([`
`49`	`49`	`'index' => new NamelessOption(null, '>=2.0.0'),`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`*/`
`30`	`30`	`class AliasAdd extends AbstractCommand`
`31`	`31`	`{`
`32`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`32`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`33`	`33`	`{`
`34`	`34`	`parent::__construct([`
`35`	`35`	`'alias' => new NamelessOption(null, '>=2.0.0'),`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class Alter extends AbstractCommand`
`32`	`32`	`{`
`33`	`33`	`use AddFieldOptionTrait;`
`34`	`34`
`35`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`35`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`36`	`36`	`{`
`37`	`37`	`parent::__construct([`
`38`	`38`	`'index' => new NamelessOption(null, '>=2.0.0'),`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`*/`
`32`	`32`	`class ConfigSet extends AbstractCommand`
`33`	`33`	`{`
`34`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`34`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`35`	`35`	`{`
`36`	`36`	`parent::__construct([`
`37`	`37`	`'action' => new FlagOption('SET', true, '>=2.0.0'),`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class Create extends AbstractCommand`
`37`	`37`	`use LanguageOptionTrait;`
`38`	`38`	`use AddFieldOptionTrait;`
`39`	`39`
`40`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`40`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`41`	`41`	`{`
`42`	`42`	`parent::__construct([`
`43`	`43`	`'index' => new NamelessOption(null, '>=2.0.0'),`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*/`
`31`	`31`	`class CursorDel extends AbstractCommand`
`32`	`32`	`{`
`33`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`33`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`34`	`34`	`{`
`35`	`35`	`parent::__construct([`
`36`	`36`	`'type' => new FlagOption('DEL', true, '>=2.0.0'),`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class CursorRead extends AbstractCommand`
`39`	`39`	`{`
`40`	`40`	`use ArrayResponseTrait;`
`41`	`41`
`42`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`42`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`43`	`43`	`{`
`44`	`44`	`parent::__construct([`
`45`	`45`	`'type' => new FlagOption('READ', true, '>=2.0.0'),`
`@@ -85,7 +85,7 @@ public function getId()`
`85`	`85`	`/**`
`86`	`86`	`* @param array<array<mixed>\|int> $data`
`87`	`87`	`*/`
`88`		`- public static function transformResponse(array $data, ?int $count, string $index, string $rediSearchVersion = '2.0.0'): CursorResponse`
	`88`	`+ public static function transformResponse(array $data, ?int $count, string $index, string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION): CursorResponse`
`89`	`89`	`{`
`90`	`90`	`[$rawResult, $cursorId] = $data;`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*/`
`29`	`29`	`class DictAdd extends AbstractCommand`
`30`	`30`	`{`
`31`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`31`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`32`	`32`	`{`
`33`	`33`	`parent::__construct([`
`34`	`34`	`'dict' => new NamelessOption(null, '>=2.0.0'),`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class Search extends AbstractCommand implements PaginatedCommand`
`50`	`50`	`use LanguageOptionTrait;`
`51`	`51`	`use ArrayResponseTrait;`
`52`	`52`
`53`		`- public function __construct(string $rediSearchVersion = '2.0.0')`
	`53`	`+ public function __construct(string $rediSearchVersion = self::MIN_IMPLEMENTED_VERSION)`
`54`	`54`	`{`
`55`	`55`	`parent::__construct(`
`56`	`56`	`[`