@@ -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 | |
@@ -775,42 +775,64 @@ discard block |
||
| 775 | 775 | return $scheme . Config::UC_HOST; |
| 776 | 776 | } |
| 777 | 777 | |
| 778 | + /** |
|
| 779 | + * @param string $body |
|
| 780 | + */ |
|
| 778 | 781 | private function rsPost($path, $body = null) |
| 779 | 782 | { |
| 780 | 783 | $url = $this->getRsHost() . $path; |
| 781 | 784 | return $this->post($url, $body); |
| 782 | 785 | } |
| 783 | 786 | |
| 787 | + /** |
|
| 788 | + * @param string $path |
|
| 789 | + */ |
|
| 784 | 790 | private function apiPost($path, $body = null) |
| 785 | 791 | { |
| 786 | 792 | $url = $this->getApiHost() . $path; |
| 787 | 793 | return $this->post($url, $body); |
| 788 | 794 | } |
| 789 | 795 | |
| 796 | + /** |
|
| 797 | + * @param string $path |
|
| 798 | + * @param string $body |
|
| 799 | + */ |
|
| 790 | 800 | private function ucPost($path, $body = null) |
| 791 | 801 | { |
| 792 | 802 | $url = $this->getUcHost() . $path; |
| 793 | 803 | return $this->post($url, $body); |
| 794 | 804 | } |
| 795 | 805 | |
| 806 | + /** |
|
| 807 | + * @param string $path |
|
| 808 | + */ |
|
| 796 | 809 | private function ucGet($path) |
| 797 | 810 | { |
| 798 | 811 | $url = $this->getUcHost() . $path; |
| 799 | 812 | return $this->get($url); |
| 800 | 813 | } |
| 801 | 814 | |
| 815 | + /** |
|
| 816 | + * @param string $path |
|
| 817 | + */ |
|
| 802 | 818 | private function apiGet($path) |
| 803 | 819 | { |
| 804 | 820 | $url = $this->getApiHost() . $path; |
| 805 | 821 | return $this->get($url); |
| 806 | 822 | } |
| 807 | 823 | |
| 824 | + /** |
|
| 825 | + * @param string $path |
|
| 826 | + */ |
|
| 808 | 827 | private function rsGet($path) |
| 809 | 828 | { |
| 810 | 829 | $url = $this->getRsHost() . $path; |
| 811 | 830 | return $this->get($url); |
| 812 | 831 | } |
| 813 | 832 | |
| 833 | + /** |
|
| 834 | + * @param string $url |
|
| 835 | + */ |
|
| 814 | 836 | private function get($url) |
| 815 | 837 | { |
| 816 | 838 | $headers = $this->auth->authorization($url); |
@@ -821,6 +843,9 @@ discard block |
||
| 821 | 843 | return array($ret->json(), null); |
| 822 | 844 | } |
| 823 | 845 | |
| 846 | + /** |
|
| 847 | + * @param string $url |
|
| 848 | + */ |
|
| 824 | 849 | private function post($url, $body) |
| 825 | 850 | { |
| 826 | 851 | $headers = $this->auth->authorization($url, $body, 'application/x-www-form-urlencoded'); |
@@ -832,11 +857,18 @@ discard block |
||
| 832 | 857 | return array($r, null); |
| 833 | 858 | } |
| 834 | 859 | |
| 860 | + /** |
|
| 861 | + * @param string $path |
|
| 862 | + * @param string $body |
|
| 863 | + */ |
|
| 835 | 864 | private function ucPostV2($path, $body){ |
| 836 | 865 | $url = $this->getUcHost() . $path; |
| 837 | 866 | return $this->postV2($url, $body); |
| 838 | 867 | } |
| 839 | 868 | |
| 869 | + /** |
|
| 870 | + * @param string $url |
|
| 871 | + */ |
|
| 840 | 872 | private function postV2($url, $body) |
| 841 | 873 | { |
| 842 | 874 | $headers = $this->auth->authorizationV2($url, 'POST', $body, 'application/json'); |
@@ -905,6 +937,9 @@ discard block |
||
| 905 | 937 | return $data; |
| 906 | 938 | } |
| 907 | 939 | |
| 940 | + /** |
|
| 941 | + * @param string $operation |
|
| 942 | + */ |
|
| 908 | 943 | private static function oneKeyBatch($operation, $bucket, $keys) |
| 909 | 944 | { |
| 910 | 945 | $data = array(); |
@@ -914,6 +949,9 @@ discard block |
||
| 914 | 949 | return $data; |
| 915 | 950 | } |
| 916 | 951 | |
| 952 | + /** |
|
| 953 | + * @param string $operation |
|
| 954 | + */ |
|
| 917 | 955 | private static function twoKeyBatch($operation, $source_bucket, $key_pairs, $target_bucket, $force) |
| 918 | 956 | { |
| 919 | 957 | if ($target_bucket === null) { |
@@ -13,10 +13,11 @@ |
||
| 13 | 13 | * @param $upToken 上传凭证 |
| 14 | 14 | * @param $key 上传文件名 |
| 15 | 15 | * @param $data 上传二进制流 |
| 16 | - * @param $config 上传配置 |
|
| 16 | + * @param \Qiniu\Config $config 上传配置 |
|
| 17 | 17 | * @param $params 自定义变量,规格参考 |
| 18 | 18 | * http://developer.qiniu.com/docs/v6/api/overview/up/response/vars.html#xvar |
| 19 | - * @param $mime 上传数据的mimeType |
|
| 19 | + * @param string $mime 上传数据的mimeType |
|
| 20 | + * @param boolean $checkCrc |
|
| 20 | 21 | * |
| 21 | 22 | * @return array 包含已上传文件的信息,类似: |
| 22 | 23 | * [ |
@@ -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); |
@@ -52,12 +52,18 @@ |
||
| 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'); |
@@ -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 | |
@@ -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(), |