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();
     }

tests/Query/BuilderTest.php

@@ -384,8 +384,7 @@ public function testDocExample3(): void
         $expected = 'hello|world';
         $builder = new Builder();
 
-        $builder->addElement(Builder\OrGroup::fromStrings('hello', 'world'))
-        ;
+        $builder->addElement(Builder\OrGroup::fromStrings('hello', 'world'));
 
         static::assertSame($expected, $builder->render());
     }

tests/Redis/Command/Option/GroupedOptionTest.php

@@ -107,7 +107,7 @@ public function testGetOptionsName(): void
     public function testSetUnknownOptionData(): void
     {
         $this->expectException(OutOfRangeException::class);
-        $this->expectErrorMessage('There is no option for foobar');
+        $this->expectExceptionMessage('There is no option for foobar');
 
         $option = new GroupedOption([], []);
         $option->setDataOfOption('foobar', 'bar');
@@ -116,7 +116,7 @@ public function testSetUnknownOptionData(): void
     public function testSetLockOptionData(): void
     {
         $this->expectException(BadMethodCallException::class);
-        $this->expectErrorMessage('The option lock can\'t be modified');
+        $this->expectExceptionMessage('The option lock can\'t be modified');
 
         $option = new GroupedOption(['lock' => new NamelessOption('foo')], [], ['lock']);
         $option->setDataOfOption('lock', 'bar');

tests/psalm/stubs/phpiredis.php

@@ -30,130 +30,94 @@
 const PHPIREDIS_REPLY_STATUS = 5;
 const PHPIREDIS_REPLY_ERROR = 6;
 
-function phpiredis_connect($host, $port = 6379): void
-{
-}
-function phpiredis_pconnect($host, $port = 6379): void
-{
-}
-function phpiredis_disconnect(): void
-{
-}
+function phpiredis_connect($host, $port = 6379): void {}
+function phpiredis_pconnect($host, $port = 6379): void {}
+function phpiredis_disconnect(): void {}
 
 /**
  * @param resource $redis
  * @param string[] $command
  *
  * @return bool|string
  */
-function phpiredis_command_bs($redis, array $command)
-{
-}
+function phpiredis_command_bs($redis, array $command) {}
 
 /**
  * @param resource $redis
  *
  * @return bool|string
  */
-function phpiredis_command($redis, string $command)
-{
-}
+function phpiredis_command($redis, string $command) {}
 
 /**
  * @param resource      $redis
  * @param array<string> $commands
  *
  * @return array<bool|string>
  */
-function phpiredis_multi_command($redis, array $commands)
-{
-}
+function phpiredis_multi_command($redis, array $commands) {}
 
 /**
  * @param resource             $redis
  * @param array<array<string>> $commands
  *
  * @return array<bool|string>
  */
-function phpiredis_multi_command_bs($redis, array $commands)
-{
-}
+function phpiredis_multi_command_bs($redis, array $commands) {}
 
 /**
  * @param array<float|int|string> $args
  */
-function phpiredis_format_command(array $args): string
-{
-}
+function phpiredis_format_command(array $args): string {}
 
 /**
  * @return resource
  */
-function phpiredis_reader_create()
-{
-}
+function phpiredis_reader_create() {}
 
 /**
  * @param resource $reader
  */
-function phpiredis_reader_reset($reader): void
-{
-}
+function phpiredis_reader_reset($reader): void {}
 
 /**
  * @param resource $reader
  */
-function phpiredis_reader_feed($reader, string $response): void
-{
-}
+function phpiredis_reader_feed($reader, string $response): void {}
 
 /**
  * @param resource $reader
  *
  * @return bool|int
  */
-function phpiredis_reader_get_state($reader)
-{
-}
+function phpiredis_reader_get_state($reader) {}
 
 /**
  * @param resource $reader
  *
  * @return bool|string
  */
-function phpiredis_reader_get_error($reader)
-{
-}
+function phpiredis_reader_get_error($reader) {}
 
 /**
  * @param resource $reader
  *
  * @return array<array|bool|int|string>|bool|int|string
  */
-function phpiredis_reader_get_reply($reader, int &$type)
-{
-}
+function phpiredis_reader_get_reply($reader, int &$type) {}
 
 /**
  * @param resource $redis
  */
-function phpiredis_reader_destroy($redis): void
-{
-}
+function phpiredis_reader_destroy($redis): void {}
 
 /**
  * @param resource $reader
  */
-function phpiredis_reader_set_error_handler($reader, ?callable $handler): void
-{
-}
+function phpiredis_reader_set_error_handler($reader, ?callable $handler): void {}
 
 /**
  * @param resource $reader
  */
-function phpiredis_reader_set_status_handler($reader, ?callable $handler): void
-{
-}
-function phpiredis_utils_crc16(string $data): int
-{
-}
+function phpiredis_reader_set_status_handler($reader, ?callable $handler): void {}
+function phpiredis_utils_crc16(string $data): int {}