Skip to content

Commit 881bcc3

Browse files
committed
travis pass
1 parent e35572d commit 881bcc3

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

examples/pfop_watermark.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
$notifyUrl = 'http://375dec79.ngrok.com/notify.php';
2222
$pfop = new PersistentFop($auth, $bucket, $pipeline, $notifyUrl);
2323

24-
//需要添加水印的图片UrlSafeBase64,可以参考http://developer.qiniu.com/code/v6/api/dora-api/av/video-watermark.html
24+
//需要添加水印的图片UrlSafeBase64
25+
//可以参考http://developer.qiniu.com/code/v6/api/dora-api/av/video-watermark.html
2526
$base64URL = Qiniu\base64_urlSafeEncode('http://developer.qiniu.com/resource/logo-2.jpg');
2627

2728
//水印参数

tests/Qiniu/Tests/ZoneTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ protected function setUp()
3232
public function testUpHosts()
3333
{
3434

35-
list($upHosts, $err) = $this->zone->getUpHosts($this->ak, $this->bucketName);
35+
list($upHosts, $err) = $this->zone->getUpHosts($this->ak, $this->bucketName);
3636
$this->assertNull($err);
3737
$this->assertEquals('http://up.qiniu.com', $upHosts[0]);
3838
$this->assertEquals('http://upload.qiniu.com', $upHosts[1]);
3939

40-
list($upHosts, $err) = $this->zone->getUpHosts($this->ak, $this->bucketNameBC);
40+
list($upHosts, $err) = $this->zone->getUpHosts($this->ak, $this->bucketNameBC);
4141
$this->assertNull($err);
4242
$this->assertEquals('http://up-z1.qiniu.com', $upHosts[0]);
4343
$this->assertEquals('http://upload-z1.qiniu.com', $upHosts[1]);
4444

45-
list($upHosts, $err) = $this->zoneHttps->getUpHosts($this->ak, $this->bucketName);
45+
list($upHosts, $err) = $this->zoneHttps->getUpHosts($this->ak, $this->bucketName);
4646
$this->assertNull($err);
4747
$this->assertEquals('https://up.qbox.me', $upHosts[0]);
4848

49-
list($upHosts, $err) = $this->zoneHttps->getUpHosts($this->ak, $this->bucketNameBC);
49+
list($upHosts, $err) = $this->zoneHttps->getUpHosts($this->ak, $this->bucketNameBC);
5050
$this->assertNull($err);
5151
$this->assertEquals('https://up-z1.qbox.me', $upHosts[0]);
5252
}

0 commit comments

Comments
 (0)