Upgrade deps (#81)

* Upgrade deps

* Add php 8.1

* Update deps

Co-authored-by: Ethan Hann <[email protected]>

Author: ethanhann

.gitignore

@@ -1,6 +1,6 @@
 /vendor/
 .idea/
-.php_cs.cache
+.php-cs-fixer.cache
 composer.lock
 composer.phar
 tests.log

.travis.yml

@@ -8,6 +8,7 @@ php:
   - 7.3
   - 7.4
   - 8.0
+  - 8.1
 before_script:
   - printf "yes\n" | pecl install igbinary
   - composer install

RoboFile.php

@@ -1,26 +1,28 @@
 <?php
 
+use Robo\Collection\CollectionBuilder;
+use Robo\Result;
 use Robo\Tasks;
 use Robo\Collection\Collection;
 
 require_once 'vendor/autoload.php';
 
 class RoboFile extends Tasks
 {
-    function build()
+    public function build(): Result
     {
         return (new Collection())
             ->add($this->taskFixCodeStyle())
             ->add($this->taskPhpUnit())
             ->run();
     }
 
-    function test()
+    public function test(): Result
     {
         return $this->taskPhpUnit()->run();
     }
 
-    function testAll()
+    public function testAll(): Result
     {
         return (new Collection())
             ->add($this->taskTestPredis())
@@ -29,41 +31,41 @@ function testAll()
             ->run();
     }
 
-    function testPredis()
+    public function testPredis(): Result
     {
         return $this->taskTestPredis()->run();
     }
 
-    function testPhpRedis()
+    public function testPhpRedis(): Result
     {
         return $this->taskTestPhpRedis()->run();
     }
 
-    function testRedisClient()
+    public function testRedisClient(): Result
     {
         return $this->taskTestRedisClient()->run();
     }
 
-    function taskFixCodeStyle()
+    public function taskFixCodeStyle(): CollectionBuilder
     {
         return $this->taskExec('./vendor/bin/php-cs-fixer fix src');
     }
 
-    function taskTestPredis()
+    public function taskTestPredis(): CollectionBuilder
     {
         $task = $this->taskPhpUnit();
         $task->env('REDIS_LIBRARY', 'Predis');
         return $task;
     }
 
-    function taskTestPhpRedis()
+    public function taskTestPhpRedis(): CollectionBuilder
     {
         $task = $this->taskPhpUnit();
         $task->env('REDIS_LIBRARY', 'PhpRedis');
         return $task;
     }
 
-    function taskTestRedisClient()
+    public function taskTestRedisClient(): CollectionBuilder
     {
         $task = $this->taskPhpUnit();
         $task->env('REDIS_LIBRARY', 'RedisClient');

composer.json

@@ -21,17 +21,17 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.3||>=8.0",
-        "psr/log": "^1.0",
-        "ethanhann/redis-raw": "v1.x-dev"
+        "php": ">=8.0",
+        "psr/log": "^3.0.0",
+        "ethanhann/redis-raw": "^2.1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0",
-        "mockery/mockery": "^0.9.9",
-        "predis/predis": "^1.1",
-        "friendsofphp/php-cs-fixer": "^2.2",
-        "consolidation/robo": "^2.0",
-        "monolog/monolog": "^1.23",
+        "phpunit/phpunit": "^9.5.23",
+        "mockery/mockery": "^1.5.0",
+        "predis/predis": "^v2.0.0",
+        "friendsofphp/php-cs-fixer": "^v3.10.0",
+        "consolidation/robo": "^4.0.0-alpha1",
+        "monolog/monolog": "^3.2.0",
         "ukko/phpredis-phpdoc": "^5.0@beta",
         "cheprasov/php-redis-client": "^1.9"
     }

src/Exceptions/UnsupportedRediSearchLanguageException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Ehann\RediSearch\Exceptions;
 
 use Exception;

src/Index.php

@@ -291,7 +291,7 @@ public function setNoFrequenciesEnabled(bool $noFrequenciesEnabled): IndexInterf
         $this->noFrequenciesEnabled = $noFrequenciesEnabled;
         return $this;
     }
-    
+
     /**
      * @param array $stopWords
      * @return IndexInterface

src/Query/Builder.php

@@ -7,7 +7,7 @@
 
 class Builder implements BuilderInterface
 {
-    const GEO_FILTER_UNITS = ['m', 'km', 'mi', 'ft'];
+    public const GEO_FILTER_UNITS = ['m', 'km', 'mi', 'ft'];
 
     protected $return = '';
     protected $summarize = '';
@@ -181,6 +181,11 @@ public function language(string $languageName): BuilderInterface
         return $this;
     }
 
+    protected function explodeArgument(?string $argument): array
+    {
+        return explode(' ', $argument ?? '');
+    }
+
     public function makeSearchCommandArguments(string $query): array
     {
         $queryParts = array_merge([$query], $this->tagFilters, $this->numericFilters, $this->geoFilters);
@@ -189,25 +194,25 @@ public function makeSearchCommandArguments(string $query): array
         return array_filter(
             array_merge(
                 trim($queryWithFilters) === '' ? [$this->indexName] : [$this->indexName, $queryWithFilters],
-                explode(' ', $this->limit),
-                explode(' ', $this->slop),
+                $this->explodeArgument($this->limit),
+                $this->explodeArgument($this->slop),
                 [
                     $this->verbatim,
                     $this->withScores,
                     $this->withPayloads,
                     $this->noStopWords,
                     $this->noContent,
                 ],
-                explode(' ', $this->inFields),
-                explode(' ', $this->inKeys),
-                explode(' ', $this->return),
-                explode(' ', $this->summarize),
-                explode(' ', $this->highlight),
-                explode(' ', $this->sortBy),
-                explode(' ', $this->scorer),
-                explode(' ', $this->language),
-                explode(' ', $this->expander),
-                explode(' ', $this->payload)
+                $this->explodeArgument($this->inFields),
+                $this->explodeArgument($this->inKeys),
+                $this->explodeArgument($this->return),
+                $this->explodeArgument($this->summarize),
+                $this->explodeArgument($this->highlight),
+                $this->explodeArgument($this->sortBy),
+                $this->explodeArgument($this->scorer),
+                $this->explodeArgument($this->language),
+                $this->explodeArgument($this->expander),
+                $this->explodeArgument($this->payload),
             ),
             function ($item) {
                 return !is_null($item) && $item !== '';

src/RediSearchRedisClient.php

@@ -25,10 +25,19 @@ public function __construct(RedisRawClientInterface $redis)
         $this->redis = $redis;
     }
 
-    public function validateRawCommandResults($payload, string $command, array $arguments)
+    /**
+     * @throws RediSearchException
+     * @throws DocumentAlreadyInIndexException
+     * @throws UnknownIndexNameException
+     * @throws UnsupportedRediSearchLanguageException
+     * @throws AliasDoesNotExistException
+     * @throws UnknownRediSearchCommandException
+     * @throws UnknownIndexNameOrNameIsAnAliasItselfException
+     */
+    public function validateRawCommandResults($rawResult, string $command, array $arguments)
     {
-        $isPayloadException = $payload instanceof Exception;
-        $message = $isPayloadException ? $payload->getMessage() : $payload;
+        $isRawResultException = $rawResult instanceof Exception;
+        $message = $isRawResultException ? $rawResult->getMessage() : $rawResult;
 
         if (!is_string($message)) {
             return;
@@ -60,12 +69,13 @@ public function validateRawCommandResults($payload, string $command, array $argu
             throw new DocumentAlreadyInIndexException($arguments[0], $arguments[1]);
         }
 
-        throw new RediSearchException($payload);
+        throw new RediSearchException($rawResult);
     }
 
     public function connect($hostname = '127.0.0.1', $port = 6379, $db = 0, $password = null): RedisRawClientInterface
     {
         $this->redis->connect($hostname, $port, $db, $password);
+        return $this;
     }
 
     public function flushAll()
@@ -78,6 +88,15 @@ public function multi(bool $usePipeline = false)
         return $this->redis->multi($usePipeline);
     }
 
+    /**
+     * @throws RediSearchException
+     * @throws DocumentAlreadyInIndexException
+     * @throws UnknownIndexNameException
+     * @throws UnsupportedRediSearchLanguageException
+     * @throws AliasDoesNotExistException
+     * @throws UnknownRediSearchCommandException
+     * @throws UnknownIndexNameOrNameIsAnAliasItselfException
+     */
     public function rawCommand(string $command, array $arguments = [])
     {
         try {

src/Suggestion.php

@@ -4,7 +4,6 @@
 
 class Suggestion extends AbstractIndex
 {
-
     /**
      * Add a suggestion string to an auto-complete suggestion dictionary.
      * This is disconnected from the index definitions,

tests/RediSearch/Aggregate/BuilderTest.php

@@ -286,17 +286,18 @@ public function testGetQuantile()
 
         $result = $this->subject
             ->groupBy('title')
-            ->quantile('price', 0.5)
+            ->quantile('price', 1)
             ->search();
 
-        $this->assertEquals($expected1, $result->getDocuments()[0]->quantile_price);
-        $this->assertEquals($expected2, $result->getDocuments()[1]->quantile_price);
-        $this->assertEquals($expected3, $result->getDocuments()[2]->quantile_price);
+        $documents = $result->getDocuments();
+        $this->assertEquals($expected1, $documents[0]->quantile_price);
+        $this->assertEquals($expected2, $documents[1]->quantile_price);
+        $this->assertEquals($expected3, $documents[2]->quantile_price);
     }
 
     public function testGetAbsoluteQuantile()
     {
-        $expected = 38.85;
+        $expected = 18.85;
 
         $result = $this->subject
             ->groupBy()