refactor code

Author: rwifeng

src/Qiniu/Config.php

@@ -12,14 +12,17 @@ final class Config
     const RSF_HOST = 'http://rsf.qbox.me';              // 列举操作Host
     const API_HOST = 'http://api.qiniu.com';            // 数据处理操作Host
 
-    public static $upHost = 'http://up.qiniu.com';      // 默认上传Host
+    public static $upHost;                              // 上传Host
     public static $zone;                                // 设置上传的Zone
 
-    public function __construct(Zone $zone=null) {      // 构造函数，默认为zone0
-        if ($zone!==null) {
-            self::$zone = $zone;
-            self::$upHost = self::$zone->upHost;
-        }
+    public function __construct() {      // 构造函数，默认为zone0
+        self::setZone(Zone::zone0());
+        return;
+    }
+    
+    public static function setZone(Zone $z) {
+        self::$zone = $z;
+        self::$upHost = $z::$upHost;
         return;
     }
 

src/Qiniu/Storage/ResumeUploader.php

@@ -43,15 +43,16 @@ public function __construct(
         $inputStream,
         $size,
         $params,
-        $mime
+        $mime,
+        $config
     ) {
         $this->upToken = $upToken;
         $this->key = $key;
         $this->inputStream = $inputStream;
         $this->size = $size;
         $this->params = $params;
         $this->mime = $mime;
-        $this->host = Config::$defaultHost;
+        $this->host = $config::$upHost;
         $this->contexts = array();
     }
 

src/Qiniu/Storage/UploadManager.php

@@ -116,7 +116,7 @@ public function putFile(
             $size,
             $params,
             $mime,
-            $checkCrc
+            $this->config
         );
         return $up->upload();
     }

src/Qiniu/Zone.php

@@ -3,33 +3,21 @@
 
 final Class Zone 
 {
-    const ZONE0 = 0,                          // Zone 常量， 现在有两个zone可以设置，zone0 & zone1
-          ZONE1 = 1;
+    public static $upHost = 'http://up.qiniu.com';
 
-    public $upHost;
-
-    public function  __construct($upHost) {  
+    public function  __construct($upHost) 
+    {  
         $this->upHost = $upHost; 
     } 
 
-    public static function zone0() {
-        return self::zone(self::ZONE0);
-    }
-
-    public static function zone1() {
-        return self::zone(self::ZONE1);
+    public static function zone0() 
+    {
+        return new self('http://up.qiniu.com');
     }
 
-    public static function zone($z) {
-        switch ($z) {
-            case self::ZONE0:
-                return new self('http://up.qiniu.com');
-                break;
-            case self::ZONE1:
-                return new self('http://up-z1.qiniu.com');
-                break;
-        }
-        return;
+    public static function zone1() 
+    {
+        return new self('http://up-z1.qiniu.com');
     }
 }
 

tests/Qiniu/Tests/FormUpTest.php

@@ -3,23 +3,28 @@
 
 use Qiniu\Storage\FormUploader;
 use Qiniu\Storage\UploadManager;
+use Qiniu\Config;
 
 class FormUpTest extends \PHPUnit_Framework_TestCase
 {
     protected $bucketName;
     protected $auth;
+    protected $config;
+
     protected function setUp()
     {
         global $bucketName;
         $this->bucketName = $bucketName;
 
         global $testAuth;
         $this->auth = $testAuth;
+        $this->config = new Config();
     }
+
     public function testData()
     {
         $token = $this->auth->uploadToken($this->bucketName);
-        list($ret, $error) = FormUploader::put($token, 'formput', 'hello world', null, 'text/plain', true);
+        list($ret, $error) = FormUploader::put($token, 'formput', 'hello world', $this->config, null, 'text/plain', true);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }
@@ -37,7 +42,7 @@ public function testFile()
     {
         $key = 'formPutFile';
         $token = $this->auth->uploadToken($this->bucketName, $key);
-        list($ret, $error) = FormUploader::putFile($token, $key, __file__, null, 'text/plain', true);
+        list($ret, $error) = FormUploader::putFile($token, $key, __file__, $this->config, null, 'text/plain', true);
         $this->assertNull($error);
         $this->assertNotNull($ret['hash']);
     }