Completed
Pull Request — master (#281)
by Bai
09:35
created
src/Qiniu/Storage/UploadManager.php 1 patch
Unused Use Statements   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,9 +2,8 @@
 block discarded – undo
2 2
 namespace Qiniu\Storage;
3 3
 
4 4
 use Qiniu\Config;
5
-use Qiniu\Http\HttpClient;
6
-use Qiniu\Storage\ResumeUploader;
7 5
 use Qiniu\Storage\FormUploader;
6
+use Qiniu\Storage\ResumeUploader;
8 7
 
9 8
 /**
10 9
  * 主要涉及了资源上传接口的实现
Please login to merge, or discard this patch.
src/Qiniu/Processing/PersistentFop.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 use Qiniu\Config;
5 5
 use Qiniu\Http\Client;
6 6
 use Qiniu\Http\Error;
7
-use Qiniu\Processing\Operation;
8 7
 
9 8
 /**
10 9
  * 持久化处理类,该类用于主动触发异步持久化操作.
Please login to merge, or discard this patch.
src/Qiniu/functions.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
      * array 辅助方法,无值时不set
128 128
      *
129 129
      * @param $array 待操作array
130
-     * @param $key key
130
+     * @param string $key key
131 131
      * @param $value value 为null时 不设置
132 132
      *
133 133
      * @return array 原来的array,便于连续操作
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
      *
179 179
      * @param  string $url 图片链接
180 180
      * @param  string $image 水印图片链接
181
-     * @param  numeric $dissolve 透明度
181
+     * @param  integer $dissolve 透明度
182 182
      * @param  string $gravity 水印位置
183 183
      * @param  numeric $dx 横轴边距
184 184
      * @param  numeric $dy 纵轴边距
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
      * @param  string $url 图片链接
211 211
      * @param  string $text 文字
212 212
      * @param  string $font 文字字体
213
-     * @param  string $fontSize 文字字号
213
+     * @param  integer $fontSize 文字字号
214 214
      * @param  string $fontColor 文字颜色
215
-     * @param  numeric $dissolve 透明度
215
+     * @param  integer $dissolve 透明度
216 216
      * @param  string $gravity 水印位置
217 217
      * @param  numeric $dx 横轴边距
218 218
      * @param  numeric $dy 纵轴边距
Please login to merge, or discard this patch.
src/Qiniu/Storage/BucketManager.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 
4 4
 use Qiniu\Auth;
5 5
 use Qiniu\Config;
6
-use Qiniu\Zone;
7 6
 use Qiniu\Http\Client;
8 7
 use Qiniu\Http\Error;
9 8
 
Please login to merge, or discard this patch.
Doc Comments   +21 added lines patch added patch discarded remove patch
@@ -351,24 +351,36 @@  discard block
 block discarded – undo
351 351
         return $scheme . Config::API_HOST;
352 352
     }
353 353
 
354
+    /**
355
+     * @param string $body
356
+     */
354 357
     private function rsPost($path, $body = null)
355 358
     {
356 359
         $url = $this->getRsHost() . $path;
357 360
         return $this->post($url, $body);
358 361
     }
359 362
 
363
+    /**
364
+     * @param string $path
365
+     */
360 366
     private function apiGet($path)
361 367
     {
362 368
         $url = $this->getApiHost() . $path;
363 369
         return $this->get($url);
364 370
     }
365 371
 
372
+    /**
373
+     * @param string $path
374
+     */
366 375
     private function rsGet($path)
367 376
     {
368 377
         $url = $this->getRsHost() . $path;
369 378
         return $this->get($url);
370 379
     }
371 380
 
381
+    /**
382
+     * @param string $url
383
+     */
372 384
     private function get($url)
373 385
     {
374 386
         $headers = $this->auth->authorization($url);
@@ -379,6 +391,9 @@  discard block
 block discarded – undo
379 391
         return array($ret->json(), null);
380 392
     }
381 393
 
394
+    /**
395
+     * @param string $url
396
+     */
382 397
     private function post($url, $body)
383 398
     {
384 399
         $headers = $this->auth->authorization($url, $body, 'application/x-www-form-urlencoded');
@@ -446,6 +461,9 @@  discard block
 block discarded – undo
446 461
         return $data;
447 462
     }
448 463
 
464
+    /**
465
+     * @param string $operation
466
+     */
449 467
     private static function oneKeyBatch($operation, $bucket, $keys)
450 468
     {
451 469
         $data = array();
@@ -455,6 +473,9 @@  discard block
 block discarded – undo
455 473
         return $data;
456 474
     }
457 475
 
476
+    /**
477
+     * @param string $operation
478
+     */
458 479
     private static function twoKeyBatch($operation, $source_bucket, $key_pairs, $target_bucket, $force)
459 480
     {
460 481
         if ($target_bucket === null) {
Please login to merge, or discard this patch.
src/Qiniu/Storage/ResumeUploader.php 1 patch
Doc Comments   +11 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,10 +30,11 @@  discard block
 block discarded – undo
30 30
      *
31 31
      * @param $upToken    上传凭证
32 32
      * @param $key        上传文件名
33
-     * @param $inputStream 上传二进制流
33
+     * @param resource $inputStream 上传二进制流
34 34
      * @param $size       上传流的大小
35 35
      * @param $params     自定义变量
36
-     * @param $mime       上传数据的mimeType
36
+     * @param string $mime       上传数据的mimeType
37
+     * @param Config $config
37 38
      *
38 39
      * @link http://developer.qiniu.com/docs/v6/api/overview/up/response/vars.html#xvar
39 40
      */
@@ -70,6 +71,7 @@  discard block
 block discarded – undo
70 71
 
71 72
     /**
72 73
      * 上传操作
74
+     * @param string $fname
73 75
      */
74 76
     public function upload($fname)
75 77
     {
@@ -111,6 +113,7 @@  discard block
 block discarded – undo
111 113
 
112 114
     /**
113 115
      * 创建块
116
+     * @param string $block
114 117
      */
115 118
     private function makeBlock($block, $blockSize)
116 119
     {
@@ -152,6 +155,9 @@  discard block
 block discarded – undo
152 155
         return array($response->json(), null);
153 156
     }
154 157
 
158
+    /**
159
+     * @param string $url
160
+     */
155 161
     private function post($url, $data)
156 162
     {
157 163
         $this->currentUrl = $url;
@@ -159,6 +165,9 @@  discard block
 block discarded – undo
159 165
         return Client::post($url, $data, $headers);
160 166
     }
161 167
 
168
+    /**
169
+     * @param integer $uploaded
170
+     */
162 171
     private function blockSize($uploaded)
163 172
     {
164 173
         if ($this->size < $uploaded + Config::BLOCK_SIZE) {
Please login to merge, or discard this patch.
src/Qiniu/Zone.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -21,6 +21,10 @@
 block discarded – undo
21 21
     public $iovipHost;
22 22
 
23 23
     //构造一个Zone对象
24
+
25
+    /**
26
+     * @param string $iovipHost
27
+     */
24 28
     public function __construct(
25 29
         $srcUpHosts = array(),
26 30
         $cdnUpHosts = array(),
Please login to merge, or discard this patch.
src/Qiniu/Rtc/AppClient.php 2 patches
Unused Use Statements   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Qiniu\Rtc;
3 3
 
4
+use Qiniu\Auth;
5
+use Qiniu\Config;
4 6
 use Qiniu\Http\Client;
5 7
 use Qiniu\Http\Error;
6
-use Qiniu\Config;
7
-use Qiniu\Auth;
8 8
 
9 9
 class AppClient
10 10
 {
Please login to merge, or discard this patch.
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -168,6 +168,9 @@  discard block
 block discarded – undo
168 168
         return $this->auth->signWithData($appAccessString);
169 169
     }
170 170
 
171
+    /**
172
+     * @param string $url
173
+     */
171 174
     private function get($url, $cType = null)
172 175
     {
173 176
         $rtcToken = $this->auth->authorizationV2($url, "GET", null, $cType);
@@ -179,6 +182,9 @@  discard block
 block discarded – undo
179 182
         return array($ret->json(), null);
180 183
     }
181 184
 
185
+    /**
186
+     * @param string $url
187
+     */
182 188
     private function delete($url, $contentType = 'application/json')
183 189
     {
184 190
         $rtcToken = $this->auth->authorizationV2($url, "DELETE", null, $contentType);
@@ -190,6 +196,10 @@  discard block
 block discarded – undo
190 196
         return array($ret->json(), null);
191 197
     }
192 198
 
199
+    /**
200
+     * @param string $url
201
+     * @param string $body
202
+     */
193 203
     private function post($url, $body, $contentType = 'application/json')
194 204
     {
195 205
         $rtcToken = $this->auth->authorizationV2($url, "POST", $body, $contentType);
Please login to merge, or discard this patch.
src/Qiniu/Storage/ArgusManager.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,12 +52,18 @@
 block discarded – undo
52 52
         return $scheme . Config::ARGUS_HOST;
53 53
     }
54 54
 
55
+    /**
56
+     * @param string $path
57
+     */
55 58
     private function arPost($path, $body = null)
56 59
     {
57 60
         $url = $this->getArHost() . $path;
58 61
         return $this->post($url, $body);
59 62
     }
60 63
 
64
+    /**
65
+     * @param string $url
66
+     */
61 67
     private function post($url, $body)
62 68
     {
63 69
         $headers = $this->auth->authorizationV2($url, 'POST', $body, 'application/json');
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 
4 4
 use Qiniu\Auth;
5 5
 use Qiniu\Config;
6
-use Qiniu\Zone;
7 6
 use Qiniu\Http\Client;
8 7
 use Qiniu\Http\Error;
9 8
 
Please login to merge, or discard this patch.