Merge pull request #65 from MacFJA/php8-deprecated

Fix deprecation warning with PHP 8.1+

Author: MacFJA

src/Query/Builder/QueryElementDecorator.php

@@ -21,6 +21,4 @@
 
 namespace MacFJA\RediSearch\Query\Builder;
 
-interface QueryElementDecorator extends QueryElement
-{
-}
+interface QueryElementDecorator extends QueryElement {}

src/Query/Builder/QueryElementVector.php

@@ -33,7 +33,7 @@
 class QueryElementVector implements QueryElementDecorator
 {
     private const PARAMETERS = [
-        'EF_RUNTIME' => 'int',
+        'EF_RUNTIME' => 'integer',
     ];
 
     /** @var QueryElement */

src/Redis/Client/PhpredisClient.php

@@ -85,6 +85,7 @@ public function executeRaw(...$args)
         if (count($args) < 1) {
             return null;
         }
+
         // @phpstan-ignore-next-line
         return $this->redis->rawCommand(...$args);
     }

src/Redis/Command/AggregateCommand/LimitOption.php

@@ -21,6 +21,4 @@
 
 namespace MacFJA\RediSearch\Redis\Command\AggregateCommand;
 
-class LimitOption extends \MacFJA\RediSearch\Redis\Command\SearchCommand\LimitOption
-{
-}
+class LimitOption extends \MacFJA\RediSearch\Redis\Command\SearchCommand\LimitOption {}

src/Redis/Command/CreateCommand/VectorFieldOption.php

@@ -121,8 +121,7 @@ public function addAttribute(string $type, int $dimension, string $distanceMetri
             + (is_int($blockSize) ? 2 : 0)
             + (is_int($maxEdge) ? 2 : 0)
             + (is_int($efConstruction) ? 2 : 0)
-            + (is_int($efRuntime) ? 2 : 0)
-        ;
+            + (is_int($efRuntime) ? 2 : 0);
 
         /** @var int $count */
         $count = $this->getDataOfOption('count') ?? 0;

src/Redis/Command/Option/DecoratedOptionTrait.php

@@ -61,6 +61,9 @@ public function getVersionConstraint(): string
         return $this->decorated->getVersionConstraint();
     }
 
+    /**
+     * @return array<float|int|string>
+     */
     public function render(?string $version = null): array
     {
         return $this->decorated->render($version);

src/Redis/Command/Search.php

@@ -360,8 +360,7 @@ public function parseResponse($data)
             + (true === $useScores ? 1 : 0)
             + (true === $usePayloads ? 1 : 0)
             + (true === $useSortKeys ? 1 : 0)
-            - (true === $noContent ? 1 : 0)
-        ;
+            - (true === $noContent ? 1 : 0);
 
         $documents = array_chunk($data, $chunkSize);
 

src/Redis/Response.php

@@ -21,6 +21,4 @@
 
 namespace MacFJA\RediSearch\Redis;
 
-interface Response
-{
-}
+interface Response {}

src/Redis/Response/AggregateResponseItem.php

@@ -65,6 +65,7 @@ public function getValue(string $fieldName, $default = null)
             __METHOD__,
             __CLASS__
         ), E_USER_DEPRECATED);
+
         // @phpstan-ignore-next-line
         return $this->getFieldValue($fieldName, $default);
     }

src/Redis/Response/PaginatedResponse.php

@@ -66,7 +66,7 @@ public function __construct(PaginatedCommand $command, int $totalCount, array $i
     /**
      * @return array<ResponseItem>
      */
-    public function current()
+    public function current(): array
     {
         if ($this->requestedOffset === ($this->lastCommand->getOffset() ?? 0) && ($this->requestedSize === $this->getPageSize())) {
             $this->requestedOffset = null;
@@ -101,7 +101,7 @@ public function getPageCount(): int
         return (int) ceil($this->totalCount / $this->getPageSize());
     }
 
-    public function key()
+    public function key(): int
     {
         if (0 === $this->getPageSize()) {
             return 0;
@@ -110,7 +110,7 @@ public function key()
         return (int) floor(($this->lastCommand->getOffset() ?? $this->requestedOffset ?? 0) / $this->getPageSize());
     }
 
-    public function valid()
+    public function valid(): bool
     {
         return (
             null === $this->requestedOffset
@@ -133,7 +133,7 @@ public function getTotalCount(): int
         return $this->totalCount;
     }
 
-    public function count()
+    public function count(): int
     {
         return $this->getPageCount();
     }