@@ -2,9 +2,8 @@ |
||
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 | * 主要涉及了资源上传接口的实现 |
@@ -4,7 +4,6 @@ |
||
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 | * 持久化处理类,该类用于主动触发异步持久化操作. |
@@ -127,7 +127,7 @@ discard block |
||
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 |
||
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 |
||
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 纵轴边距 |
@@ -3,7 +3,6 @@ |
||
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 |
@@ -401,30 +401,46 @@ discard block |
||
401 | 401 | return $scheme . Config::API_HOST; |
402 | 402 | } |
403 | 403 | |
404 | + /** |
|
405 | + * @param string $body |
|
406 | + */ |
|
404 | 407 | private function rsPost($path, $body = null) |
405 | 408 | { |
406 | 409 | $url = $this->getRsHost() . $path; |
407 | 410 | return $this->post($url, $body); |
408 | 411 | } |
409 | 412 | |
413 | + /** |
|
414 | + * @param string $path |
|
415 | + */ |
|
410 | 416 | private function apiGet($path) |
411 | 417 | { |
412 | 418 | $url = $this->getApiHost() . $path; |
413 | 419 | return $this->get($url); |
414 | 420 | } |
415 | 421 | |
422 | + /** |
|
423 | + * @param string $path |
|
424 | + */ |
|
416 | 425 | private function rsGet($path) |
417 | 426 | { |
418 | 427 | $url = $this->getRsHost() . $path; |
419 | 428 | return $this->get($url); |
420 | 429 | } |
421 | 430 | |
431 | + /** |
|
432 | + * @param string $path |
|
433 | + * @param string $body |
|
434 | + */ |
|
422 | 435 | private function arPost($path, $body = null) |
423 | 436 | { |
424 | 437 | $url = $this->getArHost() . $path; |
425 | 438 | return $this->pluPost($url, 'POST', $body); |
426 | 439 | } |
427 | 440 | |
441 | + /** |
|
442 | + * @param string $url |
|
443 | + */ |
|
428 | 444 | private function get($url) |
429 | 445 | { |
430 | 446 | $headers = $this->auth->authorization($url); |
@@ -435,6 +451,9 @@ discard block |
||
435 | 451 | return array($ret->json(), null); |
436 | 452 | } |
437 | 453 | |
454 | + /** |
|
455 | + * @param string $url |
|
456 | + */ |
|
438 | 457 | private function post($url, $body) |
439 | 458 | { |
440 | 459 | $headers = $this->auth->authorization($url, $body, 'application/x-www-form-urlencoded'); |
@@ -446,6 +465,10 @@ discard block |
||
446 | 465 | return array($r, null); |
447 | 466 | } |
448 | 467 | |
468 | + /** |
|
469 | + * @param string $url |
|
470 | + * @param string $method |
|
471 | + */ |
|
449 | 472 | private function pluPost($url, $method, $body) |
450 | 473 | { |
451 | 474 | $headers = $this->auth->authorizationV2($url, $method, $body, 'application/json'); |
@@ -515,6 +538,9 @@ discard block |
||
515 | 538 | return $data; |
516 | 539 | } |
517 | 540 | |
541 | + /** |
|
542 | + * @param string $operation |
|
543 | + */ |
|
518 | 544 | private static function oneKeyBatch($operation, $bucket, $keys) |
519 | 545 | { |
520 | 546 | $data = array(); |
@@ -524,6 +550,9 @@ discard block |
||
524 | 550 | return $data; |
525 | 551 | } |
526 | 552 | |
553 | + /** |
|
554 | + * @param string $operation |
|
555 | + */ |
|
527 | 556 | private static function twoKeyBatch($operation, $source_bucket, $key_pairs, $target_bucket, $force) |
528 | 557 | { |
529 | 558 | if ($target_bucket === null) { |
@@ -30,10 +30,11 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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) { |
@@ -1,10 +1,10 @@ |
||
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 | { |
@@ -168,6 +168,9 @@ discard block |
||
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 |
||
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 |
||
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); |