Skip to content

Commit ea930c6

Browse files
author
任旺
committed
修改类名称
1 parent 34c9eb6 commit ea930c6

File tree

4 files changed

+43
-43
lines changed

4 files changed

+43
-43
lines changed

‎examples/image_process.php‎ renamed to ‎examples/image_url_builder.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
require_once __DIR__ . '/../autoload.php';
33

44
// 引入图片处理类
5-
use Qiniu\Processing\ImageProcess;
5+
use Qiniu\Processing\ImageUrlBuilder;
66

7-
$imageProcess = new ImageProcess();
7+
$imageUrlBuilder = new ImageUrlBuilder();
88

99
// 要处理图片
1010
$url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg';
@@ -26,7 +26,7 @@
2626
* @link http://developer.qiniu.com/code/v6/api/kodo-api/image/imageview2.html
2727
* @author Sherlock Ren <sherlock_ren@icloud.com>
2828
*/
29-
$thumbLink = $imageProcess->thumbnail($url, 1, 100, 100);
29+
$thumbLink = $imageUrlBuilder->thumbnail($url, 1, 100, 100);
3030

3131
// 函数方式调用 也可拼接多个操作参数 图片+水印
3232
$thumbLink2 = \Qiniu\thumbnail($url2, 1, 100, 100);
@@ -46,7 +46,7 @@
4646
* @return string
4747
* @author Sherlock Ren <sherlock_ren@icloud.com>
4848
*/
49-
$waterLink = $imageProcess->waterImg($url, $waterImage);
49+
$waterLink = $imageUrlBuilder->waterImg($url, $waterImage);
5050
// 函数调用方法
5151
//$waterLink = \Qiniu\waterImg($url, $waterImage);
5252
var_dump($waterLink);
@@ -67,7 +67,7 @@
6767
* @return string
6868
* @author Sherlock Ren <sherlock_ren@icloud.com>
6969
*/
70-
$textLink = $imageProcess->waterText($url, '你瞅啥', '微软雅黑', 300);
70+
$textLink = $imageUrlBuilder->waterText($url, '你瞅啥', '微软雅黑', 300);
7171
// 函数调用方法
7272
// $textLink = \Qiniu\waterText($url, '你瞅啥', '微软雅黑', 300);
7373
var_dump($textLink);

‎src/Qiniu/Processing/ImageProcess.php‎ renamed to ‎src/Qiniu/Processing/ImageUrlBuilder.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
use Qiniu;
55

66
/**
7-
* 主要涉及图片的处理
7+
* 主要涉及图片链接拼接
88
*
99
* @link http://developer.qiniu.com/code/v6/api/kodo-api/image/imageview2.html
1010
*/
11-
final class ImageProcess
11+
final class ImageUrlBuilder
1212
{
1313
/**
1414
* mode合法范围值

‎src/Qiniu/functions.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ function thumbnail(
165165
$interlace = null,
166166
$ignoreError = 1
167167
) {
168-
static $imageProcess = null;
169-
if (is_null($imageProcess)) {
170-
$imageProcess = new \Qiniu\Processing\ImageProcess;
168+
static $imageUrlBuilder = null;
169+
if (is_null($imageUrlBuilder)) {
170+
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder;
171171
}
172172

173-
return call_user_func_array(array($imageProcess, 'thumbnail'), func_get_args());
173+
return call_user_func_array(array($imageUrlBuilder, 'thumbnail'), func_get_args());
174174
}
175175

176176
/**
@@ -196,12 +196,12 @@ function waterImg(
196196
$dy = null,
197197
$watermarkScale = null
198198
) {
199-
static $imageProcess = null;
200-
if (is_null($imageProcess)) {
201-
$imageProcess = new \Qiniu\Processing\ImageProcess;
199+
static $imageUrlBuilder = null;
200+
if (is_null($imageUrlBuilder)) {
201+
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder;
202202
}
203203

204-
return call_user_func_array(array($imageProcess, 'waterImg'), func_get_args());
204+
return call_user_func_array(array($imageUrlBuilder, 'waterImg'), func_get_args());
205205
}
206206

207207
/**
@@ -231,11 +231,11 @@ function waterText(
231231
$dx = null,
232232
$dy = null
233233
) {
234-
static $imageProcess = null;
235-
if (is_null($imageProcess)) {
236-
$imageProcess = new \Qiniu\Processing\ImageProcess;
234+
static $imageUrlBuilder = null;
235+
if (is_null($imageUrlBuilder)) {
236+
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder;
237237
}
238238

239-
return call_user_func_array(array($imageProcess, 'waterText'), func_get_args());
239+
return call_user_func_array(array($imageUrlBuilder, 'waterText'), func_get_args());
240240
}
241241
}

‎tests/Qiniu/Tests/ImageProcessTest.php‎ renamed to ‎tests/Qiniu/Tests/ImageUrlBuilderTest.php‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @subpackage test
1010
* @author Sherlock Ren <sherlock_ren@icloud.com>
1111
*/
12-
class ImageProcessTest extends \PHPUnit_Framework_TestCase
12+
class ImageUrlBuilderTest extends \PHPUnit_Framework_TestCase
1313
{
1414
/**
1515
* 缩略图测试
@@ -20,31 +20,31 @@ class ImageProcessTest extends \PHPUnit_Framework_TestCase
2020
*/
2121
public function testThumbutl()
2222
{
23-
$imageProcess = new \Qiniu\Processing\ImageProcess();
23+
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder();
2424
$url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg';
2525
$url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?watermark/1/gravity/SouthEast/dx/0/dy/0/image/aHR0cDovL2Fkcy1jZG4uY2h1Y2h1amllLmNvbS9Ga1R6bnpIY2RLdmRBUFc5cHZZZ3pTc21UY0tB';
2626
// 异常测试
27-
$this->assertEquals($url, $imageProcess->thumbnail($url, 1, 0, 0));
27+
$this->assertEquals($url, $imageUrlBuilder->thumbnail($url, 1, 0, 0));
2828
$this->assertEquals($url, \Qiniu\thumbnail($url, 1, 0, 0));
2929

3030
// 简单缩略测试
31-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/ignore-error/1/', $imageProcess->thumbnail($url, 1, 200, 200));
31+
$this->assertEquals($url . '?imageView2/1/w/200/h/200/ignore-error/1/', $imageUrlBuilder->thumbnail($url, 1, 200, 200));
3232
$this->assertEquals($url . '?imageView2/1/w/200/h/200/ignore-error/1/', \Qiniu\thumbnail($url, 1, 200, 200));
3333

3434
// 输出格式测试
35-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/', $imageProcess->thumbnail($url, 1, 200, 200, 'png'));
35+
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/', $imageUrlBuilder->thumbnail($url, 1, 200, 200, 'png'));
3636
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/', \Qiniu\thumbnail($url, 1, 200, 200, 'png'));
3737

3838
// 渐进显示测试
39-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/interlace/1/ignore-error/1/', $imageProcess->thumbnail($url, 1, 200, 200, 'png', 1));
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));
4040
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/ignore-error/1/', \Qiniu\thumbnail($url, 1, 200, 200, 'png', 2));
4141

4242
// 图片质量测试
43-
$this->assertEquals($url . '?imageView2/1/w/200/h/200/format/png/interlace/1/q/80/ignore-error/1/', $imageProcess->thumbnail($url, 1, 200, 200, 'png', 1, 80));
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));
4444
$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));
4545

4646
// 多参数测试
47-
$this->assertEquals($url2 . '|imageView2/1/w/200/h/200/ignore-error/1/', $imageProcess->thumbnail($url2, 1, 200, 200));
47+
$this->assertEquals($url2 . '|imageView2/1/w/200/h/200/ignore-error/1/', $imageUrlBuilder->thumbnail($url2, 1, 200, 200));
4848
$this->assertEquals($url2 . '|imageView2/1/w/200/h/200/ignore-error/1/', \Qiniu\thumbnail($url2, 1, 200, 200));
4949
}
5050

@@ -58,31 +58,31 @@ public function testThumbutl()
5858
*/
5959
public function waterImgTest()
6060
{
61-
$imageProcess = new \Qiniu\Processing\ImageProcess();
61+
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder();
6262
$url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg';
6363
$url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?imageView2/1/w/200/h/200/format/png/ignore-error/1/';
6464
$image = 'http://developer.qiniu.com/resource/logo-2.jpg';
6565

6666
// 水印简单测试
67-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', $imageProcess->waterImg($url, $image));
68-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/gravity/SouthEast/', $imageProcess->waterImg($url, $image, 101));
69-
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/', $imageProcess->waterImg($url, $image, 101, 'sdfsd'));
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'));
7070
$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/', $imageProcess->waterImg($url, $image, 100, 'SouthEast', 10));
73+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/dx/10/', $imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10));
7474
$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/', $imageProcess->waterImg($url, $image, 100, 'SouthEast', 10, 10));
77+
$this->assertEquals($url . '?watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/dx/10/dy/10/', $imageUrlBuilder->waterImg($url, $image, 100, 'SouthEast', 10, 10));
7878
$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/', $imageProcess->waterImg($url, $image, 100, 'SouthEast', 10, 10, 0.5));
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));
8282
$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/', $imageProcess->waterImg($url2, $image));
85+
$this->assertEquals($url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterImg($url2, $image));
8686
$this->assertEquals($url2 . '|watermark/1/image/aHR0cDovL2RldmVsb3Blci5xaW5pdS5jb20vcmVzb3VyY2UvbG9nby0yLmpwZw==/dissolve/100/gravity/SouthEast/', \Qiniu\waterImg($url2, $image));
8787
}
8888

@@ -96,38 +96,38 @@ public function waterImgTest()
9696
*/
9797
public function waterTextTest()
9898
{
99-
$imageProcess = new \Qiniu\Processing\ImageProcess();
99+
$imageUrlBuilder = new \Qiniu\Processing\ImageUrlBuilder();
100100
$url = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg';
101101
$url2 = 'http://78re52.com1.z0.glb.clouddn.com/resource/gogopher.jpg?imageView2/1/w/200/h/200/format/png/ignore-error/1/';
102102
$text = '测试一下';
103103
$font = '微软雅黑';
104104
$fontColor = '#FF0000';
105105

106106
// 水印简单测试
107-
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/dissolve/100/gravity/SouthEast/', $imageProcess->waterText($url, $text, $font, 500));
107+
$this->assertEquals($url . '?watermark/2/text/5rWL6K-V5LiA5LiL/font/5b6u6L2v6ZuF6buR/fontsize/500/dissolve/100/gravity/SouthEast/', $imageUrlBuilder->waterText($url, $text, $font, 500));
108108
$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/', $imageProcess->waterText($url, $text, $font, 500, $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));
112112
$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/', $imageProcess->waterText($url, $text, $font, 500, $fontColor, 80));
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));
116116
$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/', $imageProcess->waterText($url, $text, $font, 500, $fontColor, 80, 'East'));
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'));
120120
$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/', $imageProcess->waterText($url, $text, $font, 500, $fontColor, 80, 'East', 10));
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));
124124
$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/', $imageProcess->waterText($url, $text, $font, 500, $fontColor, 80, 'East', 10, 10));
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));
128128
$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/', $imageProcess->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));
131131
$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)