Skip to content

Commit 2f3dbdb

Browse files
oliverkleeoliverklee
authored
[BUGFIX] Avoid using setUp() in testcases (#683)
If we want to work both with PHPUnit 5.x and 8.x, we cannot use PHPUnit's `setUp()` method: This method would need to have a `: void` return type declaration for PHPUnit 8.x, which is not possible with PHP 5.6 (the lowest version we support).
1 parent 223a09f commit 2f3dbdb

File tree

3 files changed

+59
-3
lines changed

3 files changed

+59
-3
lines changed

‎tests/CSSList/DocumentTest.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class DocumentTest extends TestCase
1818
*/
1919
private $subject;
2020

21-
protected function setUp()
21+
private function setUpTestcase()
2222
{
2323
$this->subject = new Document();
2424
}
@@ -28,6 +28,8 @@ protected function setUp()
2828
*/
2929
public function implementsRenderable()
3030
{
31+
$this->setUpTestcase();
32+
3133
self::assertInstanceOf(Renderable::class, $this->subject);
3234
}
3335

@@ -36,6 +38,8 @@ public function implementsRenderable()
3638
*/
3739
public function implementsCommentable()
3840
{
41+
$this->setUpTestcase();
42+
3943
self::assertInstanceOf(Commentable::class, $this->subject);
4044
}
4145

@@ -44,6 +48,8 @@ public function implementsCommentable()
4448
*/
4549
public function getContentsInitiallyReturnsEmptyArray()
4650
{
51+
$this->setUpTestcase();
52+
4753
self::assertSame([], $this->subject->getContents());
4854
}
4955

@@ -68,6 +74,8 @@ public static function contentsDataProvider()
6874
*/
6975
public function setContentsSetsContents(array $contents)
7076
{
77+
$this->setUpTestcase();
78+
7179
$this->subject->setContents($contents);
7280

7381
self::assertSame($contents, $this->subject->getContents());
@@ -78,6 +86,8 @@ public function setContentsSetsContents(array $contents)
7886
*/
7987
public function setContentsReplacesContentsSetInPreviousCall()
8088
{
89+
$this->setUpTestcase();
90+
8191
$contents2 = [new DeclarationBlock()];
8292

8393
$this->subject->setContents([new DeclarationBlock()]);
@@ -91,6 +101,8 @@ public function setContentsReplacesContentsSetInPreviousCall()
91101
*/
92102
public function insertContentBeforeInsertsContentBeforeSibbling()
93103
{
104+
$this->setUpTestcase();
105+
94106
$bogusOne = new DeclarationBlock();
95107
$bogusOne->setSelectors('.bogus-one');
96108
$bogusTwo = new DeclarationBlock();
@@ -117,6 +129,8 @@ public function insertContentBeforeInsertsContentBeforeSibbling()
117129
*/
118130
public function insertContentBeforeAppendsIfSibblingNotFound()
119131
{
132+
$this->setUpTestcase();
133+
120134
$bogusOne = new DeclarationBlock();
121135
$bogusOne->setSelectors('.bogus-one');
122136
$bogusTwo = new DeclarationBlock();

‎tests/CSSList/KeyFrameTest.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class KeyFrameTest extends TestCase
1818
*/
1919
protected $subject;
2020

21-
protected function setUp()
21+
private function setUpTestcase()
2222
{
2323
$this->subject = new KeyFrame();
2424
}
@@ -28,6 +28,8 @@ protected function setUp()
2828
*/
2929
public function implementsAtRule()
3030
{
31+
$this->setUpTestcase();
32+
3133
self::assertInstanceOf(AtRule::class, $this->subject);
3234
}
3335

@@ -36,6 +38,8 @@ public function implementsAtRule()
3638
*/
3739
public function implementsRenderable()
3840
{
41+
$this->setUpTestcase();
42+
3943
self::assertInstanceOf(Renderable::class, $this->subject);
4044
}
4145

@@ -44,6 +48,8 @@ public function implementsRenderable()
4448
*/
4549
public function implementsCommentable()
4650
{
51+
$this->setUpTestcase();
52+
4753
self::assertInstanceOf(Commentable::class, $this->subject);
4854
}
4955
}

‎tests/OutputFormatTest.php

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ final class OutputFormatTest extends TestCase
4343
*/
4444
private $oDocument;
4545

46-
protected function setUp()
46+
private function setUpTestcase()
4747
{
4848
$this->oParser = new Parser(self::TEST_CSS);
4949
$this->oDocument = $this->oParser->parse();
@@ -54,6 +54,8 @@ protected function setUp()
5454
*/
5555
public function plain()
5656
{
57+
$this->setUpTestcase();
58+
5759
self::assertSame(
5860
'.main, .test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}
5961
@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}',
@@ -66,6 +68,8 @@ public function plain()
6668
*/
6769
public function compact()
6870
{
71+
$this->setUpTestcase();
72+
6973
self::assertSame(
7074
'.main,.test{font:italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background:white;}'
7175
. '@media screen{.main{background-size:100% 100%;font-size:1.3em;background-color:#fff;}}',
@@ -78,6 +82,8 @@ public function compact()
7882
*/
7983
public function pretty()
8084
{
85+
$this->setUpTestcase();
86+
8187
self::assertSame(self::TEST_CSS, $this->oDocument->render(OutputFormat::createPretty()));
8288
}
8389

@@ -86,6 +92,8 @@ public function pretty()
8692
*/
8793
public function spaceAfterListArgumentSeparator()
8894
{
95+
$this->setUpTestcase();
96+
8997
self::assertSame(
9098
'.main, .test {font: italic normal bold 16px/ 1.2 '
9199
. '"Helvetica", Verdana, sans-serif;background: white;}'
@@ -99,6 +107,8 @@ public function spaceAfterListArgumentSeparator()
99107
*/
100108
public function spaceAfterListArgumentSeparatorComplex()
101109
{
110+
$this->setUpTestcase();
111+
102112
self::assertSame(
103113
'.main, .test {font: italic normal bold 16px/1.2 "Helvetica", Verdana, sans-serif;background: white;}'
104114
. "\n@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}",
@@ -116,6 +126,8 @@ public function spaceAfterListArgumentSeparatorComplex()
116126
*/
117127
public function spaceAfterSelectorSeparator()
118128
{
129+
$this->setUpTestcase();
130+
119131
self::assertSame(
120132
'.main,
121133
.test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}
@@ -129,6 +141,8 @@ public function spaceAfterSelectorSeparator()
129141
*/
130142
public function stringQuotingType()
131143
{
144+
$this->setUpTestcase();
145+
132146
self::assertSame(
133147
'.main, .test {font: italic normal bold 16px/1.2 \'Helvetica\',Verdana,sans-serif;background: white;}
134148
@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}',
@@ -141,6 +155,8 @@ public function stringQuotingType()
141155
*/
142156
public function rGBHashNotation()
143157
{
158+
$this->setUpTestcase();
159+
144160
self::assertSame(
145161
'.main, .test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}
146162
@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: rgb(255,255,255);}}',
@@ -153,6 +169,8 @@ public function rGBHashNotation()
153169
*/
154170
public function semicolonAfterLastRule()
155171
{
172+
$this->setUpTestcase();
173+
156174
self::assertSame(
157175
'.main, .test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white}
158176
@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff}}',
@@ -165,6 +183,8 @@ public function semicolonAfterLastRule()
165183
*/
166184
public function spaceAfterRuleName()
167185
{
186+
$this->setUpTestcase();
187+
168188
self::assertSame(
169189
'.main, .test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}
170190
@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}',
@@ -177,6 +197,8 @@ public function spaceAfterRuleName()
177197
*/
178198
public function spaceRules()
179199
{
200+
$this->setUpTestcase();
201+
180202
self::assertSame('.main, .test {
181203
font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;
182204
background: white;
@@ -193,6 +215,8 @@ public function spaceRules()
193215
*/
194216
public function spaceBlocks()
195217
{
218+
$this->setUpTestcase();
219+
196220
self::assertSame('
197221
.main, .test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}
198222
@media screen {
@@ -206,6 +230,8 @@ public function spaceBlocks()
206230
*/
207231
public function spaceBoth()
208232
{
233+
$this->setUpTestcase();
234+
209235
self::assertSame('
210236
.main, .test {
211237
font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;
@@ -226,6 +252,8 @@ public function spaceBoth()
226252
*/
227253
public function spaceBetweenBlocks()
228254
{
255+
$this->setUpTestcase();
256+
229257
self::assertSame(
230258
'.main, .test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}'
231259
. '@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}',
@@ -238,6 +266,8 @@ public function spaceBetweenBlocks()
238266
*/
239267
public function indentation()
240268
{
269+
$this->setUpTestcase();
270+
241271
self::assertSame('
242272
.main, .test {
243273
font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;
@@ -261,6 +291,8 @@ public function indentation()
261291
*/
262292
public function spaceBeforeBraces()
263293
{
294+
$this->setUpTestcase();
295+
264296
self::assertSame(
265297
'.main, .test{font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}
266298
@media screen{.main{background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}',
@@ -273,6 +305,8 @@ public function spaceBeforeBraces()
273305
*/
274306
public function ignoreExceptionsOff()
275307
{
308+
$this->setUpTestcase();
309+
276310
$this->expectException(OutputException::class);
277311

278312
$aBlocks = $this->oDocument->getAllDeclarationBlocks();
@@ -292,6 +326,8 @@ public function ignoreExceptionsOff()
292326
*/
293327
public function ignoreExceptionsOn()
294328
{
329+
$this->setUpTestcase();
330+
295331
$aBlocks = $this->oDocument->getAllDeclarationBlocks();
296332
$oFirstBlock = $aBlocks[0];
297333
$oFirstBlock->removeSelector('.main');

0 commit comments

Comments
 (0)