Fix PhpRedis (#17627)

laravel · Jan 28, 2017 · ddcf575 · ddcf575
1 parent 8a1737e
commit ddcf575
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/src/Illuminate/Redis/Connections/PhpRedisConnection.php b/src/Illuminate/Redis/Connections/PhpRedisConnection.php
@@ -29,12 +29,11 @@ public function __construct($client)
      */
     public function set($key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
     {
-        return $this->command(
-            'set',
+        return $this->command('set', [
             $key,
             $value,
             $expireResolution ? [$expireResolution, $flag => $expireTTL] : null
-        );
+        ]);
     }
 
     /**
@@ -47,7 +46,7 @@ public function set($key, $value, $expireResolution = null, $expireTTL = null, $
      */
     public function lrem($key, $count, $value)
     {
-        return $this->command('lrem', $key, $value, $count);
+        return $this->command('lrem', [$key, $value, $count]);
     }
 
     /**
@@ -59,7 +58,7 @@ public function lrem($key, $count, $value)
      */
     public function spop($key, $count = null)
     {
-        return $this->command('spop', $key, $count);
+        return $this->command('spop', [$key]);
     }
 
     /**
@@ -73,12 +72,12 @@ public function zadd($key, array $membersAndScoresDictionary)
     {
         $arguments = [];
 
-        foreach ($membersAndScoresDictionary as $member => $score) {
+        foreach ($membersAndScoresDictionary as $score => $member) {
             $arguments[] = $score;
             $arguments[] = $member;
         }
 
-        return $this->command('zadd', ...$arguments);
+        return $this->client->zadd($key, ...$arguments);
     }
 
     /**
@@ -91,7 +90,9 @@ public function zadd($key, array $membersAndScoresDictionary)
      */
     public function evalsha($script, $numkeys, ...$arguments)
     {
-        return $this->command('evalsha', [$this->script('load', $script), $arguments, $parameters]);
+        return $this->command('evalsha', [
+            $this->script('load', $script), $arguments, $numkeys
+        ]);
     }
 
     /**
@@ -163,17 +164,6 @@ public function __call($method, $parameters)
             return $this->proxyToEval($parameters);
         }
 
-        $arrayMethods = [
-            'hdel', 'hstrlen',
-            'lpush', 'rpush',
-            'scan', 'hscan', 'sscan', 'zscan',
-            'sadd', 'srem', 'sdiff', 'sinter', 'sunion', 'sdiffstore', 'sinterstore', 'sunionstore',
-        ];
-
-        if (is_array($parameters) && in_array($method, $arrayMethods)) {
-            $this->command($method, ...$parameters);
-        }
-
         return parent::__call($method, $parameters);
     }
 }