浏览代码

Reworked a bit the internals of Predis\Client::create().

Daniele Alessandri 15 年之前
父节点
当前提交
45be8e6385
共有 1 个文件被更改,包括 7 次插入5 次删除
  1. 7 5
      lib/Predis.php

+ 7 - 5
lib/Predis.php

@@ -34,20 +34,22 @@ class Client {
         $argv = func_get_args();
         $argv = func_get_args();
         $argc = func_num_args();
         $argc = func_num_args();
 
 
-        $client = new Client();
-
         if ($argc == 1) {
         if ($argc == 1) {
-            $client->setConnection($client->createConnection($argv[0]));
+            return new Client($argv[0]);
         }
         }
         else if ($argc > 1) {
         else if ($argc > 1) {
+            $client  = new Client();
             $cluster = new ConnectionCluster();
             $cluster = new ConnectionCluster();
             foreach ($argv as $parameters) {
             foreach ($argv as $parameters) {
+                // TODO: this is a bit dirty...
                 $cluster->add($client->createConnection($parameters));
                 $cluster->add($client->createConnection($parameters));
             }
             }
             $client->setConnection($cluster);
             $client->setConnection($cluster);
+            return $client;
+        }
+        else {
+            return new Client();
         }
         }
-
-        return $client;
     }
     }
 
 
     private function createConnection($parameters) {
     private function createConnection($parameters) {