fmt code

Author: rwifeng

src/Qiniu/Auth.php

@@ -90,8 +90,7 @@ public function uploadToken(
         $args['scope'] = $scope;
         $args['deadline'] = $deadline;
 
-        if ($zone === null) 
-        {
+        if ($zone === null) {
             $zone = new Zone();
         }
         $args['upHosts'] = $zone->getUpHosts($this->accessKey, $bucket);

src/Qiniu/Storage/BucketManager.php

@@ -20,8 +20,7 @@ final class BucketManager
     public function __construct(Auth $auth, Zone $zone = null)
     {
         $this->auth = $auth;
-        if ($zone === null)
-        {
+        if ($zone === null) {
             $this->zone = new Zone();
         }
     }
@@ -216,7 +215,7 @@ public function fetch($url, $bucket, $key = null)
         $ak = $this->auth->getAccessKey();
         $ioHost = $this->zone->getIoHost($ak, $bucket);
 
-        $url = $ioPost . $path;
+        $url = $ioHost . $path;
         return $this->post($url, null);
     }
 
@@ -237,7 +236,7 @@ public function prefetch($bucket, $key)
         $ak = $this->auth->getAccessKey();
         $ioHost = $this->zone->getIoHost($ak, $bucket);
 
-        $url = $ioPost . $path;
+        $url = $ioHost . $path;
         list(, $error) = $this->post($url, null);
         return $error;
     }

src/Qiniu/Zone.php

@@ -16,8 +16,7 @@ final class Zone
     public function __construct($scheme = null)
     {
         $this->hostCache = array();
-        if ($scheme != null) 
-        {
+        if ($scheme != null) {
             $this->scheme = $scheme;
         }
     }
@@ -39,15 +38,13 @@ public function getBackupUpHostByToken($uptoken)
     public function getIoHost($ak, $bucket)
     {
         list($bucketHosts, ) = $this->getBucketHosts($ak, $bucket);
-        $ioHost = $bucketHosts['ioHost'];
-        return $upHost;
+        return $bucketHosts['ioHost'][0];
     }
 
     public function getUpHosts($ak, $bucket)
     {
         list($bucketHosts, $err) = $this->getBucketHosts($ak, $bucket);
-        if ($err !== null)
-        {
+        if ($err !== null) {
             return array(null, $err);
         }
 
@@ -58,8 +55,7 @@ public function getUpHosts($ak, $bucket)
     private function unmarshalUpToken($uptoken)
     {
         $token = split(':', $uptoken);
-        if (count($token) !== 3)
-        {
+        if (count($token) !== 3) {
             throw new \Exception("Invalid Uptoken", 1);
         }
 
@@ -68,8 +64,7 @@ private function unmarshalUpToken($uptoken)
         $policy = json_decode($policy, true);
 
         $bucket = $policy['scope'];
-        if (strpos($bucket, ':'))
-        {
+        if (strpos($bucket, ':')) {
             $bucket = split(':', $bucket)[0];
         }
 
@@ -81,19 +76,16 @@ public function getBucketHosts($ak, $bucket)
         $key = $ak . $bucket;
 
         $exist = false;
-        if (count($this->hostCache) > 0) 
-        {
+        if (count($this->hostCache) > 0) {
             $exist = array_key_exists($key, $this->hostCache) && $this->hostCache[$key]['deadline'] > time();
         }
 
-        if ($exist) 
-        {
+        if ($exist) {
             return $this->hostCache[$key];
         }
 
         list($hosts, $err) = $this->bucketHosts($ak, $bucket);
-        if ($err !== null) 
-        {
+        if ($err !== null) {
             return array(null , $err);
         }
 
@@ -121,10 +113,10 @@ public function getBucketHosts($ak, $bucket)
      *    }
      *  }
      **/
-    private function bucketHosts($ak, $bucket) 
+    private function bucketHosts($ak, $bucket)
     {
-        $path = '/v1/query' . "?ak=$ak&bucket=$bucket";
-        $ret = Client::Get(Config::UC_HOST . $path);
+        $url = Config::UC_HOST . '/v1/query' . "?ak=$ak&bucket=$bucket";
+        $ret = Client::Get($url);
         if (!$ret->ok()) {
             return array(null, new Error($url, $ret));
         }