upyun / php-sdk

upyun.class.php

Doc Comments +19 added lines, -3 removed lines

@@ -212,7 +212,8 @@ 
 
     /**
      * 连接签名方法
-     * @param $method string 请求方式 {GET, POST, PUT, DELETE}
+     * @param string $method string 请求方式 {GET, POST, PUT, DELETE}
+     * @param string $date
      * @return string 签名字符串
      */
     private function sign($method, $uri, $date, $length)
@@ -229,7 +230,7 @@ 
      * @param array $headers 请求需要的特殊HTTP HEADERS
      * @param array $body 需要POST发送的数据
      * @param null $file_handle
-     * @return mixed
+     * @return string
      * @throws UpYunAuthorizationException
      * @throws UpYunException
      * @throws UpYunForbiddenException
@@ -373,7 +374,7 @@ 
      *
      * @param string $header_string
      *
-     * @return mixed
+     * @return string
      */
     private function _getErrorMessage($header_string)
     {
@@ -405,6 +406,9 @@ 
 
 class UpYunAuthorizationException extends UpYunException
 {
+    /**
+     * @param string|null $message
+     */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
         parent::__construct($message, 401, $previous);
@@ -413,6 +417,9 @@ 
 
 class UpYunForbiddenException extends UpYunException
 {
+    /**
+     * @param string|null $message
+     */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
         parent::__construct($message, 403, $previous);
@@ -421,6 +428,9 @@ 
 
 class UpYunNotFoundException extends UpYunException
 {
+    /**
+     * @param string|null $message
+     */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
         parent::__construct($message, 404, $previous);
@@ -429,6 +439,9 @@ 
 
 class UpYunNotAcceptableException extends UpYunException
 {
+    /**
+     * @param string|null $message
+     */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
         parent::__construct($message, 406, $previous);
@@ -437,6 +450,9 @@ 
 
 class UpYunServiceUnavailable extends UpYunException
 {
+    /**
+     * @param string|null $message
+     */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
         parent::__construct($message, 503, $previous);

Spacing +4 added lines, -4 removed lines

@@ -219,7 +219,7 @@ 
     {
         //$uri = urlencode($uri);
         $sign = "{$method}&{$uri}&{$date}&{$length}&{$this->_password}";
-        return 'UpYun ' . $this->_username . ':' . md5($sign);
+        return 'UpYun '.$this->_username.':'.md5($sign);
     }
 
     /**
@@ -379,7 +379,7 @@ 
     {
         list($status, $stash) = explode("\r\n", $header_string, 2);
         list($v, $code, $message) = explode(" ", $status, 3);
-        return $message . " X-Request-Id: " . $this->getXRequestId();
+        return $message." X-Request-Id: ".$this->getXRequestId();
     }
 
     private function setXRequestId($header_string)
@@ -394,12 +394,12 @@ 
 {
     public function __construct($message, $code, Exception $previous = null)
     {
-        parent::__construct($message, $code);   // For PHP 5.2.x
+        parent::__construct($message, $code); // For PHP 5.2.x
     }
 
     public function __toString()
     {
-        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+        return __CLASS__.": [{$this->code}]: {$this->message}\n";
     }
 }
 

Braces +18 added lines, -6 removed lines

@@ -71,7 +71,9 @@ 
     public function makeDir($path, $auto_mkdir = true)
     {
         $headers = array('Folder' => 'true');
-        if ($auto_mkdir) $headers['Mkdir'] = 'true';
+        if ($auto_mkdir) {
+            $headers['Mkdir'] = 'true';
+        }
         return $this->_do_request('PUT', $path, $headers);
     }
 
@@ -97,12 +99,20 @@ 
      */
     public function writeFile($path, $file, $auto_mkdir = true, $opts = NULL)
     {
-        if (is_null($opts)) $opts = array();
+        if (is_null($opts)) {
+            $opts = array();
+        }
 
-        if (!is_null($this->_content_md5)) $opts[self::CONTENT_MD5] = $this->_content_md5;
-        if (!is_null($this->_file_secret)) $opts[self::CONTENT_SECRET] = $this->_file_secret;
+        if (!is_null($this->_content_md5)) {
+            $opts[self::CONTENT_MD5] = $this->_content_md5;
+        }
+        if (!is_null($this->_file_secret)) {
+            $opts[self::CONTENT_SECRET] = $this->_file_secret;
+        }
 
-        if ($auto_mkdir === true) $opts['Mkdir'] = 'true';
+        if ($auto_mkdir === true) {
+            $opts['Mkdir'] = 'true';
+        }
 
         return $this->_do_request('PUT', $path, $opts, $file);
     }
@@ -299,7 +309,9 @@ 
         $response = curl_exec($ch);
         $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
-        if ($http_code == 0) throw new UpYunException('Connection Failed', $http_code);
+        if ($http_code == 0) {
+            throw new UpYunException('Connection Failed', $http_code);
+        }
 
         curl_close($ch);
 

examples/write_file.php

Spacing +7 added lines, -7 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 require_once(dirname(__DIR__).'/vendor/autoload.php');
-$config =  array(
+$config = array(
     'user_name' => 'tester',
     'pwd' => 'grjxv2mxELR3',
     'bucket' => 'sdkimg',
-    'picture_path' => dirname(__FILE__) . '/assets/sample.jpeg'
+    'picture_path' => dirname(__FILE__).'/assets/sample.jpeg'
 );
 $upyun = new UpYun($config['bucket'], $config['user_name'], $config['pwd']);
 
 try {
     echo "=========直接上传文件\r\n";
     $fh = fopen(__DIR__.'/sample.jpeg', 'rb');
-    $rsp = $upyun->writeFile('/demo/sample_normal.jpeg', $fh, True);   // 上传图片，自动创建目录
+    $rsp = $upyun->writeFile('/demo/sample_normal.jpeg', $fh, True); // 上传图片，自动创建目录
     fclose($fh);
     var_dump($rsp);
     echo "=========DONE\n\r\n";
@@ -21,7 +21,7 @@ 
         UpYun::CONTENT_MD5 => md5(file_get_contents(__DIR__.'/sample.jpeg'))
     );
     $fh = fopen(__DIR__.'/sample.jpeg', 'rb');
-    $rsp = $upyun->writeFile('/demo/sample_md5.jpeg', $fh, True, $opts);   // 上传图片，自动创建目录
+    $rsp = $upyun->writeFile('/demo/sample_md5.jpeg', $fh, True, $opts); // 上传图片，自动创建目录
     fclose($fh);
     var_dump($rsp);
     echo "=========DONE\r\n\r\n";
@@ -34,7 +34,7 @@ 
         UpYun::X_GMKERL_UNSHARP => True // 是否进行锐化处理
     );
     $fh = fopen(__DIR__.'/sample.jpeg', 'rb');
-    $rsp = $upyun->writeFile('/demo/sample_thumb_1.jpeg', $fh, True, $opts);   // 上传图片，自动创建目录
+    $rsp = $upyun->writeFile('/demo/sample_thumb_1.jpeg', $fh, True, $opts); // 上传图片，自动创建目录
     fclose($fh);
     var_dump($rsp);
     echo "=========DONE\r\n\r\n";
@@ -44,12 +44,12 @@ 
         UpYun::X_GMKERL_THUMBNAIL => 'thumbtype'
     );
     $fh = fopen(__DIR__.'/sample.jpeg', 'rb');
-    $rsp = $upyun->writeFile('/demo/sample_thumb_2.jpeg', $fh, True, $opts);   // 上传图片，自动创建目录
+    $rsp = $upyun->writeFile('/demo/sample_thumb_2.jpeg', $fh, True, $opts); // 上传图片，自动创建目录
     fclose($fh);
     var_dump($rsp);
     echo "=========DONE\r\n\r\n";
 }
-catch(Exception $e) {
+catch (Exception $e) {
     echo $e->getCode();
     echo $e->getMessage();
 }

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
     fclose($fh);
     var_dump($rsp);
     echo "=========DONE\r\n\r\n";
-}
-catch(Exception $e) {
+} catch(Exception $e) {
     echo $e->getCode();
     echo $e->getMessage();
 }

examples/get_list.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 require_once(dirname(__DIR__).'/vendor/autoload.php');
-$config =  array(
+$config = array(
     'user_name' => 'tester',
     'pwd' => 'grjxv2mxELR3',
     'bucket' => 'sdkimg',
-    'picture_path' => dirname(__FILE__) . '/assets/sample.jpeg'
+    'picture_path' => dirname(__FILE__).'/assets/sample.jpeg'
 );
 $upyun = new UpYun($config['bucket'], $config['user_name'], $config['pwd']);
 
@@ -14,7 +14,7 @@ 
     var_dump($list);
     echo "=========DONE\r\n\r\n";
 }
-catch(Exception $e) {
+catch (Exception $e) {
     echo $e->getCode();
     echo $e->getMessage();
 }

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
     $list = $upyun->getList('/demo/');
     var_dump($list);
     echo "=========DONE\r\n\r\n";
-}
-catch(Exception $e) {
+} catch(Exception $e) {
     echo $e->getCode();
     echo $e->getMessage();
 }