Skip to content

Commit 48a3a64

Browse files
author
任旺
committed
修改CI
1 parent ea930c6 commit 48a3a64

File tree

5 files changed

+86
-98
lines changed

5 files changed

+86
-98
lines changed

‎examples/image_url_builder.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @param int $quality 图片质量 [可选]
2323
* @param int $interlace 是否支持渐进显示 [可选]
2424
* @param int $ignoreError 忽略结果 [可选]
25-
* @return string
25+
* @return string
2626
* @link http://developer.qiniu.com/code/v6/api/kodo-api/image/imageview2.html
2727
* @author Sherlock Ren <[email protected]>
2828
*/
@@ -45,7 +45,7 @@
4545
* @link http://developer.qiniu.com/code/v6/api/kodo-api/image/watermark.html
4646
* @return string
4747
* @author Sherlock Ren <[email protected]>
48-
*/
48+
*/
4949
$waterLink = $imageUrlBuilder->waterImg($url, $waterImage);
5050
// 函数调用方法
5151
//$waterLink = \Qiniu\waterImg($url, $waterImage);

‎src/Qiniu/Processing/ImageUrlBuilder.php

+41-52
Original file line numberDiff line numberDiff line change
@@ -42,56 +42,53 @@ final class ImageUrlBuilder
4242
* @param int $quality 图片质量
4343
* @param int $interlace 是否支持渐进显示
4444
* @param int $ignoreError 忽略结果
45-
* @return string
45+
* @return string
4646
* @link http://developer.qiniu.com/code/v6/api/kodo-api/image/imageview2.html
4747
* @author Sherlock Ren <[email protected]>
4848
*/
4949
public function thumbnail(
50-
$url,
51-
$mode,
52-
$width,
53-
$height,
50+
$url,
51+
$mode,
52+
$width,
53+
$height,
5454
$format = null,
5555
$interlace = null,
5656
$quality = null,
5757
$ignoreError = 1
58-
)
59-
{
58+
) {
59+
6060
// url合法效验
61-
if ( ! $this->isUrl($url)) {
61+
if (! $this->isUrl($url)) {
6262
return $url;
63-
}
63+
}
6464

65-
// 参数合法性效验
66-
if ( ! in_array(intval($mode), $this->modeArr, true)) {
65+
// 参数合法性效验
66+
if (! in_array(intval($mode), $this->modeArr, true)) {
6767
return $url;
6868
}
6969

70-
if ( ! $width || ! $height) {
70+
if (! $width || ! $height) {
7171
return $url;
7272
}
7373

7474
$thumbStr = 'imageView2/' . $mode . '/w/' . $width . '/h/' . $height . '/';
7575

7676
// 拼接输出格式
77-
if (
78-
! is_null($format)
77+
if (! is_null($format)
7978
&& in_array($format, $this->formatArr)
8079
) {
8180
$thumbStr .= 'format/' . $format . '/';
8281
}
8382

8483
// 拼接渐进显示
85-
if (
86-
! is_null($interlace)
84+
if (! is_null($interlace)
8785
&& in_array(intval($interlace), [0, 1], true)
8886
) {
8987
$thumbStr .= 'interlace/' . $interlace . '/';
9088
}
9189

9290
// 拼接图片质量
93-
if (
94-
! is_null($quality)
91+
if (! is_null($quality)
9592
&& intval($quality) >= 0
9693
&& intval($quality) <= 100
9794
) {
@@ -119,53 +116,49 @@ public function thumbnail(
119116
* @author Sherlock Ren <[email protected]>
120117
*/
121118
public function waterImg(
122-
$url,
123-
$image,
119+
$url,
120+
$image,
124121
$dissolve = 100,
125-
$gravity = 'SouthEast',
126-
$dx = null,
122+
$gravity = 'SouthEast',
123+
$dx = null,
127124
$dy = null,
128125
$watermarkScale = null
129126
) {
130127
// url合法效验
131-
if ( ! $this->isUrl($url)) {
128+
if (! $this->isUrl($url)) {
132129
return $url;
133130
}
134131

135132
$waterStr = 'watermark/1/image/' . \Qiniu\base64_urlSafeEncode($image) . '/';
136133

137134
// 拼接水印透明度
138-
if (
139-
is_numeric($dissolve)
135+
if (is_numeric($dissolve)
140136
&& $dissolve <= 100
141137
) {
142138
$waterStr .= 'dissolve/' . $dissolve . '/';
143-
}
139+
}
144140

145141
// 拼接水印位置
146142
if (in_array($gravity, $this->gravityArr, true)) {
147143
$waterStr .= 'gravity/' . $gravity . '/';
148-
}
144+
}
149145

150146
// 拼接横轴边距
151-
if (
152-
! is_null($dx)
147+
if (! is_null($dx)
153148
&& is_numeric($dx)
154149
) {
155150
$waterStr .= 'dx/' . $dx . '/';
156151
}
157152

158153
// 拼接纵轴边距
159-
if (
160-
! is_null($dy)
154+
if (! is_null($dy)
161155
&& is_numeric($dy)
162156
) {
163157
$waterStr .= 'dy/' . $dy . '/';
164158
}
165159

166160
// 拼接自适应原图的短边比例
167-
if (
168-
! is_null($watermarkScale)
161+
if (! is_null($watermarkScale)
169162
&& is_numeric($watermarkScale)
170163
&& $watermarkScale > 0
171164
&& $watermarkScale < 1
@@ -194,22 +187,22 @@ public function waterImg(
194187
* @author Sherlock Ren <[email protected]>
195188
*/
196189
public function waterText(
197-
$url,
198-
$text,
199-
$font = '黑体',
200-
$fontSize = 0,
201-
$fontColor = null,
190+
$url,
191+
$text,
192+
$font = '黑体',
193+
$fontSize = 0,
194+
$fontColor = null,
202195
$dissolve = 100,
203-
$gravity = 'SouthEast',
204-
$dx = null,
196+
$gravity = 'SouthEast',
197+
$dx = null,
205198
$dy = null
206199
) {
207200
// url合法效验
208-
if ( ! $this->isUrl($url)) {
201+
if (! $this->isUrl($url)) {
209202
return $url;
210203
}
211204

212-
$waterStr = 'watermark/2/text/'
205+
$waterStr = 'watermark/2/text/'
213206
. \Qiniu\base64_urlSafeEncode($text) . '/font/'
214207
. \Qiniu\base64_urlSafeEncode($font) . '/';
215208

@@ -219,37 +212,33 @@ public function waterText(
219212
}
220213

221214
// 拼接文字颜色
222-
if (
223-
! is_null($fontColor)
215+
if (! is_null($fontColor)
224216
&& $fontColor
225217
) {
226218
$waterStr .= 'fill/' . \Qiniu\base64_urlSafeEncode($fontColor) . '/';
227219
}
228220

229221
// 拼接水印透明度
230-
if (
231-
is_numeric($dissolve)
222+
if (is_numeric($dissolve)
232223
&& $dissolve <= 100
233224
) {
234225
$waterStr .= 'dissolve/' . $dissolve . '/';
235-
}
226+
}
236227

237228
// 拼接水印位置
238229
if (in_array($gravity, $this->gravityArr, true)) {
239230
$waterStr .= 'gravity/' . $gravity . '/';
240-
}
231+
}
241232

242233
// 拼接横轴边距
243-
if (
244-
! is_null($dx)
234+
if (! is_null($dx)
245235
&& is_numeric($dx)
246236
) {
247237
$waterStr .= 'dx/' . $dx . '/';
248238
}
249239

250240
// 拼接纵轴边距
251-
if (
252-
! is_null($dy)
241+
if (! is_null($dy)
253242
&& is_numeric($dy)
254243
) {
255244
$waterStr .= 'dy/' . $dy . '/';

‎src/Qiniu/functions.php

+16-16
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ function setWithoutEmpty(&$array, $key, $value)
151151
* @param int $quality 图片质量
152152
* @param int $interlace 是否支持渐进显示
153153
* @param int $ignoreError 忽略结果
154-
* @return string
154+
* @return string
155155
* @link http://developer.qiniu.com/code/v6/api/kodo-api/image/imageview2.html
156156
* @author Sherlock Ren <[email protected]>
157157
*/
158158
function thumbnail(
159-
$url,
160-
$mode,
161-
$width,
162-
$height,
159+
$url,
160+
$mode,
161+
$width,
162+
$height,
163163
$format = null,
164164
$quality = null,
165165
$interlace = null,
@@ -188,11 +188,11 @@ function thumbnail(
188188
* @author Sherlock Ren <[email protected]>
189189
*/
190190
function waterImg(
191-
$url,
192-
$image,
191+
$url,
192+
$image,
193193
$dissolve = 100,
194-
$gravity = 'SouthEast',
195-
$dx = null,
194+
$gravity = 'SouthEast',
195+
$dx = null,
196196
$dy = null,
197197
$watermarkScale = null
198198
) {
@@ -221,14 +221,14 @@ function waterImg(
221221
* @author Sherlock Ren <[email protected]>
222222
*/
223223
function waterText(
224-
$url,
225-
$text,
226-
$font = '黑体',
227-
$fontSize = 0,
228-
$fontColor = null,
224+
$url,
225+
$text,
226+
$font = '黑体',
227+
$fontSize = 0,
228+
$fontColor = null,
229229
$dissolve = 100,
230-
$gravity = 'SouthEast',
231-
$dx = null,
230+
$gravity = 'SouthEast',
231+
$dx = null,
232232
$dy = null
233233
) {
234234
static $imageUrlBuilder = null;

‎tests/Qiniu/Tests/AuthTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public function testUploadToken()
8080

8181
public function testVerifyCallback()
8282
{
83-
8483
}
8584
}
8685
}

‎tests/Qiniu/Tests/ImageUrlBuilderTest.php

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php
22

33
namespace Qiniu\Tests;
44

@@ -64,26 +64,26 @@ public function waterImgTest()
6464
$image = 'http://developer.qiniu.com/resource/logo-2.jpg';
6565

6666
// 水印简单测试
67-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterImg($url, $image));
68-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/gravity/SouthEast/', $imageUrlBuilder->waterImg($url, $image, 101));
69-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/', $imageUrlBuilder->waterImg($url, $image, 101, 'sdfsd'));
70-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url, $image));
67+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterImg($url, $image));
68+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/gravity/SouthEast/', $imageUrlBuilder->waterImg($url, $image, 101));
69+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/', $imageUrlBuilder->waterImg($url, $image, 101, 'sdfsd'));
70+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url, $image));
7171

7272
// 横轴边距测试
73-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/dx/10/', $imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10));
74-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad'));
73+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/dx/10/', $imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10));
74+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad'));
7575

7676
// 纵轴边距测试
77-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/dx/10/dy/10/', $imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10, 10));
78-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad', 'asdf'));
77+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/dx/10/dy/10/', $imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10, 10));
78+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad', 'asdf'));
7979

8080
// 自适应原图的短边比例测试
81-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/dx/10/dy/10/ws/0.5/', $imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10, 10, 0.5));
82-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad', 'asdf', 2));
81+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/dx/10/dy/10/ws/0.5/', $imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10, 10, 0.5));
82+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad', 'asdf', 2));
8383

8484
// 多参数测试
85-
$this->assertEquals($url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterImg($url2, $image));
86-
$this->assertEquals($url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url2, $image));
85+
$this->assertEquals($url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterImg($url2, $image));
86+
$this->assertEquals($url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url2, $image));
8787
}
8888

8989
/**
@@ -104,30 +104,30 @@ public function waterTextTest()
104104
$fontColor = '#FF0000';
105105

106106
// 水印简单测试
107-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterText($url, $text, $font, 500));
108-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/dissolve/100/gravity/SouthEast/', \Qiniu\waterText($url, $text, $font, 'sdf'));
107+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterText($url, $text, $font, 500));
108+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/dissolve/100/gravity/SouthEast/', \Qiniu\waterText($url, $text, $font, 'sdf'));
109109

110110
// 字体颜色测试
111-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor));
112-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/dissolve/100/gravity/SouthEast/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor));
111+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor));
112+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/dissolve/100/gravity/SouthEast/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor));
113113

114114
// 透明度测试
115-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/80/gravity/SouthEast/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80));
116-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/gravity/SouthEast/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101));
115+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/80/gravity/SouthEast/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80));
116+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/gravity/SouthEast/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101));
117117

118118
// 水印位置测试
119-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/80/gravity/East/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East'));
120-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf'));
119+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/80/gravity/East/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East'));
120+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf'));
121121

122122
// 横轴距离测试
123-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/80/gravity/East/dx/10/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East', 10));
124-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf', 'sdfs'));
123+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/80/gravity/East/dx/10/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East', 10));
124+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf', 'sdfs'));
125125

126126
// 纵轴距离测试
127-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/80/gravity/East/dx/10/dy/10/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East', 10, 10));
128-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf', 'sdfs', 'ssdf'));
127+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA==/dissolve/80/gravity/East/dx/10/dy/10/', $imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East', 10, 10));
128+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/', \Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf', 'sdfs', 'ssdf'));
129129
// 多参数测试
130-
$this->assertEquals($url2 . '|watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterText($url2, $text, $font, 500));
131-
$this->assertEquals($url2 . '|watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/dissolve/100/gravity/SouthEast/', \Qiniu\waterText($url2, $text, $font, 500));
130+
$this->assertEquals($url2 . '|watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterText($url2, $text, $font, 500));
131+
$this->assertEquals($url2 . '|watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/dissolve/100/gravity/SouthEast/', \Qiniu\waterText($url2, $text, $font, 500));
132132
}
133133
}

0 commit comments

Comments
 (0)