Skip to content

Commit c5bd890

Browse files
committed
fix comment format
1 parent 14fbf5a commit c5bd890

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

src/Qiniu/Processing/PersistentFop.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ final class PersistentFop
3333
*/
3434
private $notify_url;
3535

36+
/**
37+
* @var 是否强制覆盖已有的重名文件
38+
*/
39+
private $force;
40+
41+
3642
public function __construct($auth, $bucket, $pipeline = null, $notify_url = null, $force = false)
3743
{
3844
$this->auth = $auth;

src/Qiniu/Storage/BucketManager.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function stat($bucket, $key)
105105
* @param $bucket 待删除资源所在的空间
106106
* @param $key 待删除资源的文件名
107107
*
108-
* @return 成功返回NULL,失败返回对象{"error" => "<errMsg string>", ...}
108+
* @return mixed 成功返回NULL,失败返回对象Qiniu\Http\Error
109109
* @link http://developer.qiniu.com/docs/v6/api/reference/rs/delete.html
110110
*/
111111
public function delete($bucket, $key)
@@ -123,7 +123,7 @@ public function delete($bucket, $key)
123123
* @param $oldname 待操作资源文件名
124124
* @param $newname 目标资源文件名
125125
*
126-
* @return 成功返回NULL,失败返回对象{"error" => "<errMsg string>", ...}
126+
* @return mixed 成功返回NULL,失败返回对象Qiniu\Http\Error
127127
*/
128128
public function rename($bucket, $oldname, $newname)
129129
{
@@ -138,7 +138,7 @@ public function rename($bucket, $oldname, $newname)
138138
* @param $to_bucket 目标资源空间名
139139
* @param $to_key 目标资源文件名
140140
*
141-
* @return 成功返回NULL,失败返回对象{"error" => "<errMsg string>", ...}
141+
* @return mixed 成功返回NULL,失败返回对象Qiniu\Http\Error
142142
* @link http://developer.qiniu.com/docs/v6/api/reference/rs/copy.html
143143
*/
144144
public function copy($from_bucket, $from_key, $to_bucket, $to_key)
@@ -158,7 +158,7 @@ public function copy($from_bucket, $from_key, $to_bucket, $to_key)
158158
* @param $to_bucket 目标资源空间名
159159
* @param $to_key 目标资源文件名
160160
*
161-
* @return 成功返回NULL,失败返回对象{"error" => "<errMsg string>", ...}
161+
* @return mixed 成功返回NULL,失败返回对象Qiniu\Http\Error
162162
* @link http://developer.qiniu.com/docs/v6/api/reference/rs/move.html
163163
*/
164164
public function move($from_bucket, $from_key, $to_bucket, $to_key)
@@ -177,7 +177,7 @@ public function move($from_bucket, $from_key, $to_bucket, $to_key)
177177
* @param $key 待操作资源文件名
178178
* @param $mime 待操作文件目标mimeType
179179
*
180-
* @return 成功返回NULL,失败返回对象{"error" => "<errMsg string>", ...}
180+
* @return mixed 成功返回NULL,失败返回对象Qiniu\Http\Error
181181
* @link http://developer.qiniu.com/docs/v6/api/reference/rs/chgm.html
182182
*/
183183
public function changeMime($bucket, $key, $mime)
@@ -226,7 +226,7 @@ public function fetch($url, $bucket, $key)
226226
* @param $bucket 待获取资源所在的空间
227227
* @param $key 代获取资源文件名
228228
*
229-
* @return 成功返回NULL,失败返回对象{"error" => "<errMsg string>", ...}
229+
* @return mixed 成功返回NULL,失败返回对象Qiniu\Http\Error
230230
* @link http://developer.qiniu.com/docs/v6/api/reference/rs/prefetch.html
231231
*/
232232
public function prefetch($bucket, $key)
@@ -242,7 +242,7 @@ public function prefetch($bucket, $key)
242242
*
243243
* @param $operations 资源管理操作数组
244244
*
245-
* @return 每个资源的处理情况,结果类似:
245+
* @return array[] 每个资源的处理情况,结果类似:
246246
* [
247247
* { "code" => <HttpCode int>, "data" => <Data> },
248248
* { "code" => <HttpCode int> },

src/Qiniu/functions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @param $file string 待计算校验码的文件路径
1414
*
15-
* @return 文件内容的crc32校验码
15+
* @return string 文件内容的crc32校验码
1616
*/
1717
function crc32_file($file)
1818
{
@@ -26,7 +26,7 @@ function crc32_file($file)
2626
*
2727
* @param $data 待计算校验码的字符串
2828
*
29-
* @return 输入字符串的crc32校验码
29+
* @return string 输入字符串的crc32校验码
3030
*/
3131
function crc32_data($data)
3232
{
@@ -108,7 +108,7 @@ function json_decode($json, $assoc = false, $depth = 512)
108108
* @param $bucket 待操作的空间名
109109
* @param $key 待操作的文件名
110110
*
111-
* @return 符合七牛API规格的数据格式
111+
* @return string 符合七牛API规格的数据格式
112112
* @link http://developer.qiniu.com/docs/v6/api/reference/data-formats.html
113113
*/
114114
function entry($bucket, $key)

0 commit comments

Comments
 (0)