Add TinyRedis + update Readme

Author: MacFJA

README.md

@@ -18,6 +18,12 @@ This lib can use several connector for Redis:
  - [Predis](https://github.com/predis/predis/wiki) - Pure PHP implementation
  - [Phpredis](https://github.com/phpredis/phpredis) - PHP extension
  - [Phpiredis](https://github.com/nrk/phpiredis) - PHP extension depending on [hiredis](https://github.com/redis/hiredis)
+ - [Amp\Redis](https://github.com/amphp/redis) - Pure PHP Async implementation
+ - [cheprasov/php-redis-client](https://github.com/cheprasov/php-redis-client) - Pure PHP implementation
+ - [Credis](https://github.com/colinmollenhour/credis) - Pure PHP implementation
+ - [Rediska](https://github.com/Shumkov/Rediska) - Pure PHP implementation
+ - [Redisent](https://github.com/jdp/redisent) - Pure PHP implementation
+ - [TinyRedis](https://github.com/ptrofimov/tinyredisclient) - Pure PHP implementation
 
 You can pick the connector depending of your need.
 
@@ -28,10 +34,28 @@ $clientFacade = new \MacFJA\RediSearch\Redis\Client\ClientFacade();
 $client = $clientFacade->getClient(new \Predis\Client(/* ... */));
 
 // With Phpredis extension
-$client = $clientFacade->getClient(new Redis([/* ... */]));
+$client = $clientFacade->getClient(new \Redis([/* ... */]));
 
 // With Phpiredis extension
 $client = $clientFacade->getClient(phpiredis_connect($host));
+
+// With Amp\Redis
+$client = $clientFacade->getClient(new \Amp\Redis\Redis(new RemoteExecutor(Config::fromUri(/* ... */))));
+
+// With Cheprasov
+$client = $clientFacade->getClient(new \RedisClient\Client\Version\RedisClient6x0([/* ... */]));
+
+// With Rediska
+$client = $clientFacade->getClient(new \Rediska(['servers' => [[/* ... */]]]));
+
+// With Redisent
+$client = $clientFacade->getClient(new \redisent\Redis(/* ... */));
+
+// With TinyRedisClient
+$client = $clientFacade->getClient(new \TinyRedisClient(/* ... */));
+
+// With Credis
+$client = $clientFacade->getClient(new \Credis_Client(/* ... */));
 ```
 
 You can add your own implementation, all you need is to implement the interface `\MacFJA\RediSearch\Redis\Client` and add it to the client facace with:

composer.json

@@ -35,6 +35,7 @@
         "phpstan/phpstan": "^0.12.92",
         "phpunit/phpunit": "^8.5",
         "predis/predis": "^1.1",
+        "ptrofimov/tinyredisclient": "^1.1",
         "redisent/redisent": "dev-master",
         "roave/security-advisories": "dev-latest",
         "rskuipers/php-assumptions": "^0.8.0",
@@ -44,12 +45,13 @@
     },
     "suggest": {
         "ext-phpiredis": "To use Phpiredis extension implementation",
-        "ext-phpredis": "To use Phpredis extension implementation",
+        "ext-redis": "To use Phpredis extension implementation",
         "amphp/redis": "To use AmpPhp implementation",
         "cheprasov/php-redis-client": "To use Cheprasov implementation",
         "colinmollenhour/credis": "To use Credis implementation",
         "geometria-lab/rediska": "To use Rediska implementation",
         "predis/predis": "To use Predis implementation",
+        "ptrofimov/tinyredisclient": "To use TinyRedisClient implementation",
         "redisent/redisent": "To use Redisent implementation"
     },
     "config": {

composer.lock

@@ -27,6 +27,9 @@
 
 abstract class AbstractClient implements Client
 {
+    /** @var bool */
+    public static $disableNotice = false;
+
     public function pipeline(Command ...$commands): array
     {
         $results = $this->doPipeline(...$commands);
@@ -68,28 +71,29 @@ protected function getMissingMessage(string $name, bool $isExtension, array $cla
         if (true === $isExtension) {
             $message = 'The extension '.$name.' is missing.'.PHP_EOL.'Install the extension';
         }
-        $message .= ' or use a polyfill that provide';
+        $message .= ' or use a polyfill that provide ';
 
         $classesMessage = null;
         if (1 === count($classes)) {
-            $classesMessage = ' the class "'.reset($classes).'"';
+            $classesMessage = 'the class "'.reset($classes).'"';
         } elseif (count($classes) > 1) {
-            $classesMessage = ' the classes "'.implode('", "', $classes).'"';
+            $classesMessage = 'the classes "'.implode('", "', $classes).'"';
         }
         $methodsMessage = null;
         if (1 === count($methods)) {
-            $methodsMessage = ' the method "'.reset($methods).'"';
+            $methodsMessage = 'the method "'.reset($methods).'"';
         } elseif (count($methods) > 1) {
-            $methodsMessage = ' the methods "'.implode('", "', $methods).'"';
+            $methodsMessage = 'the methods "'.implode('", "', $methods).'"';
         }
         $functionsMessage = null;
         if (1 === count($functions)) {
-            $functionsMessage = ' the function "'.reset($functions).'"';
+            $functionsMessage = 'the function "'.reset($functions).'"';
         } elseif (count($functions) > 1) {
-            $functionsMessage = ' the functions "'.implode('", "', $functions).'"';
+            $functionsMessage = 'the functions "'.implode('", "', $functions).'"';
         }
 
         $message .= implode(' and ', array_filter([$classesMessage, $methodsMessage, $functionsMessage]));
+        $message .= '.';
 
         return $message;
     }

src/Redis/Client/AbstractClient.php

@@ -52,9 +52,6 @@ public static function make($redis): Client
         return new self($redis);
     }
 
-    /*[]
-     * @inheritDoc
-     */
     public function execute(Command $command)
     {
         $result = wait($this->redis->query($command->getId(), ...array_map('strval', $command->getArguments())));
@@ -77,7 +74,8 @@ public static function supports($redis): bool
 
     protected function doPipeline(Command ...$commands): array
     {
-        trigger_error('Warning, \\Amp\\Redis\\Redis don\'t use a real Redis Pipeline', E_USER_NOTICE);
+        false === static::$disableNotice
+            && trigger_error('Warning, \\Amp\\Redis\\Redis don\'t use a real Redis Pipeline', E_USER_NOTICE);
 
         return wait(all(
             array_map(function (Command $command) {

src/Redis/Client/AmpRedisClient.php

@@ -74,7 +74,8 @@ public static function supports($redis): bool
 
     protected function doPipeline(Command ...$commands): array
     {
-        trigger_error('Warning, a workaround is used to enable custom command in pipeline for \\RedisClient\\Pipeline\\PipelineInterface', E_USER_NOTICE);
+        false === static::$disableNotice
+            && trigger_error('Warning, a workaround is used to enable custom command in pipeline for \\RedisClient\\Pipeline\\PipelineInterface', E_USER_NOTICE);
 
         return $this->redis->pipeline(function (PipelineInterface $pipeline) use ($commands): void {
             foreach ($commands as $command) {

src/Redis/Client/CheprasovRedisClient.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Client;
 
 use Credis_Client;
+use function is_array;
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command;
 use RuntimeException;
@@ -38,7 +39,7 @@ private function __construct(Credis_Client $redis)
     {
         if (!self::supports($redis)) {
             throw new RuntimeException($this->getMissingMessage('Credis', false, [
-                Credis_Client::class => ['__call', 'pipeline', 'exec'],
+                Credis_Client::class => ['__call'],
             ]));
         }
         $this->redis = $redis;
@@ -53,22 +54,20 @@ public function execute(Command $command)
     {
         $result = $this->redis->__call($command->getId(), $command->getArguments());
 
-        return $command->parseResponse($result);
+        return $command->parseResponse($this->fixFalseToNull($result));
     }
 
     public function executeRaw(...$args)
     {
         $command = array_shift($args);
 
-        return $this->redis->__call($command, $args);
+        return $this->fixFalseToNull($this->redis->__call($command, $args));
     }
 
     public static function supports($redis): bool
     {
         return $redis instanceof Credis_Client
-            && method_exists($redis, '__call')
-            && method_exists($redis, 'pipeline')
-            && method_exists($redis, 'exec');
+            && method_exists($redis, '__call');
     }
 
     protected function doPipeline(Command ...$commands): array
@@ -78,6 +77,25 @@ protected function doPipeline(Command ...$commands): array
             $pipeline = $pipeline->__call($command->getId(), $command->getArguments());
         }
 
-        return $pipeline->exec();
+        return $this->fixFalseToNull($pipeline->exec());
+    }
+
+    /**
+     * @param false|mixed $response
+     *
+     * @return null|mixed
+     */
+    private function fixFalseToNull($response)
+    {
+        if (false === $response) {
+            return null;
+        }
+        if (is_array($response)) {
+            foreach ($response as &$item) {
+                $item = $this->fixFalseToNull($item);
+            }
+        }
+
+        return $response;
     }
 }

src/Redis/Client/CredisClient.php

@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Copyright MacFJA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace MacFJA\RediSearch\Redis\Client;
+
+use MacFJA\RediSearch\Redis\Client;
+use MacFJA\RediSearch\Redis\Command;
+use RuntimeException;
+
+/**
+ * @codeCoverageIgnore
+ */
+class TinyRedisClient extends AbstractClient
+{
+    /** @var \TinyRedisClient */
+    private $redis;
+
+    public function __construct(\TinyRedisClient $redis)
+    {
+        if (!self::supports($redis)) {
+            throw new RuntimeException($this->getMissingMessage(
+                'TinyRedis',
+                false,
+                [\TinyRedisClient::class => ['__call']]
+            ));
+        }
+        $this->redis = $redis;
+    }
+
+    public function pipeline(Command ...$commands): array
+    {
+        false === static::$disableNotice
+            && trigger_error('Warning, \\TinyRedisClient don\'t use a real Redis Pipeline', E_USER_NOTICE);
+
+        return array_map(function (Command $command) {
+            return $this->execute($command);
+        }, $commands);
+    }
+
+    public function execute(Command $command)
+    {
+        $result = $this->redis->__call($command->getId(), $command->getArguments());
+
+        return $command->parseResponse($result);
+    }
+
+    public function executeRaw(...$args)
+    {
+        $command = array_shift($args);
+
+        return $this->redis->__call($command, $args);
+    }
+
+    public static function supports($redis): bool
+    {
+        return $redis instanceof \TinyRedisClient
+            && method_exists($redis, '__call');
+    }
+
+    public static function make($redis): Client
+    {
+        return new self($redis);
+    }
+
+    protected function doPipeline(Command ...$commands): array
+    {
+        return [];
+    }
+}

src/Redis/Client/TinyRedisClient.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis;
 
 use function count;
+use MacFJA\RediSearch\Redis\Client\AbstractClient;
 use MacFJA\RediSearch\Redis\Command\Aggregate;
 use MacFJA\RediSearch\Redis\Command\AliasAdd;
 use MacFJA\RediSearch\Redis\Command\AliasDel;
@@ -64,7 +65,7 @@ public function create(): Rediska_Connection_Exec
         {
             $connections = $this->_rediska->getConnections();
 
-            if (count($connections) > 1) {
+            if (false === AbstractClient::$disableNotice && count($connections) > 1) {
                 trigger_error('Warning, Multiple redis connections exists, only the first connection will be used', E_USER_NOTICE);
             }
             $connection = reset($connections);