Skip to content

Commit fa30a5c

Browse files
sirbrilligsirbrillig
committed
Move sniff filename into BaseTestCase
1 parent fc2073b commit fa30a5c

File tree

2 files changed

+32
-56
lines changed

2 files changed

+32
-56
lines changed

‎VariableAnalysis/Tests/BaseTestCase.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@ public function getWarningLineNumbersFromFile(LocalFile $phpcsFile): array {
2929
public function getErrorLineNumbersFromFile(LocalFile $phpcsFile): array {
3030
return $this->getLineNumbersFromMessages($phpcsFile->getErrors());
3131
}
32+
33+
public function getSniffFiles(): array {
34+
return [__DIR__ . '/../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
35+
}
3236
}

‎VariableAnalysis/Tests/CodeAnalysis/VariableAnalysisTest.php‎

Lines changed: 28 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
class VariableAnalysisTest extends BaseTestCase {
99
public function testFunctionWithoutParamsErrors() {
1010
$fixtureFile = __DIR__ . '/fixtures/FunctionWithoutParamFixture.php';
11-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
12-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
11+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
1312
$phpcsFile->process();
1413
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
1514
$expectedErrors = [];
@@ -18,8 +17,7 @@ public function testFunctionWithoutParamsErrors() {
1817

1918
public function testFunctionWithoutParamsWarnings() {
2019
$fixtureFile = __DIR__ . '/fixtures/FunctionWithoutParamFixture.php';
21-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
22-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
20+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
2321
$phpcsFile->process();
2422
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
2523
$expectedWarnings = [
@@ -41,8 +39,7 @@ public function testFunctionWithoutParamsWarnings() {
4139

4240
public function testFunctionWithDefaultParamErrors() {
4341
$fixtureFile = __DIR__ . '/fixtures/FunctionWithDefaultParamFixture.php';
44-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
45-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
42+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
4643
$phpcsFile->process();
4744
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
4845
$expectedErrors = [];
@@ -51,8 +48,7 @@ public function testFunctionWithDefaultParamErrors() {
5148

5249
public function testFunctionWithDefaultParamWarnings() {
5350
$fixtureFile = __DIR__ . '/fixtures/FunctionWithDefaultParamFixture.php';
54-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
55-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
51+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
5652
$phpcsFile->process();
5753
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
5854
$expectedWarnings = [
@@ -64,8 +60,7 @@ public function testFunctionWithDefaultParamWarnings() {
6460

6561
public function testFunctionWithGlobalVarErrors() {
6662
$fixtureFile = __DIR__ . '/fixtures/FunctionWithGlobalVarFixture.php';
67-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
68-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
63+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
6964
$phpcsFile->process();
7065
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
7166
$expectedErrors = [];
@@ -74,8 +69,7 @@ public function testFunctionWithGlobalVarErrors() {
7469

7570
public function testFunctionWithGlobalVarWarnings() {
7671
$fixtureFile = __DIR__ . '/fixtures/FunctionWithGlobalVarFixture.php';
77-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
78-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
72+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
7973
$phpcsFile->process();
8074
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
8175
$expectedWarnings = [
@@ -88,8 +82,7 @@ public function testFunctionWithGlobalVarWarnings() {
8882

8983
public function testFunctionWithForeachErrors() {
9084
$fixtureFile = __DIR__ . '/fixtures/FunctionWithForeachFixture.php';
91-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
92-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
85+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
9386
$phpcsFile->process();
9487
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
9588
$expectedErrors = [];
@@ -98,8 +91,7 @@ public function testFunctionWithForeachErrors() {
9891

9992
public function testFunctionWithForeachWarnings() {
10093
$fixtureFile = __DIR__ . '/fixtures/FunctionWithForeachFixture.php';
101-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
102-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
94+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
10395
$phpcsFile->process();
10496
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
10597
$expectedWarnings = [
@@ -121,8 +113,7 @@ public function testFunctionWithForeachWarnings() {
121113

122114
public function testClassWithMembersErrors() {
123115
$fixtureFile = __DIR__ . '/fixtures/ClassWithMembersFixture.php';
124-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
125-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
116+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
126117
$phpcsFile->process();
127118
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
128119
$expectedErrors = [];
@@ -131,8 +122,7 @@ public function testClassWithMembersErrors() {
131122

132123
public function testClassWithMembersWarnings() {
133124
$fixtureFile = __DIR__ . '/fixtures/ClassWithMembersFixture.php';
134-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
135-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
125+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
136126
$phpcsFile->process();
137127
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
138128
$expectedWarnings = [
@@ -154,8 +144,7 @@ public function testClassWithMembersWarnings() {
154144

155145
public function testFunctionsOutsideClassErrors() {
156146
$fixtureFile = __DIR__ . '/fixtures/FunctionsOutsideClassFixture.php';
157-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
158-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
147+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
159148
$phpcsFile->process();
160149
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
161150
$expectedErrors = [
@@ -167,8 +156,7 @@ public function testFunctionsOutsideClassErrors() {
167156

168157
public function testFunctionsOutsideClassWarnings() {
169158
$fixtureFile = __DIR__ . '/fixtures/FunctionsOutsideClassFixture.php';
170-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
171-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
159+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
172160
$phpcsFile->process();
173161
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
174162
$expectedWarnings = [
@@ -179,8 +167,7 @@ public function testFunctionsOutsideClassWarnings() {
179167

180168
public function testFunctionWithClosureErrors() {
181169
$fixtureFile = __DIR__ . '/fixtures/FunctionWithClosureFixture.php';
182-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
183-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
170+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
184171
$phpcsFile->process();
185172
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
186173
$expectedErrors = [
@@ -191,8 +178,7 @@ public function testFunctionWithClosureErrors() {
191178

192179
public function testFunctionWithClosureWarnings() {
193180
$fixtureFile = __DIR__ . '/fixtures/FunctionWithClosureFixture.php';
194-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
195-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
181+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
196182
$phpcsFile->process();
197183
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
198184
$expectedWarnings = [
@@ -217,8 +203,7 @@ public function testFunctionWithClosureWarnings() {
217203

218204
public function testFunctionWithReferenceErrors() {
219205
$fixtureFile = __DIR__ . '/fixtures/FunctionWithReferenceFixture.php';
220-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
221-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
206+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
222207
$phpcsFile->process();
223208
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
224209
$expectedErrors = [];
@@ -227,8 +212,7 @@ public function testFunctionWithReferenceErrors() {
227212

228213
public function testFunctionWithReferenceWarnings() {
229214
$fixtureFile = __DIR__ . '/fixtures/FunctionWithReferenceFixture.php';
230-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
231-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
215+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
232216
$phpcsFile->process();
233217
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
234218
$expectedWarnings = [
@@ -248,8 +232,7 @@ public function testFunctionWithReferenceWarnings() {
248232

249233
public function testFunctionWithTryCatchErrors() {
250234
$fixtureFile = __DIR__ . '/fixtures/FunctionWithTryCatchFixture.php';
251-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
252-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
235+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
253236
$phpcsFile->process();
254237
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
255238
$expectedErrors = [];
@@ -258,8 +241,7 @@ public function testFunctionWithTryCatchErrors() {
258241

259242
public function testFunctionWithTryCatchWarnings() {
260243
$fixtureFile = __DIR__ . '/fixtures/FunctionWithTryCatchFixture.php';
261-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
262-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
244+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
263245
$phpcsFile->process();
264246
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
265247
$expectedWarnings = [
@@ -271,8 +253,7 @@ public function testFunctionWithTryCatchWarnings() {
271253

272254
public function testFunctionWithInlineAssignErrors() {
273255
$fixtureFile = __DIR__ . '/fixtures/FunctionWithInlineAssignFixture.php';
274-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
275-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
256+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
276257
$phpcsFile->process();
277258
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
278259
$expectedErrors = [];
@@ -281,8 +262,7 @@ public function testFunctionWithInlineAssignErrors() {
281262

282263
public function testFunctionWithInlineAssignWarnings() {
283264
$fixtureFile = __DIR__ . '/fixtures/FunctionWithInlineAssignFixture.php';
284-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
285-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
265+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
286266
$phpcsFile->process();
287267
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
288268
$expectedWarnings = [
@@ -294,8 +274,7 @@ public function testFunctionWithInlineAssignWarnings() {
294274

295275
public function testFunctionWithRedeclarationsErrors() {
296276
$fixtureFile = __DIR__ . '/fixtures/FunctionWithRedeclarationsFixture.php';
297-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
298-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
277+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
299278
$phpcsFile->process();
300279
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
301280
$expectedErrors = [];
@@ -304,8 +283,7 @@ public function testFunctionWithRedeclarationsErrors() {
304283

305284
public function testFunctionWithRedeclarationsWarnings() {
306285
$fixtureFile = __DIR__ . '/fixtures/FunctionWithRedeclarationsFixture.php';
307-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
308-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
286+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
309287
$phpcsFile->process();
310288
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
311289
$expectedWarnings = [
@@ -328,8 +306,7 @@ public function testFunctionWithRedeclarationsWarnings() {
328306

329307
public function testHeredocErrors() {
330308
$fixtureFile = __DIR__ . '/fixtures/HeredocFixture.php';
331-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
332-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
309+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
333310
$phpcsFile->process();
334311
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
335312
$expectedErrors = [];
@@ -338,8 +315,7 @@ public function testHeredocErrors() {
338315

339316
public function testHeredocWarnings() {
340317
$fixtureFile = __DIR__ . '/fixtures/HeredocFixture.php';
341-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
342-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
318+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
343319
$phpcsFile->process();
344320
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
345321
$expectedWarnings = [
@@ -353,8 +329,7 @@ public function testHeredocWarnings() {
353329

354330
public function testClassReferenceErrors() {
355331
$fixtureFile = __DIR__ . '/fixtures/ClassReferenceFixture.php';
356-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
357-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
332+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
358333
$phpcsFile->process();
359334
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
360335
$expectedErrors = [];
@@ -363,8 +338,7 @@ public function testClassReferenceErrors() {
363338

364339
public function testClassReferenceWarnings() {
365340
$fixtureFile = __DIR__ . '/fixtures/ClassReferenceFixture.php';
366-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
367-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
341+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
368342
$phpcsFile->process();
369343
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
370344
$expectedWarnings = [
@@ -378,8 +352,7 @@ public function testClassReferenceWarnings() {
378352

379353
public function testCompactErrors() {
380354
$fixtureFile = __DIR__ . '/fixtures/CompactFixture.php';
381-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
382-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
355+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
383356
$phpcsFile->process();
384357
$lines = $this->getErrorLineNumbersFromFile($phpcsFile);
385358
$expectedErrors = [];
@@ -388,8 +361,7 @@ public function testCompactErrors() {
388361

389362
public function testCompactWarnings() {
390363
$fixtureFile = __DIR__ . '/fixtures/CompactFixture.php';
391-
$sniffFiles = [__DIR__ . '/../../../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php'];
392-
$phpcsFile = $this->prepareLocalFileForSniffs($sniffFiles, $fixtureFile);
364+
$phpcsFile = $this->prepareLocalFileForSniffs($this->getSniffFiles(), $fixtureFile);
393365
$phpcsFile->process();
394366
$lines = $this->getWarningLineNumbersFromFile($phpcsFile);
395367
$expectedWarnings = [

0 commit comments

Comments
 (0)