Merge pull request #109 from nly/master

Leandre · web-flow · commit 4c62c24a8bfe · 2017-11-01T18:33:01.000+08:00
bugfix
diff --git a/src/Proxy/RedisProxyCluster.php b/src/Proxy/RedisProxyCluster.php
@@ -317,10 +317,9 @@ private function multi(string $method, array $key, array $arguments)
             $opData = $this->dispatch($opArr, $method, $arguments);
 
             foreach ($opData as $redisPoolName => $op) {
-                $keys = $opArr[$redisPoolName];
                 $values = yield $op;
-                if (is_array($values)) { //$values有可能超时返回false
-                    $retData = array_merge($retData, array_combine($keys, $values));
+                if (is_array($values) && !empty($values)) { //$values有可能超时返回false
+                    $retData = array_merge($retData, $values);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -317,10 +317,9 @@ private function multi(string $method, array $key, array $arguments)`
`317`	`317`	`$opData = $this->dispatch($opArr, $method, $arguments);`
`318`	`318`
`319`	`319`	`foreach ($opData as $redisPoolName => $op) {`
`320`		`- $keys = $opArr[$redisPoolName];`
`321`	`320`	`$values = yield $op;`
`322`		`- if (is_array($values)) { //$values有可能超时返回false`
`323`		`- $retData = array_merge($retData, array_combine($keys, $values));`
	`321`	`+ if (is_array($values) && !empty($values)) { //$values有可能超时返回false`
	`322`	`+ $retData = array_merge($retData, $values);`
`324`	`323`	`}`
`325`	`324`	`}`
`326`	`325`