fixed_scrutinizer_issue

Author: longbai

src/Qiniu/Http/Response.php

@@ -76,6 +76,13 @@ final class Response
         511 => 'Network Authentication Required',
     );
 
+    /**
+     * @param int $code 状态码
+     * @param double $duration 请求时长
+     * @param array $headers 响应头部
+     * @param string $body 响应内容
+     * @param string $error 错误描述
+     */
     public function __construct($code, $duration, array $headers = array(), $body = null, $error = null)
     {
         $this->statusCode = $code;
@@ -121,14 +128,9 @@ public function json()
         return $this->jsonData;
     }
 
-    private static function bodyJson($body, array $config = array())
+    private static function bodyJson($body)
     {
-        return \Qiniu\json_decode(
-            (string) $body,
-            array_key_exists('object', $config) ? !$config['object'] : true,
-            512,
-            array_key_exists('big_int_strings', $config) ? JSON_BIGINT_AS_STRING : 0
-        );
+        return \Qiniu\json_decode((string) $body, true, 512);
     }
 
     public function xVia()

src/Qiniu/Processing/PersistentFop.php

@@ -64,14 +64,9 @@ public function execute($key, $fops)
         if (is_array($fops)) {
             $fops = implode(';', $fops);
         }
-
         $params = array('bucket' => $this->bucket, 'key' => $key, 'fops' => $fops);
-        if (!empty($this->pipeline)) {
-            $params['pipeline'] = $this->pipeline;
-        }
-        if (!empty($this->notify_url)) {
-            $params['notifyURL'] = $this->notify_url;
-        }
+        \Qiniu\setWithoutEmpty($query, 'pipeline', $this->pipeline);
+        \Qiniu\setWithoutEmpty($query, 'notifyURL', $this->notify_url);
         if ($this->force) {
             $params['force'] = 1;
         }

src/Qiniu/Storage/BucketManager.php

@@ -53,18 +53,10 @@ public function buckets()
     public function listFiles($bucket, $prefix = null, $marker = null, $limit = 1000, $delimiter = null)
     {
         $query = array('bucket' => $bucket);
-        if (!empty($prefix)) {
-            $query['prefix'] = $prefix;
-        }
-        if (!empty($marker)) {
-            $query['marker'] = $marker;
-        }
-        if (!empty($limit)) {
-            $query['limit'] = $limit;
-        }
-        if (!empty($delimiter)) {
-            $query['delimiter'] = $delimiter;
-        }
+        \Qiniu\setWithoutEmpty($query, 'prefix', $prefix);
+        \Qiniu\setWithoutEmpty($query, 'marker', $marker);
+        \Qiniu\setWithoutEmpty($query, 'limit', $limit);
+        \Qiniu\setWithoutEmpty($query, 'delimiter', $delimiter);
         $url = Config::RSF_HOST . '/list?' . http_build_query($query);
         list($ret, $error) = $this->get($url);
         if ($ret === null) {

src/Qiniu/Storage/FormUploader.php

@@ -1,12 +1,29 @@
 <?php
 namespace Qiniu\Storage;
 
-use Qiniu\Config;
 use Qiniu\Http\Client;
 use Qiniu\Http\Error;
 
 final class FormUploader
 {
+
+    /**
+     * 上传二进制流到七牛, 内部使用
+     *
+     * @param $upToken    上传凭证
+     * @param $key        上传文件名
+     * @param $data       上传二进制流
+     * @param $params     自定义变量，规格参考
+     *                    http://developer.qiniu.com/docs/v6/api/overview/up/response/vars.html#xvar
+     * @param $mime       上传数据的mimeType
+     * @param $checkCrc   是否校验crc32
+     *
+     * @return array    包含已上传文件的信息，类似：
+     *                                              [
+     *                                                  "hash" => "<Hash string>",
+     *                                                  "key" => "<Key string>"
+     *                                              ]
+     */
     public static function put(
         $upToken,
         $key,
@@ -39,6 +56,23 @@ public static function put(
         return array($response->json(), null);
     }
 
+    /**
+     * 上传文件到七牛，内部使用
+     *
+     * @param $upToken    上传凭证
+     * @param $key        上传文件名
+     * @param $filePath   上传文件的路径
+     * @param $params     自定义变量，规格参考
+     *                    http://developer.qiniu.com/docs/v6/api/overview/up/response/vars.html#xvar
+     * @param $mime       上传数据的mimeType
+     * @param $checkCrc   是否校验crc32
+     *
+     * @return array    包含已上传文件的信息，类似：
+     *                                              [
+     *                                                  "hash" => "<Hash string>",
+     *                                                  "key" => "<Key string>"
+     *                                              ]
+     */
     public static function putFile(
         $upToken,
         $key,
@@ -50,10 +84,7 @@ public static function putFile(
     ) {
 
         $fields = array('token' => $upToken, 'file' => self::createFile($filePath, $mime));
-        if ($key === null) {
-            $fname = 'filename';
-        } else {
-            $fname = $key;
+        if ($key !== null) {
             $fields['key'] = $key;
         }
         if ($checkCrc) {
@@ -64,6 +95,7 @@ public static function putFile(
                 $fields[$k] = $v;
             }
         }
+        $fields['key'] = $key;
         $headers =array('Content-Type' => 'multipart/form-data');
         $response = client::post($config->getUpHost(), $fields, $headers);
         if (!$response->ok()) {

src/Qiniu/Storage/ResumeUploader.php

@@ -20,7 +20,6 @@ final class ResumeUploader
     private $size;
     private $params;
     private $mime;
-    private $progressHandler;
     private $contexts;
     private $host;
     private $currentUrl;

src/Qiniu/functions.php

@@ -122,4 +122,21 @@ function entry($bucket, $key)
         }
         return base64_urlSafeEncode($en);
     }
+
+    /**
+     * array 辅助方法，无值时不set
+     *
+     * @param $array 待操作array
+     * @param $key key
+     * @param $value value 为null时 不设置
+     *
+     * @return array 原来的array，便于连续操作
+     */
+    function setWithoutEmpty(&$array, $key, $value)
+    {
+        if (!empty($value)) {
+            $array[$key] = $value;
+        }
+        return $array;
+    }
 }