Merge pull request #137 from longbai/config_uphost

upload backup host

Author: longbai

src/Qiniu/Config.php

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

src/Qiniu/Storage/FormUploader.php

@@ -32,9 +32,9 @@ public static function put(
             }
         }
 
-        $response = Client::multipartPost($config::$upHost, $fields, 'file', $fname, $data, $mime);
+        $response = Client::multipartPost($config->getUpHost(), $fields, 'file', $fname, $data, $mime);
         if (!$response->ok()) {
-            return array(null, new Error($config::$upHost, $response));
+            return array(null, new Error($config->getUpHost(), $response));
         }
         return array($response->json(), null);
     }
@@ -65,9 +65,9 @@ public static function putFile(
             }
         }
         $headers =array('Content-Type' => 'multipart/form-data');
-        $response = client::post($config::$upHost, $fields, $headers);
+        $response = client::post($config->getUpHost(), $fields, $headers);
         if (!$response->ok()) {
-            return array(null, new Error($config::$upHost, $response));
+            return array(null, new Error($config->getUpHost(), $response));
         }
         return array($response->json(), null);
     }

src/Qiniu/Storage/ResumeUploader.php

@@ -24,6 +24,7 @@ final class ResumeUploader
     private $contexts;
     private $host;
     private $currentUrl;
+    private $config;
 
     /**
      * 上传二进制流到七牛
@@ -52,11 +53,11 @@ public function __construct(
         $this->size = $size;
         $this->params = $params;
         $this->mime = $mime;
-        $this->host = $config::$upHost;
         $this->contexts = array();
+        $this->config = $config;
+        $this->host = $config->getUpHost();
     }
 
-
     /**
      * 上传操作
      */
@@ -77,7 +78,7 @@ public function upload()
                 $ret = $response->json();
             }
             if ($response->statusCode < 0) {
-                $this->host = $config::$upHostBackup;
+                $this->host = $this->config->getUpHostBackup();
             }
             if ($response->needRetry() || !isset($ret['crc32']) || $crc != $ret['crc32']) {
                 $response = $this->makeBlock($data, $blockSize);

src/Qiniu/Storage/UploadManager.php

@@ -13,9 +13,9 @@
  */
 final class UploadManager
 {
-    public $config;
+    private $config;
 
-    public function __construct($config = null)
+    public function __construct(Config $config = null)
     {
         if ($config === null) {
             $config = new Config();

tests/Qiniu/Tests/ResumeUpTest.php

@@ -3,6 +3,8 @@
 
 use Qiniu\Storage\ResumeUploader;
 use Qiniu\Storage\UploadManager;
+use Qiniu\Config;
+use Qiniu\Zone;
 
 class ResumeUpTest extends \PHPUnit_Framework_TestCase
 {
@@ -29,6 +31,19 @@ public function test4ML()
         unlink($tempFile);
     }
 
+    public function test4ML2()
+    {
+        $key = 'resumePutFile4ML';
+        $zone = new Zone('http://up.fake.com', 'http://up.qiniu.com');
+        $cfg = new Config($zone);
+        $upManager = new UploadManager($cfg);
+        $token = $this->auth->uploadToken($this->bucketName, $key);
+        $tempFile = qiniuTempFile(4*1024*1024+10);
+        list($ret, $error) = $upManager->putFile($token, $key, $tempFile);
+        $this->assertNull($error);
+        $this->assertNotNull($ret['hash']);
+        unlink($tempFile);
+    }
     // public function test8M()
     // {
     //     $key = 'resumePutFile8M';