Skip to content

Commit 1a6d6ec

Browse files
author
Karel Wintersky
committed
1.0.0
- переходим на нэймспейс `AJUR\Toolkit`
1 parent 25c0f0f commit 1a6d6ec

7 files changed

+33
-33
lines changed

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
},
2929
"autoload": {
3030
"psr-4": {
31-
"Gumlet\\": "lib/"
31+
"AJUR\\Toolkit\\": "src/"
3232
}
3333
},
3434
"autoload-dev": {
3535
"psr-4": {
36-
"Gumlet\\": "test/"
36+
"AJUR\\Toolkit\\": "tests/"
3737
}
3838
},
3939
"require-dev": {

‎makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ setup_env: ##@localhost Setup environment at localhost
1111
@echo Setting up local environment
1212
@composer install
1313

14-
phpunit: ##@localhost Make tests
14+
test: ##@localhost Make tests
1515
@./vendor/bin/phpunit
1616

1717
# ------------------------------------------------

‎lib/ImageResize.php ‎src/ImageResize.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Gumlet;
3+
namespace AJUR\Toolkit;
44

55
use Exception;
66

‎lib/ImageResizeException.php ‎src/ImageResizeException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Gumlet;
3+
namespace AJUR\Toolkit;
44

55
/**
66
* PHP Exception used in the ImageResize class

‎lib/ImageResizeInterface.php ‎src/ImageResizeInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Gumlet;
3+
namespace AJUR\Toolkit;
44

55
interface ImageResizeInterface
66
{

‎tests/ImageResizeExceptionTest.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22

3-
use \Gumlet\ImageResize;
4-
use \Gumlet\ImageResizeException;
3+
use AJUR\Toolkit\ImageResizeException;
54
use \PHPUnit\Framework\TestCase;
65

76
class ImageResizeExceptionTest extends TestCase
@@ -11,15 +10,15 @@ public function testExceptionEmpty()
1110
$e = new ImageResizeException();
1211

1312
$this->assertEquals("", $e->getMessage());
14-
$this->assertInstanceOf('\Gumlet\ImageResizeException', $e);
13+
$this->assertInstanceOf('AJUR\Toolkit\ImageResizeException', $e);
1514
}
1615

1716
public function testExceptionMessage()
1817
{
1918
$e = new ImageResizeException("General error");
2019

2120
$this->assertEquals("General error", $e->getMessage());
22-
$this->assertInstanceOf('\Gumlet\ImageResizeException', $e);
21+
$this->assertInstanceOf('AJUR\Toolkit\ImageResizeException', $e);
2322
}
2423

2524
public function testExceptionExtending()
@@ -35,7 +34,7 @@ public function testExceptionThrown()
3534
throw new ImageResizeException("General error");
3635
} catch (\Exception $e) {
3736
$this->assertEquals("General error", $e->getMessage());
38-
$this->assertInstanceOf('\Gumlet\ImageResizeException', $e);
37+
$this->assertInstanceOf('AJUR\Toolkit\ImageResizeException', $e);
3938
return;
4039
}
4140
$this->fail();

‎tests/ImageResizeTest.php

+23-22
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22

3-
use \Gumlet\ImageResize;
4-
use \Gumlet\ImageResizeException;
3+
4+
use AJUR\Toolkit\ImageResize;
5+
use AJUR\Toolkit\ImageResizeException;
56
use \PHPUnit\Framework\TestCase;
67

78
class ImageResizeTest extends TestCase
@@ -28,7 +29,7 @@ public function testLoadGif()
2829
$resize = new ImageResize($image);
2930

3031
$this->assertEquals(IMAGETYPE_GIF, $resize->source_type);
31-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize);
32+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize);
3233
}
3334

3435
public function testLoadJpg()
@@ -37,7 +38,7 @@ public function testLoadJpg()
3738
$resize = new ImageResize($image);
3839

3940
$this->assertEquals(IMAGETYPE_JPEG, $resize->source_type);
40-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize);
41+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize);
4142
}
4243

4344
public function testLoadIgnoreXmpExifJpg()
@@ -46,7 +47,7 @@ public function testLoadIgnoreXmpExifJpg()
4647
$resize = new ImageResize($image);
4748

4849
$this->assertEquals(IMAGETYPE_JPEG, $resize->source_type);
49-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize);
50+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize);
5051
}
5152

5253
public function testLoadPng()
@@ -55,7 +56,7 @@ public function testLoadPng()
5556
$resize = new ImageResize($image);
5657

5758
$this->assertEquals(IMAGETYPE_PNG, $resize->source_type);
58-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize);
59+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize);
5960
}
6061

6162
public function testLoadWebp()
@@ -64,23 +65,23 @@ public function testLoadWebp()
6465
$resize = new ImageResize($image);
6566

6667
$this->assertEquals(IMAGETYPE_WEBP, $resize->source_type);
67-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize);
68+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize);
6869
}
6970

7071
public function testLoadString()
7172
{
7273
$resize = ImageResize::createFromString(base64_decode($this->image_string));
7374

7475
$this->assertEquals(IMAGETYPE_GIF, $resize->source_type);
75-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize);
76+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize);
7677
}
7778

7879
public function testLoadRfc2397()
7980
{
8081
$resize = new ImageResize($this->data_url);
8182

8283
$this->assertEquals(IMAGETYPE_GIF, $resize->source_type);
83-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize);
84+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize);
8485
}
8586

8687
public function testAddFilter()
@@ -89,7 +90,7 @@ public function testAddFilter()
8990
$resize = new ImageResize($image);
9091
$filename = $this->getTempFile();
9192

92-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize->addFilter('imagefilter'));
93+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize->addFilter('imagefilter'));
9394
}
9495

9596
public function testApplyFilter()
@@ -99,7 +100,7 @@ public function testApplyFilter()
99100
$resize->addFilter('imagefilter');
100101
$filename = $this->getTempFile();
101102

102-
$this->assertInstanceOf('\Gumlet\ImageResize', $resize->save($filename));
103+
$this->assertInstanceOf('\AJUR\Toolkit\ImageResize', $resize->save($filename));
103104
}
104105

105106
/**
@@ -109,29 +110,29 @@ public function testApplyFilter()
109110
public function testLoadNoFile()
110111
{
111112
$this->expectExceptionMessage("No filename given");
112-
$this->expectException(\Gumlet\ImageResizeException::class);
113+
$this->expectException(ImageResizeException::class);
113114
new ImageResize(null);
114115
}
115116

116117
public function testLoadUnsupportedFile()
117118
{
118-
$this->expectExceptionMessage("Gumlet\ImageResize ERROR: Could not read file");
119-
$this->expectException(\Gumlet\ImageResizeException::class);
119+
$this->expectExceptionMessage("AJUR\Toolkit\ImageResize ERROR: Could not read file");
120+
$this->expectException(ImageResizeException::class);
120121
new ImageResize(__FILE__);
121122
}
122123

123124
public function testLoadUnsupportedFileString()
124125
{
125126
$this->expectExceptionMessage("image_data must not be empty");
126-
$this->expectException(\Gumlet\ImageResizeException::class);
127+
$this->expectException(ImageResizeException::class);
127128
ImageResize::createFromString('');
128129
}
129130

130131
/*public function testLoadUnsupportedImage()
131132
{
132133
// хер его знает почему не работает тест...
133-
// $this->expectExceptionMessage("Gumlet\ImageResize ERROR: Unsupported image type");
134-
// $this->expectException(\Gumlet\ImageResizeException::class);
134+
$this->expectExceptionMessage("AJUR\Toolkit\ImageResize ERROR: Unsupported image type");
135+
$this->expectException(\AJUR\Toolkit\ImageResizeException::class);
135136
$filename = $this->getTempFile();
136137
137138
$image = fopen($filename, 'w');
@@ -143,8 +144,8 @@ public function testLoadUnsupportedFileString()
143144

144145
/*public function testInvalidString()
145146
{
146-
$this->expectExceptionMessage("Gumlet\ImageResize ERROR: Unsupported image type");
147-
$this->expectException(\Gumlet\ImageResizeException::class);
147+
$this->expectExceptionMessage("AJUR\Toolkit\ImageResize ERROR: Unsupported image type");
148+
$this->expectException(\AJUR\Toolkit\ImageResizeException::class);
148149
ImageResize::createFromString(base64_decode($this->unsupported_image));
149150
}*/
150151

@@ -317,23 +318,23 @@ public function testCropPosition()
317318

318319
$resize->crop(50, 50, false, $resize::CROPRIGHT);
319320

320-
$reflection_class = new ReflectionClass('\Gumlet\ImageResize');
321+
$reflection_class = new ReflectionClass('\AJUR\Toolkit\ImageResize');
321322
$source_x = $reflection_class->getProperty('source_x');
322323
$source_x->setAccessible(true);
323324

324325
$this->assertEquals(100, $source_x->getValue($resize));
325326

326327
$resize->crop(50, 50, false, $resize::CROPCENTRE);
327328

328-
$reflection_class = new ReflectionClass('\Gumlet\ImageResize');
329+
$reflection_class = new ReflectionClass('\AJUR\Toolkit\ImageResize');
329330
$source_x = $reflection_class->getProperty('source_x');
330331
$source_x->setAccessible(true);
331332

332333
$this->assertEquals(50, $source_x->getValue($resize));
333334

334335
$resize->crop(50, 50, false, $resize::CROPTOPCENTER);
335336

336-
$reflection_class = new ReflectionClass('\Gumlet\ImageResize');
337+
$reflection_class = new ReflectionClass('\AJUR\Toolkit\ImageResize');
337338
$source_x = $reflection_class->getProperty('source_x');
338339
$source_x->setAccessible(true);
339340

0 commit comments

Comments
 (0)