Skip to content

Commit 52d4760

Browse files
author
任旺
committed
修改ci 兼容5.3
1 parent 48a3a64 commit 52d4760

File tree

3 files changed

+174
-44
lines changed

3 files changed

+174
-44
lines changed

‎examples/image_url_builder.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
// 要处理图片
1010
$url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg';
11-
$url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?watermark/1/gravity/SouthEast/dx/0/dy/0/image/aHR0cDovL2Fkcy1jZG4uY2h1Y2h1amllLmNvbS9Ga1R6bnpIY2RLdmRBUFc5cHZZZ3pTc21UY0tB';
11+
$url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?watermark/1/gravity/SouthEast/dx/0/dy/0/image/'
12+
. 'aHR0cDovL2Fkcy1jZG4uY2h1Y2h1amllLmNvbS9Ga1R6bnpIY2RLdmRBUFc5cHZZZ3pTc21UY0tB';
1213
$waterImage = 'http://developer.qiniu.com/resource/logo-2.jpg';
1314

1415
/**

‎src/Qiniu/Processing/ImageUrlBuilder.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@ final class ImageUrlBuilder
1515
*
1616
* @var array
1717
*/
18-
protected $modeArr = [0, 1, 2, 3, 4, 5];
18+
protected $modeArr = array(0, 1, 2, 3, 4, 5);
1919

2020
/**
2121
* format合法值
2222
*
2323
* @var array
2424
*/
25-
protected $formatArr = ['psd', 'jpeg', 'png', 'gif', 'webp', 'tiff', 'bmp'];
25+
protected $formatArr = array('psd', 'jpeg', 'png', 'gif', 'webp', 'tiff', 'bmp');
2626

2727
/**
2828
* 水印图片位置合法值
2929
*
3030
* @var array
3131
*/
32-
protected $gravityArr = ['NorthWest', 'North', 'NorthEast', 'West', 'Center', 'East', 'SouthWest', 'South', 'SouthEast'];
32+
protected $gravityArr = array('NorthWest', 'North', 'NorthEast',
33+
'West', 'Center', 'East', 'SouthWest', 'South', 'SouthEast');
3334

3435
/**
3536
* 缩略图链接拼接
@@ -82,7 +83,7 @@ public function thumbnail(
8283

8384
// 拼接渐进显示
8485
if (! is_null($interlace)
85-
&& in_array(intval($interlace), [0, 1], true)
86+
&& in_array(intval($interlace), array(0, 1), true)
8687
) {
8788
$thumbStr .= 'interlace/' . $interlace . '/';
8889
}

‎tests/Qiniu/Tests/ImageUrlBuilderTest.php‎

Lines changed: 167 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,61 @@ public function testThumbutl()
2222
{
2323
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder();
2424
$url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg';
25-
$url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?watermark/1/gravity/SouthEast/dx/0/dy/0/image/aHR0cDovL2Fkcy1jZG4uY2h1Y2h1amllLmNvbS9Ga1R6bnpIY2RLdmRBUFc5cHZZZ3pTc21UY0tB';
25+
$url2 = $url . '?watermark/1/gravity/SouthEast/dx/0/dy/0/image/'
26+
. 'aHR0cDovL2Fkcy1jZG4uY2h1Y2h1amllLmNvbS9Ga1R6bnpIY2RLdmRBUFc5cHZZZ3pTc21UY0tB';
2627
// 异常测试
2728
$this->assertEquals($url, $imageUrlBuilder->thumbnail($url, 1, 0, 0));
2829
$this->assertEquals($url, \Qiniu\thumbnail($url, 1, 0, 0));
2930

3031
// 简单缩略测试
31-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/ignore-error/1/', $imageUrlBuilder->thumbnail($url, 1, 200, 200));
32-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/ignore-error/1/', \Qiniu\thumbnail($url, 1, 200, 200));
32+
$this->assertEquals(
33+
$url . '?imageView2/1/w/200/h/200/ignore-error/1/',
34+
$imageUrlBuilder->thumbnail($url, 1, 200, 200)
35+
);
36+
$this->assertEquals(
37+
$url . '?imageView2/1/w/200/h/200/ignore-error/1/',
38+
\Qiniu\thumbnail($url, 1, 200, 200)
39+
);
3340

3441
// 输出格式测试
35-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/', $imageUrlBuilder->thumbnail($url, 1, 200, 200, 'png'));
36-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/', \Qiniu\thumbnail($url, 1, 200, 200, 'png'));
42+
$this->assertEquals(
43+
$url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/',
44+
$imageUrlBuilder->thumbnail($url, 1, 200, 200, 'png')
45+
);
46+
$this->assertEquals(
47+
$url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/',
48+
\Qiniu\thumbnail($url, 1, 200, 200, 'png')
49+
);
3750

3851
// 渐进显示测试
39-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/interlace/1/ignore-error/1/', $imageUrlBuilder->thumbnail($url, 1, 200, 200, 'png', 1));
40-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/', \Qiniu\thumbnail($url, 1, 200, 200, 'png', 2));
52+
$this->assertEquals(
53+
$url . '?imageView2/1/w/200/h/200/format/png/interlace/1/ignore-error/1/',
54+
$imageUrlBuilder->thumbnail($url, 1, 200, 200, 'png', 1)
55+
);
56+
$this->assertEquals(
57+
$url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/',
58+
\Qiniu\thumbnail($url, 1, 200, 200, 'png', 2)
59+
);
4160

4261
// 图片质量测试
43-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/interlace/1/q/80/ignore-error/1/', $imageUrlBuilder->thumbnail($url, 1, 200, 200, 'png', 1, 80));
44-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/interlace/1/ignore-error/1/', \Qiniu\thumbnail($url, 1, 200, 200, 'png', 1, 101));
62+
$this->assertEquals(
63+
$url . '?imageView2/1/w/200/h/200/format/png/interlace/1/q/80/ignore-error/1/',
64+
$imageUrlBuilder->thumbnail($url, 1, 200, 200, 'png', 1, 80)
65+
);
66+
$this->assertEquals(
67+
$url . '?imageView2/1/w/200/h/200/format/png/interlace/1/ignore-error/1/',
68+
\Qiniu\thumbnail($url, 1, 200, 200, 'png', 1, 101)
69+
);
4570

4671
// 多参数测试
47-
$this->assertEquals($url2 . '|imageView2/1/w/200/h/200/ignore-error/1/', $imageUrlBuilder->thumbnail($url2, 1, 200, 200));
48-
$this->assertEquals($url2 . '|imageView2/1/w/200/h/200/ignore-error/1/', \Qiniu\thumbnail($url2, 1, 200, 200));
72+
$this->assertEquals(
73+
$url2 . '|imageView2/1/w/200/h/200/ignore-error/1/',
74+
$imageUrlBuilder->thumbnail($url2, 1, 200, 200)
75+
);
76+
$this->assertEquals(
77+
$url2 . '|imageView2/1/w/200/h/200/ignore-error/1/',
78+
\Qiniu\thumbnail($url2, 1, 200, 200)
79+
);
4980
}
5081

5182
/**
@@ -60,30 +91,77 @@ public function waterImgTest()
6091
{
6192
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder();
6293
$url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg';
63-
$url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?imageView2/1/w/200/h/200/format/png/ignore-error/1/';
94+
$url2 = $url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/';
6495
$image = 'http://developer.qiniu.com/resource/logo-2.jpg';
6596

6697
// 水印简单测试
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));
98+
$this->assertEquals(
99+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
100+
. '/dissolve/100/gravity/SouthEast/',
101+
$imageUrlBuilder->waterImg($url, $image)
102+
);
103+
$this->assertEquals(
104+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
105+
. '/gravity/SouthEast/',
106+
$imageUrlBuilder->waterImg($url, $image, 101)
107+
);
108+
$this->assertEquals(
109+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/',
110+
$imageUrlBuilder->waterImg($url, $image, 101, 'sdfsd')
111+
);
112+
$this->assertEquals(
113+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
114+
. '/dissolve/100/gravity/SouthEast/',
115+
\Qiniu\waterImg($url, $image)
116+
);
71117

72118
// 横轴边距测试
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'));
119+
$this->assertEquals(
120+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
121+
. '/dissolve/100/gravity/SouthEast/dx/10/',
122+
$imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10)
123+
);
124+
$this->assertEquals(
125+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
126+
. '/dissolve/100/gravity/SouthEast/',
127+
\Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad')
128+
);
75129

76130
// 纵轴边距测试
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'));
131+
$this->assertEquals(
132+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
133+
. '/dissolve/100/gravity/SouthEast/dx/10/dy/10/',
134+
$imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10, 10)
135+
);
136+
$this->assertEquals(
137+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
138+
. '/dissolve/100/gravity/SouthEast/',
139+
\Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad', 'asdf')
140+
);
79141

80142
// 自适应原图的短边比例测试
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));
143+
$this->assertEquals(
144+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
145+
. '/dissolve/100/gravity/SouthEast/dx/10/dy/10/ws/0.5/',
146+
$imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10, 10, 0.5)
147+
);
148+
$this->assertEquals(
149+
$url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
150+
. '/dissolve/100/gravity/SouthEast/',
151+
\Qiniu\waterImg($url, $image, 100, 'SouthEast', 'sad', 'asdf', 2)
152+
);
83153

84154
// 多参数测试
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));
155+
$this->assertEquals(
156+
$url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
157+
. '/dissolve/100/gravity/SouthEast/',
158+
$imageUrlBuilder->waterImg($url2, $image)
159+
);
160+
$this->assertEquals(
161+
$url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw=='
162+
. '/dissolve/100/gravity/SouthEast/',
163+
\Qiniu\waterImg($url2, $image)
164+
);
87165
}
88166

89167
/**
@@ -98,36 +176,86 @@ public function waterTextTest()
98176
{
99177
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder();
100178
$url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg';
101-
$url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?imageView2/1/w/200/h/200/format/png/ignore-error/1/';
179+
$url2 = $url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/';
102180
$text = '测试一下';
103181
$font = '微软雅黑';
104182
$fontColor = '#FF0000';
105183

106184
// 水印简单测试
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'));
185+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/'
186+
. 'fontsize/500/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterText($url, $text, $font, 500));
187+
$this->assertEquals(
188+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/'
189+
. 'dissolve/100/gravity/SouthEast/',
190+
\Qiniu\waterText($url, $text, $font, 'sdf')
191+
);
109192

110193
// 字体颜色测试
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));
194+
$this->assertEquals(
195+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/'
196+
. 'I0ZGMDAwMA==/dissolve/100/gravity/SouthEast/',
197+
$imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor)
198+
);
199+
$this->assertEquals(
200+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA=='
201+
. '/dissolve/100/gravity/SouthEast/',
202+
\Qiniu\waterText($url, $text, $font, 'sdf', $fontColor)
203+
);
113204

114205
// 透明度测试
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));
206+
$this->assertEquals(
207+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA=='
208+
. '/dissolve/80/gravity/SouthEast/',
209+
$imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80)
210+
);
211+
$this->assertEquals(
212+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA=='
213+
. '/gravity/SouthEast/',
214+
\Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101)
215+
);
117216

118217
// 水印位置测试
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'));
218+
$this->assertEquals(
219+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA=='
220+
. '/dissolve/80/gravity/East/',
221+
$imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East')
222+
);
223+
$this->assertEquals(
224+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/',
225+
\Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf')
226+
);
121227

122228
// 横轴距离测试
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'));
229+
$this->assertEquals(
230+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA=='
231+
. '/dissolve/80/gravity/East/dx/10/',
232+
$imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East', 10)
233+
);
234+
$this->assertEquals(
235+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/',
236+
\Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf', 'sdfs')
237+
);
125238

126239
// 纵轴距离测试
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'));
240+
$this->assertEquals(
241+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/fill/I0ZGMDAwMA=='
242+
. '/dissolve/80/gravity/East/dx/10/dy/10/',
243+
$imageUrlBuilder->waterText($url, $text, $font, 500, $fontColor, 80, 'East', 10, 10)
244+
);
245+
$this->assertEquals(
246+
$url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fill/I0ZGMDAwMA==/',
247+
\Qiniu\waterText($url, $text, $font, 'sdf', $fontColor, 101, 'sdfsdf', 'sdfs', 'ssdf')
248+
);
129249
// 多参数测试
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));
250+
$this->assertEquals(
251+
$url2 . '|watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/'
252+
. 'fontsize/500/dissolve/100/gravity/SouthEast/',
253+
$imageUrlBuilder->waterText($url2, $text, $font, 500)
254+
);
255+
$this->assertEquals(
256+
$url2 . '|watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/'
257+
. 'fontsize/500/dissolve/100/gravity/SouthEast/',
258+
\Qiniu\waterText($url2, $text, $font, 500)
259+
);
132260
}
133261
}

0 commit comments

Comments
 (0)