@@ -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 | |
@@ -1037,42 +1037,63 @@ discard block |
||
| 1037 | 1037 | return $scheme . Config::UC_HOST; |
| 1038 | 1038 | } |
| 1039 | 1039 | |
| 1040 | + /** |
|
| 1041 | + * @param string $body |
|
| 1042 | + */ |
|
| 1040 | 1043 | private function rsPost($path, $body = null) |
| 1041 | 1044 | { |
| 1042 | 1045 | $url = $this->getRsHost() . $path; |
| 1043 | 1046 | return $this->post($url, $body); |
| 1044 | 1047 | } |
| 1045 | 1048 | |
| 1049 | + /** |
|
| 1050 | + * @param string $path |
|
| 1051 | + */ |
|
| 1046 | 1052 | private function apiPost($path, $body = null) |
| 1047 | 1053 | { |
| 1048 | 1054 | $url = $this->getApiHost() . $path; |
| 1049 | 1055 | return $this->post($url, $body); |
| 1050 | 1056 | } |
| 1051 | 1057 | |
| 1058 | + /** |
|
| 1059 | + * @param string $body |
|
| 1060 | + */ |
|
| 1052 | 1061 | private function ucPost($path, $body = null) |
| 1053 | 1062 | { |
| 1054 | 1063 | $url = $this->getUcHost() . $path; |
| 1055 | 1064 | return $this->post($url, $body); |
| 1056 | 1065 | } |
| 1057 | 1066 | |
| 1067 | + /** |
|
| 1068 | + * @param string $path |
|
| 1069 | + */ |
|
| 1058 | 1070 | private function ucGet($path) |
| 1059 | 1071 | { |
| 1060 | 1072 | $url = $this->getUcHost() . $path; |
| 1061 | 1073 | return $this->get($url); |
| 1062 | 1074 | } |
| 1063 | 1075 | |
| 1076 | + /** |
|
| 1077 | + * @param string $path |
|
| 1078 | + */ |
|
| 1064 | 1079 | private function apiGet($path) |
| 1065 | 1080 | { |
| 1066 | 1081 | $url = $this->getApiHost() . $path; |
| 1067 | 1082 | return $this->get($url); |
| 1068 | 1083 | } |
| 1069 | 1084 | |
| 1085 | + /** |
|
| 1086 | + * @param string $path |
|
| 1087 | + */ |
|
| 1070 | 1088 | private function rsGet($path) |
| 1071 | 1089 | { |
| 1072 | 1090 | $url = $this->getRsHost() . $path; |
| 1073 | 1091 | return $this->get($url); |
| 1074 | 1092 | } |
| 1075 | 1093 | |
| 1094 | + /** |
|
| 1095 | + * @param string $url |
|
| 1096 | + */ |
|
| 1076 | 1097 | private function get($url) |
| 1077 | 1098 | { |
| 1078 | 1099 | $headers = $this->auth->authorization($url); |
@@ -1083,12 +1104,18 @@ discard block |
||
| 1083 | 1104 | return array($ret->json(), null); |
| 1084 | 1105 | } |
| 1085 | 1106 | |
| 1107 | + /** |
|
| 1108 | + * @param string $url |
|
| 1109 | + */ |
|
| 1086 | 1110 | private function getV2($url) |
| 1087 | 1111 | { |
| 1088 | 1112 | $headers = $this->auth->authorizationV2($url, 'GET'); |
| 1089 | 1113 | return Client::get($url, $headers); |
| 1090 | 1114 | } |
| 1091 | 1115 | |
| 1116 | + /** |
|
| 1117 | + * @param string $url |
|
| 1118 | + */ |
|
| 1092 | 1119 | private function post($url, $body) |
| 1093 | 1120 | { |
| 1094 | 1121 | $headers = $this->auth->authorization($url, $body, 'application/x-www-form-urlencoded'); |
@@ -1100,12 +1127,19 @@ discard block |
||
| 1100 | 1127 | return array($r, null); |
| 1101 | 1128 | } |
| 1102 | 1129 | |
| 1130 | + /** |
|
| 1131 | + * @param string $path |
|
| 1132 | + * @param string $body |
|
| 1133 | + */ |
|
| 1103 | 1134 | private function ucPostV2($path, $body) |
| 1104 | 1135 | { |
| 1105 | 1136 | $url = $this->getUcHost() . $path; |
| 1106 | 1137 | return $this->postV2($url, $body); |
| 1107 | 1138 | } |
| 1108 | 1139 | |
| 1140 | + /** |
|
| 1141 | + * @param string $url |
|
| 1142 | + */ |
|
| 1109 | 1143 | private function postV2($url, $body) |
| 1110 | 1144 | { |
| 1111 | 1145 | $headers = $this->auth->authorizationV2($url, 'POST', $body, 'application/json'); |
@@ -1174,6 +1208,9 @@ discard block |
||
| 1174 | 1208 | return $data; |
| 1175 | 1209 | } |
| 1176 | 1210 | |
| 1211 | + /** |
|
| 1212 | + * @param string $operation |
|
| 1213 | + */ |
|
| 1177 | 1214 | private static function oneKeyBatch($operation, $bucket, $keys) |
| 1178 | 1215 | { |
| 1179 | 1216 | $data = array(); |
@@ -1183,6 +1220,9 @@ discard block |
||
| 1183 | 1220 | return $data; |
| 1184 | 1221 | } |
| 1185 | 1222 | |
| 1223 | + /** |
|
| 1224 | + * @param string $operation |
|
| 1225 | + */ |
|
| 1186 | 1226 | private static function twoKeyBatch($operation, $source_bucket, $key_pairs, $target_bucket, $force) |
| 1187 | 1227 | { |
| 1188 | 1228 | 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); |
@@ -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 | |
@@ -90,12 +90,18 @@ discard block |
||
| 90 | 90 | return $scheme . Config::ARGUS_HOST; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | + /** |
|
| 94 | + * @param string $path |
|
| 95 | + */ |
|
| 93 | 96 | private function arPost($path, $body = null) |
| 94 | 97 | { |
| 95 | 98 | $url = $this->getArHost() . $path; |
| 96 | 99 | return $this->post($url, $body); |
| 97 | 100 | } |
| 98 | 101 | |
| 102 | + /** |
|
| 103 | + * @param string $url |
|
| 104 | + */ |
|
| 99 | 105 | private function get($url) |
| 100 | 106 | { |
| 101 | 107 | $headers = $this->auth->authorizationV2($url, 'GET'); |
@@ -103,6 +109,9 @@ discard block |
||
| 103 | 109 | return Client::get($url, $headers); |
| 104 | 110 | } |
| 105 | 111 | |
| 112 | + /** |
|
| 113 | + * @param string $url |
|
| 114 | + */ |
|
| 106 | 115 | private function post($url, $body) |
| 107 | 116 | { |
| 108 | 117 | $headers = $this->auth->authorizationV2($url, 'POST', $body, 'application/json'); |
@@ -21,6 +21,10 @@ |
||
| 21 | 21 | public $iovipHost; |
| 22 | 22 | |
| 23 | 23 | //构造一个Region对象 |
| 24 | + |
|
| 25 | + /** |
|
| 26 | + * @param string $iovipHost |
|
| 27 | + */ |
|
| 24 | 28 | public function __construct( |
| 25 | 29 | $srcUpHosts = array(), |
| 26 | 30 | $cdnUpHosts = array(), |
@@ -236,6 +236,9 @@ discard block |
||
| 236 | 236 | return $img_base64; |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | + /** |
|
| 240 | + * @param string $url |
|
| 241 | + */ |
|
| 239 | 242 | private function get($url, $cType = null) |
| 240 | 243 | { |
| 241 | 244 | $rtcToken = $this->auth->authorizationV2($url, "GET", null, $cType); |
@@ -247,6 +250,9 @@ discard block |
||
| 247 | 250 | return array($ret->json(), null); |
| 248 | 251 | } |
| 249 | 252 | |
| 253 | + /** |
|
| 254 | + * @param string $url |
|
| 255 | + */ |
|
| 250 | 256 | private function delete($url, $contentType = 'application/json') |
| 251 | 257 | { |
| 252 | 258 | $rtcToken = $this->auth->authorizationV2($url, "DELETE", null, $contentType); |
@@ -258,6 +264,10 @@ discard block |
||
| 258 | 264 | return array($ret->json(), null); |
| 259 | 265 | } |
| 260 | 266 | |
| 267 | + /** |
|
| 268 | + * @param string $url |
|
| 269 | + * @param string $body |
|
| 270 | + */ |
|
| 261 | 271 | private function post($url, $body, $contentType = 'application/json') |
| 262 | 272 | { |
| 263 | 273 | $rtcToken = $this->auth->authorizationV2($url, "POST", $body, $contentType); |
@@ -269,6 +279,11 @@ discard block |
||
| 269 | 279 | $r = ($ret->body === null) ? array() : $ret->json(); |
| 270 | 280 | return array($r, null); |
| 271 | 281 | } |
| 282 | + |
|
| 283 | + /** |
|
| 284 | + * @param string $url |
|
| 285 | + * @param string $body |
|
| 286 | + */ |
|
| 272 | 287 | private function PUT($url, $body, $contentType = 'application/json') |
| 273 | 288 | { |
| 274 | 289 | $rtcToken = $this->auth->authorizationV2($url, "PUT", $body, $contentType); |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Qiniu\Sms; |
| 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 Sms |
| 10 | 10 | { |