refactor

Author: rwifeng

src/Qiniu/Config.php

@@ -14,19 +14,15 @@ final class Config
 
     public static $upHost;                              // 上传Host
     public static $upHostBackup;                        // 上传备用Host
-    public static $zone;                                // 设置上传的Zone
 
     public function __construct()                       // 构造函数，默认为zone0
     {
         self::setZone(Zone::zone0());
-        return;
     }
 
     public static function setZone(Zone $z)
     {
-        self::$zone = $z;
         self::$upHost = $z::$upHost;
         self::$upHostBackup = $z::$upHostBackup;
-        return;
     }
 }

src/Qiniu/Zone.php

@@ -3,33 +3,22 @@
 
 final class Zone
 {
-    public static $upHost = 'http://up.qiniu.com';
-    public static $upHostBackup = 'http://upload.qiniu.com';
+    public static $upHost;
+    public static $upHostBackup;
 
-    public function __construct()
+    public function __construct($upHost, $upHostBackup)
     {
-    }
-
-    public function setUpHost($host)
-    {
-        self::$upHost = $host;
-    }
-
-    public function setUpBackupHost($host)
-    {
-        self::$upHostBackup = $host;
+        self::$upHost = $upHost;
+        self::$upHostBackup = $upHostBackup;
     }
 
     public static function zone0()
     {
-        return new self;
+        return new self('http://up.qiniu.com', 'http://upload.qiniu.com');
     }
 
     public static function zone1()
     {
-        $z1 = new self;
-        $z1->setUpHost('http://up-z1.qiniu.com');
-        $z1->setUpBackupHost('http://upload-z1.qiniu.com');
-        return $z1;
+        return new self('http://up-z1.qiniu.com', 'http://upload-z1.qiniu.com');
     }
 }