Skip to content

Commit bfa4770

Browse files
AydinHassanAydinHassan
authored
Merge pull request #118 from php-school/phpunit-self
Use self:: instead of static::
2 parents 6922fc0 + ec27c77 commit bfa4770

File tree

2 files changed

+99
-99
lines changed

2 files changed

+99
-99
lines changed

‎test/CliMenuTest.php

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ public function setUp()
5050
public function testGetMenuStyle() : void
5151
{
5252
$menu = new CliMenu('PHP School FTW', []);
53-
static::assertInstanceOf(MenuStyle::class, $menu->getStyle());
53+
self::assertInstanceOf(MenuStyle::class, $menu->getStyle());
5454

5555
$style = new MenuStyle();
5656
$menu = new CliMenu('PHP School FTW', [], null, $style);
57-
static::assertSame($style, $menu->getStyle());
57+
self::assertSame($style, $menu->getStyle());
5858
}
5959

6060
public function testReDrawThrowsExceptionIfMenuNotOpen() : void
@@ -81,7 +81,7 @@ public function testSimpleOpenClose() : void
8181
$menu = new CliMenu('PHP School FTW', [$item], $this->terminal, $style);
8282
$menu->open();
8383

84-
static::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
84+
self::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
8585
}
8686

8787
public function testSimpleOpenCloseWithBorders() : void
@@ -100,7 +100,7 @@ public function testSimpleOpenCloseWithBorders() : void
100100
$menu = new CliMenu('PHP School FTW', [$item], $this->terminal, $style);
101101
$menu->open();
102102

103-
static::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
103+
self::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
104104
}
105105

106106
public function testSimpleOpenCloseWithLeftAndRightBorders() : void
@@ -121,7 +121,7 @@ public function testSimpleOpenCloseWithLeftAndRightBorders() : void
121121
$menu = new CliMenu('PHP School FTW', [$item], $this->terminal, $style);
122122
$menu->open();
123123

124-
static::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
124+
self::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
125125
}
126126

127127
public function testSimpleOpenCloseWithMarginAutoAndBorders() : void
@@ -142,7 +142,7 @@ public function testSimpleOpenCloseWithMarginAutoAndBorders() : void
142142
$menu = new CliMenu('PHP School FTW', [$item], $this->terminal, $style);
143143
$menu->open();
144144

145-
static::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
145+
self::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
146146
}
147147

148148
public function testReDrawReDrawsImmediately() : void
@@ -162,7 +162,7 @@ public function testReDrawReDrawsImmediately() : void
162162
$menu = new CliMenu('PHP School FTW', [$item], $this->terminal, $style);
163163
$menu->open();
164164

165-
static::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
165+
self::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
166166
}
167167

168168
public function testGetItems() : void
@@ -184,7 +184,7 @@ public function testGetItems() : void
184184
$style
185185
);
186186

187-
static::assertSame([$item1, $item2], $menu->getItems());
187+
self::assertSame([$item1, $item2], $menu->getItems());
188188
}
189189

190190
public function testRemoveItem() : void
@@ -205,12 +205,12 @@ public function testRemoveItem() : void
205205
$style
206206
);
207207

208-
static::assertEquals([$item1, $item2], $menu->getItems());
208+
self::assertEquals([$item1, $item2], $menu->getItems());
209209

210210
$menu->removeItem($item1);
211211

212-
static::assertCount(1, $menu->getItems());
213-
static::assertContains($item2, $menu->getItems());
212+
self::assertCount(1, $menu->getItems());
213+
self::assertContains($item2, $menu->getItems());
214214
}
215215

216216
public function testRemoveItemThrowsExceptionWhenItemDoesntExistInMenu() : void
@@ -255,7 +255,7 @@ public function testThrowsExceptionIfTerminalIsNotValidTTY() : void
255255
public function testGetTerminal() : void
256256
{
257257
$menu = new CliMenu('PHP School FTW', []);
258-
static::assertInstanceOf(UnixTerminal::class, $menu->getTerminal());
258+
self::assertInstanceOf(UnixTerminal::class, $menu->getTerminal());
259259
}
260260

261261
public function testAddItem() : void
@@ -328,7 +328,7 @@ public function testAskNumberThrowsExceptionIfMenuNotOpen() : void
328328
{
329329
$menu = new CliMenu('PHP School FTW', []);
330330

331-
static::expectException(MenuNotOpenException::class);
331+
self::expectException(MenuNotOpenException::class);
332332

333333
$menu->askNumber();
334334
}
@@ -358,15 +358,15 @@ public function testAskNumberStyle() : void
358358
}));
359359
$menu->open();
360360

361-
static::assertEquals('yellow', $number->getStyle()->getBg());
362-
static::assertEquals('red', $number->getStyle()->getFg());
361+
self::assertEquals('yellow', $number->getStyle()->getBg());
362+
self::assertEquals('red', $number->getStyle()->getFg());
363363
}
364364

365365
public function testAskTextThrowsExceptionIfMenuNotOpen() : void
366366
{
367367
$menu = new CliMenu('PHP School FTW', []);
368368

369-
static::expectException(MenuNotOpenException::class);
369+
self::expectException(MenuNotOpenException::class);
370370

371371
$menu->askText();
372372
}
@@ -396,15 +396,15 @@ public function testAskTextStyle() : void
396396
}));
397397
$menu->open();
398398

399-
static::assertEquals('yellow', $text->getStyle()->getBg());
400-
static::assertEquals('red', $text->getStyle()->getFg());
399+
self::assertEquals('yellow', $text->getStyle()->getBg());
400+
self::assertEquals('red', $text->getStyle()->getFg());
401401
}
402402

403403
public function testAskPasswordThrowsExceptionIfMenuNotOpen() : void
404404
{
405405
$menu = new CliMenu('PHP School FTW', []);
406406

407-
static::expectException(MenuNotOpenException::class);
407+
self::expectException(MenuNotOpenException::class);
408408

409409
$menu->askPassword();
410410
}
@@ -434,8 +434,8 @@ public function testAskPasswordStyle() : void
434434
}));
435435
$menu->open();
436436

437-
static::assertEquals('yellow', $password->getStyle()->getBg());
438-
static::assertEquals('red', $password->getStyle()->getFg());
437+
self::assertEquals('yellow', $password->getStyle()->getBg());
438+
self::assertEquals('red', $password->getStyle()->getFg());
439439
}
440440

441441
public function testAddCustomControlMappingThrowsExceptionWhenOverwritingExistingDefaultControls() : void
@@ -477,7 +477,7 @@ public function testAddCustomControlMapping() : void
477477
$menu->addCustomControlMapping('c', $action);
478478
$menu->open();
479479

480-
static::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
480+
self::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
481481
}
482482

483483
public function testAddCustomControlMappingsThrowsExceptionWhenOverwritingExistingDefaultControls() : void
@@ -528,10 +528,10 @@ public function testAddCustomControlMappings() : void
528528
]);
529529

530530
$menu->open();
531-
static::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
531+
self::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
532532

533533
$menu->open();
534-
static::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
534+
self::assertStringEqualsFile($this->getTestFile(), $this->output->fetch());
535535
}
536536

537537
public function testRemoveCustomControlMappingThrowsExceptionIfNoSuchMappingExists() : void

‎test/MenuStyleTest.php

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ private function getMockTerminal(int $colours = 8) : MockObject
4747
->getMock();
4848

4949
$terminal
50-
->expects(static::any())
50+
->expects(self::any())
5151
->method('getWidth')
52-
->will(static::returnValue(500));
52+
->will(self::returnValue(500));
5353

5454
$terminal
55-
->expects(static::any())
55+
->expects(self::any())
5656
->method('getColourSupport')
57-
->will(static::returnValue($colours));
57+
->will(self::returnValue($colours));
5858

5959
return $terminal;
6060
}
@@ -65,54 +65,54 @@ public function testMenuStyleCanBeInstantiatedByCliMenuBuilder() : void
6565
$menu = $builder->build();
6666

6767
$reflectionMenu = new \ReflectionObject($menu);
68-
static::assertTrue($reflectionMenu->hasProperty('style'));
68+
self::assertTrue($reflectionMenu->hasProperty('style'));
6969

7070
$styleProperty = $reflectionMenu->getProperty('style');
7171
$styleProperty->setAccessible(true);
7272
$style = $styleProperty->getValue($menu);
7373

74-
static::assertSame(MenuStyle::class, get_class($style));
74+
self::assertSame(MenuStyle::class, get_class($style));
7575
}
7676

7777
public function testGetColoursSetCode() : void
7878
{
79-
static::assertSame("\e[37;44m", $this->getMenuStyle()->getColoursSetCode());
79+
self::assertSame("\e[37;44m", $this->getMenuStyle()->getColoursSetCode());
8080
}
8181

8282
public function testGetColoursResetCode() : void
8383
{
84-
static::assertSame("\e[0m", $this->getMenuStyle()->getColoursResetCode());
84+
self::assertSame("\e[0m", $this->getMenuStyle()->getColoursResetCode());
8585
}
8686

8787
public function testGetInvertedColoursSetCode() : void
8888
{
89-
static::assertSame("\e[7m", $this->getMenuStyle()->getInvertedColoursSetCode());
89+
self::assertSame("\e[7m", $this->getMenuStyle()->getInvertedColoursSetCode());
9090
}
9191

9292
public function testGetInvertedColoursUnsetCode() : void
9393
{
94-
static::assertSame("\e[27m", $this->getMenuStyle()->getInvertedColoursUnsetCode());
94+
self::assertSame("\e[27m", $this->getMenuStyle()->getInvertedColoursUnsetCode());
9595
}
9696

9797
public function testGetterAndSetters() : void
9898
{
9999
$style = $this->getMenuStyle();
100100

101-
static::assertSame('blue', $style->getBg());
102-
static::assertSame('white', $style->getFg());
103-
static::assertSame('○', $style->getUnselectedMarker());
104-
static::assertSame('●', $style->getSelectedMarker());
105-
static::assertSame('✔', $style->getItemExtra());
106-
static::assertFalse($style->getDisplaysExtra());
107-
static::assertSame('=', $style->getTitleSeparator());
108-
static::assertSame(100, $style->getWidth());
109-
static::assertSame(2, $style->getMargin());
110-
static::assertSame(2, $style->getPadding());
111-
static::assertSame(0, $style->getBorderTopWidth());
112-
static::assertSame(0, $style->getBorderRightWidth());
113-
static::assertSame(0, $style->getBorderBottomWidth());
114-
static::assertSame(0, $style->getBorderLeftWidth());
115-
static::assertSame('white', $style->getBorderColour());
101+
self::assertSame('blue', $style->getBg());
102+
self::assertSame('white', $style->getFg());
103+
self::assertSame('○', $style->getUnselectedMarker());
104+
self::assertSame('●', $style->getSelectedMarker());
105+
self::assertSame('✔', $style->getItemExtra());
106+
self::assertFalse($style->getDisplaysExtra());
107+
self::assertSame('=', $style->getTitleSeparator());
108+
self::assertSame(100, $style->getWidth());
109+
self::assertSame(2, $style->getMargin());
110+
self::assertSame(2, $style->getPadding());
111+
self::assertSame(0, $style->getBorderTopWidth());
112+
self::assertSame(0, $style->getBorderRightWidth());
113+
self::assertSame(0, $style->getBorderBottomWidth());
114+
self::assertSame(0, $style->getBorderLeftWidth());
115+
self::assertSame('white', $style->getBorderColour());
116116

117117
$style->setBg('red');
118118
$style->setFg('yellow');
@@ -130,80 +130,80 @@ public function testGetterAndSetters() : void
130130
$style->setBorderLeftWidth(4);
131131
$style->setBorderColour('green');
132132

133-
static::assertSame('red', $style->getBg());
134-
static::assertSame('yellow', $style->getFg());
135-
static::assertSame('-', $style->getUnselectedMarker());
136-
static::assertSame('>', $style->getSelectedMarker());
137-
static::assertSame('EXTRA!', $style->getItemExtra());
138-
static::assertTrue($style->getDisplaysExtra());
139-
static::assertSame('+', $style->getTitleSeparator());
140-
static::assertSame(200, $style->getWidth());
141-
static::assertSame(10, $style->getMargin());
142-
static::assertSame(10, $style->getPadding());
143-
static::assertSame(1, $style->getBorderTopWidth());
144-
static::assertSame(2, $style->getBorderRightWidth());
145-
static::assertSame(3, $style->getBorderBottomWidth());
146-
static::assertSame(4, $style->getBorderLeftWidth());
147-
static::assertSame('green', $style->getBorderColour());
133+
self::assertSame('red', $style->getBg());
134+
self::assertSame('yellow', $style->getFg());
135+
self::assertSame('-', $style->getUnselectedMarker());
136+
self::assertSame('>', $style->getSelectedMarker());
137+
self::assertSame('EXTRA!', $style->getItemExtra());
138+
self::assertTrue($style->getDisplaysExtra());
139+
self::assertSame('+', $style->getTitleSeparator());
140+
self::assertSame(200, $style->getWidth());
141+
self::assertSame(10, $style->getMargin());
142+
self::assertSame(10, $style->getPadding());
143+
self::assertSame(1, $style->getBorderTopWidth());
144+
self::assertSame(2, $style->getBorderRightWidth());
145+
self::assertSame(3, $style->getBorderBottomWidth());
146+
self::assertSame(4, $style->getBorderLeftWidth());
147+
self::assertSame('green', $style->getBorderColour());
148148
}
149149

150150
public function testSetBorderShorthandFunction() : void
151151
{
152152
$style = $this->getMenuStyle();
153153
$style->setBorder(3);
154-
static::assertSame(3, $style->getBorderTopWidth());
155-
static::assertSame(3, $style->getBorderRightWidth());
156-
static::assertSame(3, $style->getBorderBottomWidth());
157-
static::assertSame(3, $style->getBorderLeftWidth());
158-
static::assertSame('white', $style->getBorderColour());
154+
self::assertSame(3, $style->getBorderTopWidth());
155+
self::assertSame(3, $style->getBorderRightWidth());
156+
self::assertSame(3, $style->getBorderBottomWidth());
157+
self::assertSame(3, $style->getBorderLeftWidth());
158+
self::assertSame('white', $style->getBorderColour());
159159

160160
$style = $this->getMenuStyle();
161161
$style->setBorder(3, 4);
162-
static::assertSame(3, $style->getBorderTopWidth());
163-
static::assertSame(4, $style->getBorderRightWidth());
164-
static::assertSame(3, $style->getBorderBottomWidth());
165-
static::assertSame(4, $style->getBorderLeftWidth());
166-
static::assertSame('white', $style->getBorderColour());
162+
self::assertSame(3, $style->getBorderTopWidth());
163+
self::assertSame(4, $style->getBorderRightWidth());
164+
self::assertSame(3, $style->getBorderBottomWidth());
165+
self::assertSame(4, $style->getBorderLeftWidth());
166+
self::assertSame('white', $style->getBorderColour());
167167

168168
$style = $this->getMenuStyle();
169169
$style->setBorder(3, 4, 5);
170-
static::assertSame(3, $style->getBorderTopWidth());
171-
static::assertSame(4, $style->getBorderRightWidth());
172-
static::assertSame(5, $style->getBorderBottomWidth());
173-
static::assertSame(4, $style->getBorderLeftWidth());
174-
static::assertSame('white', $style->getBorderColour());
170+
self::assertSame(3, $style->getBorderTopWidth());
171+
self::assertSame(4, $style->getBorderRightWidth());
172+
self::assertSame(5, $style->getBorderBottomWidth());
173+
self::assertSame(4, $style->getBorderLeftWidth());
174+
self::assertSame('white', $style->getBorderColour());
175175

176176
$style = $this->getMenuStyle();
177177
$style->setBorder(3, 4, 5, 6);
178-
static::assertSame(3, $style->getBorderTopWidth());
179-
static::assertSame(4, $style->getBorderRightWidth());
180-
static::assertSame(5, $style->getBorderBottomWidth());
181-
static::assertSame(6, $style->getBorderLeftWidth());
182-
static::assertSame('white', $style->getBorderColour());
178+
self::assertSame(3, $style->getBorderTopWidth());
179+
self::assertSame(4, $style->getBorderRightWidth());
180+
self::assertSame(5, $style->getBorderBottomWidth());
181+
self::assertSame(6, $style->getBorderLeftWidth());
182+
self::assertSame('white', $style->getBorderColour());
183183

184184
$style = $this->getMenuStyle();
185185
$style->setBorder(3, 4, 5, 6, 'red');
186-
static::assertSame(3, $style->getBorderTopWidth());
187-
static::assertSame(4, $style->getBorderRightWidth());
188-
static::assertSame(5, $style->getBorderBottomWidth());
189-
static::assertSame(6, $style->getBorderLeftWidth());
190-
static::assertSame('red', $style->getBorderColour());
186+
self::assertSame(3, $style->getBorderTopWidth());
187+
self::assertSame(4, $style->getBorderRightWidth());
188+
self::assertSame(5, $style->getBorderBottomWidth());
189+
self::assertSame(6, $style->getBorderLeftWidth());
190+
self::assertSame('red', $style->getBorderColour());
191191

192192
$style = $this->getMenuStyle();
193193
$style->setBorder(3, 4, 5, 'red');
194-
static::assertSame(3, $style->getBorderTopWidth());
195-
static::assertSame(4, $style->getBorderRightWidth());
196-
static::assertSame(5, $style->getBorderBottomWidth());
197-
static::assertSame(4, $style->getBorderLeftWidth());
198-
static::assertSame('red', $style->getBorderColour());
194+
self::assertSame(3, $style->getBorderTopWidth());
195+
self::assertSame(4, $style->getBorderRightWidth());
196+
self::assertSame(5, $style->getBorderBottomWidth());
197+
self::assertSame(4, $style->getBorderLeftWidth());
198+
self::assertSame('red', $style->getBorderColour());
199199

200200
$style = $this->getMenuStyle();
201201
$style->setBorder(3, 4, 'red');
202-
static::assertSame(3, $style->getBorderTopWidth());
203-
static::assertSame(4, $style->getBorderRightWidth());
204-
static::assertSame(3, $style->getBorderBottomWidth());
205-
static::assertSame(4, $style->getBorderLeftWidth());
206-
static::assertSame('red', $style->getBorderColour());
202+
self::assertSame(3, $style->getBorderTopWidth());
203+
self::assertSame(4, $style->getBorderRightWidth());
204+
self::assertSame(3, $style->getBorderBottomWidth());
205+
self::assertSame(4, $style->getBorderLeftWidth());
206+
self::assertSame('red', $style->getBorderColour());
207207

208208
$style = $this->getMenuStyle();
209209
$style->setBorder(3, 'red');

0 commit comments

Comments
 (0)