From 7ea0e1b0f011ad30b0c2ac584b42e46e3ff9dde8 Mon Sep 17 00:00:00 2001 From: anka <425732469@qq.com> Date: Mon, 30 Sep 2019 16:20:20 +0800 Subject: [PATCH 1/8] Update UploadManager.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 兼容直接调用put方法未指定fname时上传响应400的问题 --- src/Qiniu/Storage/UploadManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Qiniu/Storage/UploadManager.php b/src/Qiniu/Storage/UploadManager.php index 209df11a..8fbd504c 100644 --- a/src/Qiniu/Storage/UploadManager.php +++ b/src/Qiniu/Storage/UploadManager.php @@ -46,7 +46,7 @@ public function put( $data, $params = null, $mime = 'application/octet-stream', - $fname = null + $fname = "default_filename" ) { $params = self::trimParams($params); From 40b0ea64bc74e258816d91283cbf681f773acb0f Mon Sep 17 00:00:00 2001 From: anka <425732469@qq.com> Date: Wed, 16 Oct 2019 19:15:11 +0800 Subject: [PATCH 2/8] Update AppClient.php --- src/Qiniu/Rtc/AppClient.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Qiniu/Rtc/AppClient.php b/src/Qiniu/Rtc/AppClient.php index 0fd0019a..a7dc11e1 100755 --- a/src/Qiniu/Rtc/AppClient.php +++ b/src/Qiniu/Rtc/AppClient.php @@ -33,7 +33,7 @@ public function createApp($hub, $title, $maxUsers = null, $noAutoKickUser = null if (!empty($maxUsers)) { $params['maxUsers'] = $maxUsers; } - if (!empty($noAutoKickUser)) { + if ($noAutoKickUser !== null) { $params['noAutoKickUser'] = $noAutoKickUser; } $body = json_encode($params); @@ -65,7 +65,7 @@ public function updateApp($appId, $hub, $title, $maxUsers = null, $mergePublishR if (!empty($maxUsers)) { $params['maxUsers'] = $maxUsers; } - if (!empty($noAutoKickUser)) { + if ($noAutoKickUser !== null) { $params['noAutoKickUser'] = $noAutoKickUser; } if (!empty($mergePublishRtmp)) { From 18d092add3e113461d4f36931b03fd10e1886525 Mon Sep 17 00:00:00 2001 From: anka <425732469@qq.com> Date: Mon, 28 Oct 2019 15:36:17 +0800 Subject: [PATCH 3/8] Update Sms.php --- src/Qiniu/Sms/Sms.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Qiniu/Sms/Sms.php b/src/Qiniu/Sms/Sms.php index 592d6ba7..f19a124f 100644 --- a/src/Qiniu/Sms/Sms.php +++ b/src/Qiniu/Sms/Sms.php @@ -33,7 +33,7 @@ public function __construct(Auth $auth) "signature_id": } */ - public function createSignature(string $signature, string $source, string $pics = null) + public function createSignature($signature, $source, $pics = null) { $params['signature'] = $signature; $params['source'] = $source; @@ -62,7 +62,7 @@ public function createSignature(string $signature, string $source, string $pics "signature": string } */ - public function updateSignature(string $id, string $signature, string $source, string $pics = null) + public function updateSignature($id, $signature, $source, $pics = null) { $params['signature'] = $signature; $params['source'] = $source; @@ -96,7 +96,7 @@ public function updateSignature(string $id, string $signature, string $source, s "page_size": int, } */ - public function checkSignature(string $audit_status = null, int $page = 1, int $page_size = 20) + public function checkSignature($audit_status = null, $page = 1, $page_size = 20) { $url = sprintf( @@ -116,7 +116,7 @@ public function checkSignature(string $audit_status = null, int $page = 1, int $ * id 签名id string 类型，必填， * @retrun : 请求成功 HTTP 状态码为 200 */ - public function deleteSignature(string $id) + public function deleteSignature($id) { $url = $this->baseURL . 'signature/' . $id; list(, $err) = $this->delete($url); @@ -139,11 +139,11 @@ public function deleteSignature(string $id) } */ public function createTemplate( - string $name, - string $template, - string $type, - string $description, - string $signture_id + $name, + $template, + $type, + $description, + $signture_id ) { $params['name'] = $name; $params['template'] = $template; @@ -181,7 +181,7 @@ public function createTemplate( "page_size": int } */ - public function queryTemplate(string $audit_status = null, int $page = 1, int $page_size = 20) + public function queryTemplate($audit_status = null, $page = 1, $page_size = 20) { $url = sprintf( @@ -205,11 +205,11 @@ public function queryTemplate(string $audit_status = null, int $page = 1, int $p * @retrun : 请求成功 HTTP 状态码为 200 */ public function updateTemplate( - string $id, - string $name, - string $template, - string $description, - string $signature_id + $id, + $name, + $template, + $description, + $signature_id ) { $params['name'] = $name; $params['template'] = $template; @@ -226,7 +226,7 @@ public function updateTemplate( * id :模板id string 类型，必填， * @retrun : 请求成功 HTTP 状态码为 200 */ - public function deleteTemplate(string $id) + public function deleteTemplate($id) { $url = $this->baseURL . 'template/' . $id; list(, $err) = $this->delete($url); @@ -243,7 +243,7 @@ public function deleteTemplate(string $id) "job_id": string } */ - public function sendMessage(string $template_id, array $mobiles, array $parameters = null) + public function sendMessage($template_id, $mobiles, $parameters = null) { $params['template_id'] = $template_id; $params['mobiles'] = $mobiles; @@ -256,7 +256,7 @@ public function sendMessage(string $template_id, array $mobiles, array $paramete return $ret; } - public function imgToBase64(string $img_file) + public function imgToBase64($img_file) { $img_base64 = ''; if (file_exists($img_file)) { From 246cd18208a9a233af1b86867a359cb93adf8759 Mon Sep 17 00:00:00 2001 From: anka <425732469@qq.com> Date: Mon, 28 Oct 2019 15:45:10 +0800 Subject: [PATCH 4/8] Update BucketManager.php --- src/Qiniu/Storage/BucketManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Qiniu/Storage/BucketManager.php b/src/Qiniu/Storage/BucketManager.php index e38f433e..0a2413dd 100644 --- a/src/Qiniu/Storage/BucketManager.php +++ b/src/Qiniu/Storage/BucketManager.php @@ -59,7 +59,7 @@ public function listbuckets( $line = 'false', $shared = 'false' ) { - $path = '/v3/buckets?region=' . $region . '&line=' . $line . '&shared=' . $share; + $path = '/v3/buckets?region=' . $region . '&line=' . $line . '&shared=' . $shared; $info = $this->ucPost($path); return $info; } From de885570c4a2f04e8003cfa9c121fe61df70f4e9 Mon Sep 17 00:00:00 2001 From: anka <425732469@qq.com> Date: Mon, 28 Oct 2019 16:38:27 +0800 Subject: [PATCH 5/8] Update DownloadTest.php --- tests/Qiniu/Tests/DownloadTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Qiniu/Tests/DownloadTest.php b/tests/Qiniu/Tests/DownloadTest.php index 82990f2a..24a9b68e 100755 --- a/tests/Qiniu/Tests/DownloadTest.php +++ b/tests/Qiniu/Tests/DownloadTest.php @@ -8,7 +8,7 @@ class DownloadTest extends \PHPUnit_Framework_TestCase public function test() { global $testAuth; - $base_url = 'http://private-res.qiniudn.com/gogopher.jpg'; + $base_url = 'http://sdk.peterpy.cn/sdktest.png'; $private_url = $testAuth->privateDownloadUrl($base_url); $response = Client::get($private_url); $this->assertEquals(200, $response->statusCode); @@ -17,7 +17,7 @@ public function test() public function testFop() { global $testAuth; - $base_url = 'http://private-res.qiniudn.com/gogopher.jpg?exif'; + $base_url = 'http://sdk.peterpy.cn/sdktest.png?exif'; $private_url = $testAuth->privateDownloadUrl($base_url); $response = Client::get($private_url); $this->assertEquals(200, $response->statusCode); From ca62309c3089a02abe12d3466138a7c9b46c0dab Mon Sep 17 00:00:00 2001 From: anka <425732469@qq.com> Date: Mon, 28 Oct 2019 16:54:33 +0800 Subject: [PATCH 6/8] Update FopTest.php --- tests/Qiniu/Tests/FopTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Qiniu/Tests/FopTest.php b/tests/Qiniu/Tests/FopTest.php index e1ea730e..96b1d26b 100755 --- a/tests/Qiniu/Tests/FopTest.php +++ b/tests/Qiniu/Tests/FopTest.php @@ -8,8 +8,8 @@ class FopTest extends \PHPUnit_Framework_TestCase { public function testExifPub() { - $fop = new Operation('testres.qiniudn.com'); - list($exif, $error) = $fop->execute('gogopher.jpg', 'exif'); + $fop = new Operation('sdk.peterpy.cn'); + list($exif, $error) = $fop->execute('sdktest.png', 'exif'); $this->assertNull($error); $this->assertNotNull($exif); } From 5dbcd861edeb0a8666e16aa443e64fe1f6b1d168 Mon Sep 17 00:00:00 2001 From: anka <425732469@qq.com> Date: Mon, 28 Oct 2019 17:01:26 +0800 Subject: [PATCH 7/8] Modify test class Modify test class --- tests/Qiniu/Tests/CdnManagerTest.php | 2 +- tests/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Qiniu/Tests/CdnManagerTest.php b/tests/Qiniu/Tests/CdnManagerTest.php index 3c45bbdf..892197da 100755 --- a/tests/Qiniu/Tests/CdnManagerTest.php +++ b/tests/Qiniu/Tests/CdnManagerTest.php @@ -25,7 +25,7 @@ protected function setUp() $this->cdnManager = new CdnManager($testAuth); $this->encryptKey = $timestampAntiLeechEncryptKey; - $this->imgUrl = $customDomain . '/24.jpg'; + $this->imgUrl = $customDomain . '/sdktest.png'; } public function testCreateTimestampAntiLeechUrl() diff --git a/tests/bootstrap.php b/tests/bootstrap.php index c300057c..5cbce357 100755 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -21,7 +21,7 @@ //cdn $timestampAntiLeechEncryptKey = getenv('QINIU_TIMESTAMP_ENCRPTKEY'); -$customDomain = "http://phpsdk.peterpy.cn"; +$customDomain = "http://sdk.peterpy.cn"; $tid = getenv('TRAVIS_JOB_NUMBER'); if (!empty($tid)) { From a3aaf8c77ab295159019145877618a6006665de4 Mon Sep 17 00:00:00 2001 From: anka <425732469@qq.com> Date: Mon, 28 Oct 2019 17:39:09 +0800 Subject: [PATCH 8/8] Modify test link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改测试链接 --- tests/Qiniu/Tests/DownloadTest.php | 4 ++-- tests/Qiniu/Tests/FopTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Qiniu/Tests/DownloadTest.php b/tests/Qiniu/Tests/DownloadTest.php index 24a9b68e..5373ab37 100755 --- a/tests/Qiniu/Tests/DownloadTest.php +++ b/tests/Qiniu/Tests/DownloadTest.php @@ -8,7 +8,7 @@ class DownloadTest extends \PHPUnit_Framework_TestCase public function test() { global $testAuth; - $base_url = 'http://sdk.peterpy.cn/sdktest.png'; + $base_url = 'http://sdk.peterpy.cn/gogopher.jpg'; $private_url = $testAuth->privateDownloadUrl($base_url); $response = Client::get($private_url); $this->assertEquals(200, $response->statusCode); @@ -17,7 +17,7 @@ public function test() public function testFop() { global $testAuth; - $base_url = 'http://sdk.peterpy.cn/sdktest.png?exif'; + $base_url = 'http://sdk.peterpy.cn/gogopher.jpg?exif'; $private_url = $testAuth->privateDownloadUrl($base_url); $response = Client::get($private_url); $this->assertEquals(200, $response->statusCode); diff --git a/tests/Qiniu/Tests/FopTest.php b/tests/Qiniu/Tests/FopTest.php index 96b1d26b..6cbdb7f7 100755 --- a/tests/Qiniu/Tests/FopTest.php +++ b/tests/Qiniu/Tests/FopTest.php @@ -9,7 +9,7 @@ class FopTest extends \PHPUnit_Framework_TestCase public function testExifPub() { $fop = new Operation('sdk.peterpy.cn'); - list($exif, $error) = $fop->execute('sdktest.png', 'exif'); + list($exif, $error) = $fop->execute('gogopher.jpg', 'exif'); $this->assertNull($error); $this->assertNotNull($exif); }