fix: swoft-cloud/swoft/issues/1312 redis not support select command

swoft-cloud · Jul 2, 2020 · 7f08af4 · 7f08af4
1 parent 57e9a0f
commit 7f08af4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/redis/src/Connection/Connection.php b/src/redis/src/Connection/Connection.php
@@ -16,6 +16,7 @@
 use Swoft\Stdlib\Helper\PhpHelper;
 use Throwable;
 use function count;
+use function method_exists;
 use function sprintf;
 
 /**
@@ -315,7 +316,7 @@ abstract class Connection extends AbstractConnection implements ConnectionInterf
      * @param Pool    $pool
      * @param RedisDb $redisDb
      */
-    public function initialize(Pool $pool, RedisDb $redisDb)
+    public function initialize(Pool $pool, RedisDb $redisDb): void
     {
         $this->pool     = $pool;
         $this->redisDb  = $redisDb;
@@ -391,10 +392,10 @@ public function command(string $method, array $parameters = [], bool $reconnect
     {
         try {
             $lowerMethod = strtolower($method);
-            if (!in_array($lowerMethod, $this->supportedMethods, true)) {
-                throw new RedisException(
-                    sprintf('Method(%s) is not supported!', $method)
-                );
+            // if (!in_array($lowerMethod, $this->supportedMethods, true)) {
+            // Up: use method_exists check command is valid.
+            if (!method_exists($this->client, $lowerMethod)) {
+                throw new RedisException(sprintf('Redis method(%s) is not supported!', $method));
             }
 
             // Before event

diff --git a/src/redis/src/Redis.php b/src/redis/src/Redis.php
@@ -149,7 +149,7 @@
  * @method static array xRange(string $stream_key, string $start, string $end, int $count)
  * @method static array xRevRange(string $stream_key, string $end, string $start, int $count)
  * @method static array xRead(array|string $stream_keys, int $count, int $block)
- * @method static array xReadGroup(string $group, string consumer, array|string $stream_keys, int $count, int $block)
+ * @method static array xReadGroup(string $group, string $consumer, array|string $stream_keys, int $count, int $block)
  * @method static integer xTrim(string $stream_key, int $max_len, bool $approximate)
  */
 class Redis

diff --git a/src/redis/src/RedisDb.php b/src/redis/src/RedisDb.php
@@ -149,7 +149,7 @@ public function getConnection(): Connection
         $connection  = $connections[$this->driver] ?? null;
 
         if (!$connection instanceof Connection) {
-            throw new RedisException(sprintf('Connection(dirver=%s) is not exist', $this->driver));
+            throw new RedisException(sprintf('Connection(driver=%s) is not exist', $this->driver));
         }
 
         return $connection;