Skip to content

Commit 51294d1

Browse files
committed
Apply fixes from StyleCI
1 parent 3142ba4 commit 51294d1

File tree

9 files changed

+297
-260
lines changed

9 files changed

+297
-260
lines changed

src/InitialAvatar.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,6 @@ protected function convertHSLtoRGB($h, $s, $l, $toHex = true)
879879
*/
880880
protected function getContrastColor($hexColor)
881881
{
882-
883882
// hexColor RGB
884883
$R1 = hexdec(substr($hexColor, 1, 2));
885884
$G1 = hexdec(substr($hexColor, 3, 2));

src/Translator/Base.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55
interface Base
66
{
77
/**
8-
* Translate words to english
8+
* Translate words to english.
99
*
1010
* @param string $words
11+
*
1112
* @return mixed
1213
*/
1314
public function translate($words);
1415

1516
/**
16-
* Get the source language of translator
17+
* Get the source language of translator.
1718
*
1819
* @return string
1920
*/
2021
public function getSourceLanguage();
21-
}
22+
}

src/Translator/En.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ public function getSourceLanguage()
1919
{
2020
return 'en';
2121
}
22-
}
22+
}

src/Translator/ZhCN.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
class ZhCN implements Base
88
{
99
/**
10-
* Inherent instance of zh-CN translator
10+
* Inherent instance of zh-CN translator.
1111
*
1212
* @var Pinyin
1313
*/
1414
protected $inherent;
1515

1616
/**
17-
* ZhCN constructor, set the instance of PinYin
17+
* ZhCN constructor, set the instance of PinYin.
1818
*/
1919
public function __construct()
2020
{
@@ -36,4 +36,4 @@ public function getSourceLanguage()
3636
{
3737
return 'zh-CN';
3838
}
39-
}
39+
}

tests/GenerateTest.php

Lines changed: 93 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -5,121 +5,134 @@
55

66
class GenerateTest extends TestCase
77
{
8-
/** @test */
9-
public function CanGenerateInitialsWithoutNameParameter() {
10-
$avatar = new InitialAvatar();
8+
/** @test */
9+
public function CanGenerateInitialsWithoutNameParameter()
10+
{
11+
$avatar = new InitialAvatar();
1112

12-
$avatar->generate( 'Lasse Rafn' );
13+
$avatar->generate('Lasse Rafn');
1314

14-
$this->assertEquals( 'LR', $avatar->getInitials() );
15-
}
15+
$this->assertEquals('LR', $avatar->getInitials());
16+
}
1617

17-
/** @test */
18-
public function returns_image_object() {
19-
$avatar = new InitialAvatar();
18+
/** @test */
19+
public function returns_image_object()
20+
{
21+
$avatar = new InitialAvatar();
2022

21-
$image = $avatar->generate();
23+
$image = $avatar->generate();
2224

23-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
24-
}
25+
$this->assertEquals('Intervention\Image\Image', get_class($image));
26+
}
2527

26-
/** @test */
27-
public function returns_image_object_with_emoji() {
28-
$avatar = new InitialAvatar();
28+
/** @test */
29+
public function returns_image_object_with_emoji()
30+
{
31+
$avatar = new InitialAvatar();
2932

30-
$image = $avatar->generate( '😅' );
33+
$image = $avatar->generate('😅');
3134

32-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
33-
}
35+
$this->assertEquals('Intervention\Image\Image', get_class($image));
36+
}
3437

35-
/** @test */
36-
public function returns_image_object_with_japanese_letters() {
37-
$avatar = new InitialAvatar();
38+
/** @test */
39+
public function returns_image_object_with_japanese_letters()
40+
{
41+
$avatar = new InitialAvatar();
3842

39-
$image = $avatar->font( __DIR__ . '/fonts/NotoSans-Regular.otf' )->generate( 'こんにちは' );
43+
$image = $avatar->font(__DIR__.'/fonts/NotoSans-Regular.otf')->generate('こんにちは');
4044

41-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
42-
}
45+
$this->assertEquals('Intervention\Image\Image', get_class($image));
46+
}
4347

44-
/** @test */
45-
public function returns_image_object_with_default_gd_wont() {
46-
$avatar = new InitialAvatar();
48+
/** @test */
49+
public function returns_image_object_with_default_gd_wont()
50+
{
51+
$avatar = new InitialAvatar();
4752

48-
$image = $avatar->font( 2 )->gd()->generate( 'LR' );
53+
$image = $avatar->font(2)->gd()->generate('LR');
4954

50-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
51-
$this->assertTrue( $image->stream()->isReadable() );
52-
}
55+
$this->assertEquals('Intervention\Image\Image', get_class($image));
56+
$this->assertTrue($image->stream()->isReadable());
57+
}
5358

54-
/** @test */
55-
public function can_use_imagick_driver() {
56-
$avatar = new InitialAvatar();
59+
/** @test */
60+
public function can_use_imagick_driver()
61+
{
62+
$avatar = new InitialAvatar();
5763

58-
$image = $avatar->imagick()->generate( 'LR' );
64+
$image = $avatar->imagick()->generate('LR');
5965

60-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
61-
$this->assertTrue( $image->stream()->isReadable() );
62-
}
66+
$this->assertEquals('Intervention\Image\Image', get_class($image));
67+
$this->assertTrue($image->stream()->isReadable());
68+
}
6369

64-
/** @test */
65-
public function can_use_gd_driver() {
66-
$avatar = new InitialAvatar();
70+
/** @test */
71+
public function can_use_gd_driver()
72+
{
73+
$avatar = new InitialAvatar();
6774

68-
$image = $avatar->gd()->generate( 'LR' );
75+
$image = $avatar->gd()->generate('LR');
6976

70-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
71-
$this->assertTrue( $image->stream()->isReadable() );
72-
}
77+
$this->assertEquals('Intervention\Image\Image', get_class($image));
78+
$this->assertTrue($image->stream()->isReadable());
79+
}
7380

74-
/** @test */
75-
public function can_make_rounded_images() {
76-
$avatar = new InitialAvatar();
81+
/** @test */
82+
public function can_make_rounded_images()
83+
{
84+
$avatar = new InitialAvatar();
7785

78-
$image = $avatar->rounded()->generate();
86+
$image = $avatar->rounded()->generate();
7987

80-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
81-
}
88+
$this->assertEquals('Intervention\Image\Image', get_class($image));
89+
}
8290

83-
/** @test */
84-
public function can_make_a_smooth_rounded_image() {
85-
$avatar = new InitialAvatar();
91+
/** @test */
92+
public function can_make_a_smooth_rounded_image()
93+
{
94+
$avatar = new InitialAvatar();
8695

87-
$image = $avatar->rounded()->smooth()->generate();
96+
$image = $avatar->rounded()->smooth()->generate();
8897

89-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
90-
}
98+
$this->assertEquals('Intervention\Image\Image', get_class($image));
99+
}
91100

92-
/** @test */
93-
public function stream_is_readable() {
94-
$avatar = new InitialAvatar();
101+
/** @test */
102+
public function stream_is_readable()
103+
{
104+
$avatar = new InitialAvatar();
95105

96-
$this->assertTrue( $avatar->generate()->stream()->isReadable() );
97-
}
106+
$this->assertTrue($avatar->generate()->stream()->isReadable());
107+
}
98108

99-
/** @test */
100-
public function can_use_local_font() {
101-
$avatar = new InitialAvatar();
109+
/** @test */
110+
public function can_use_local_font()
111+
{
112+
$avatar = new InitialAvatar();
102113

103-
$image = $avatar->font( __DIR__ . '/fonts/NotoSans-Regular.ttf' )->generate();
114+
$image = $avatar->font(__DIR__.'/fonts/NotoSans-Regular.ttf')->generate();
104115

105-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
106-
}
116+
$this->assertEquals('Intervention\Image\Image', get_class($image));
117+
}
107118

108-
/** @test */
109-
public function has_a_font_fallback() {
110-
$avatar = new InitialAvatar();
119+
/** @test */
120+
public function has_a_font_fallback()
121+
{
122+
$avatar = new InitialAvatar();
111123

112-
$image = $avatar->font( 'no-font' )->generate();
124+
$image = $avatar->font('no-font')->generate();
113125

114-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
115-
}
126+
$this->assertEquals('Intervention\Image\Image', get_class($image));
127+
}
116128

117-
/** @test */
118-
public function can_handle_fonts_without_slash_first() {
119-
$avatar = new InitialAvatar();
129+
/** @test */
130+
public function can_handle_fonts_without_slash_first()
131+
{
132+
$avatar = new InitialAvatar();
120133

121-
$image = $avatar->font( 'fonts/NotoSans-Regular.ttf' )->generate();
134+
$image = $avatar->font('fonts/NotoSans-Regular.ttf')->generate();
122135

123-
$this->assertEquals( 'Intervention\Image\Image', get_class( $image ) );
124-
}
136+
$this->assertEquals('Intervention\Image\Image', get_class($image));
137+
}
125138
}

tests/ImageSizeTest.php

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,25 @@
55

66
class ImageSizeTest extends TestCase
77
{
8-
/** @test */
9-
public function can_set_image_size_to_50_pixels() {
10-
$avatar = new InitialAvatar();
8+
/** @test */
9+
public function can_set_image_size_to_50_pixels()
10+
{
11+
$avatar = new InitialAvatar();
1112

12-
$avatar->size( 50 );
13+
$avatar->size(50);
1314

14-
$this->assertEquals( 50, $avatar->generate()->getWidth() );
15-
$this->assertEquals( 50, $avatar->generate()->getHeight() );
16-
}
15+
$this->assertEquals(50, $avatar->generate()->getWidth());
16+
$this->assertEquals(50, $avatar->generate()->getHeight());
17+
}
1718

18-
/** @test */
19-
public function can_set_image_size_to_100_pixels() {
20-
$avatar = new InitialAvatar();
19+
/** @test */
20+
public function can_set_image_size_to_100_pixels()
21+
{
22+
$avatar = new InitialAvatar();
2123

22-
$avatar->size( 100 );
24+
$avatar->size(100);
2325

24-
$this->assertEquals( 100, $avatar->generate()->getWidth() );
25-
$this->assertEquals( 100, $avatar->generate()->getHeight() );
26-
}
26+
$this->assertEquals(100, $avatar->generate()->getWidth());
27+
$this->assertEquals(100, $avatar->generate()->getHeight());
28+
}
2729
}

0 commit comments

Comments
 (0)