Skip to content

Commit 0706e5c

Browse files
micheleorsellimicheleorselli
committed
splits FileVisitorTest in multiple files
1 parent bb6992c commit 0706e5c

File tree

8 files changed

+50
-81
lines changed

8 files changed

+50
-81
lines changed

‎src/Analyzer/FileParserFactory.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,4 @@ public static function forPhpVersion(string $targetPhpVersion): FileParser
2323
{
2424
return self::createFileParser(TargetPhpVersion::create($targetPhpVersion), true);
2525
}
26-
27-
public static function forLatestPhpVersion(): FileParser
28-
{
29-
return self::createFileParser(TargetPhpVersion::latest(), true);
30-
}
31-
32-
public static function forOldestPhpVersion(): FileParser
33-
{
34-
return self::createFileParser(TargetPhpVersion::oldest(), true);
35-
}
3626
}

‎tests/Unit/Analyzer/FileParser/CanParseClassPropertiesTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ApplicationLevelDto
2727
}
2828
EOF;
2929

30-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
30+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
3131
$fp->parse($code, 'relativePathName');
3232

3333
$cd = $fp->getClassDescriptions();
@@ -54,7 +54,7 @@ class ApplicationLevelDto
5454
}
5555
EOF;
5656

57-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
57+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
5858
$fp->parse($code, 'relativePathName');
5959

6060
$cd = $fp->getClassDescriptions();
@@ -83,7 +83,7 @@ class ApplicationLevelDto
8383
}
8484
EOF;
8585

86-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
86+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
8787
$fp->parse($code, 'relativePathName');
8888

8989
$cd = $fp->getClassDescriptions();
@@ -114,7 +114,7 @@ public function __construct(
114114
}
115115
EOF;
116116

117-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
117+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
118118
$fp->parse($code, 'relativePathName');
119119

120120
$cd = $fp->getClassDescriptions();
@@ -144,7 +144,7 @@ public function __construct(array $field1)
144144
}
145145
EOF;
146146

147-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
147+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
148148
$fp->parse($code, 'relativePathName');
149149

150150
$cd = $fp->getClassDescriptions();

‎tests/Unit/Analyzer/FileParser/CanParseClassTest.php‎

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Arkitect\Analyzer\ClassDependency;
88
use Arkitect\Analyzer\ClassDescription;
9-
use Arkitect\Analyzer\FileParser;
109
use Arkitect\Analyzer\FileParserFactory;
1110
use Arkitect\CLI\TargetPhpVersion;
1211
use Arkitect\Expression\ForClasses\DependsOnlyOnTheseNamespaces;
@@ -39,7 +38,7 @@ public function __construct(Request $request)
3938
}
4039
EOF;
4140

42-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
41+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
4342
$fp->parse($code, 'path/to/class.php');
4443

4544
$violations = new Violations();
@@ -71,8 +70,7 @@ class Cat implements AnInterface
7170
}
7271
EOF;
7372

74-
/** @var FileParser $fp */
75-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
73+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
7674
$fp->parse($code, 'relativePathName');
7775
$cd = $fp->getClassDescriptions();
7876

@@ -116,8 +114,7 @@ class Cat implements AnInterface
116114
}
117115
EOF;
118116

119-
/** @var FileParser $fp */
120-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
117+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
121118
$fp->parse($code, 'relativePathName');
122119
$cd = $fp->getClassDescriptions();
123120

@@ -152,8 +149,7 @@ class Cat extends Animal
152149
}
153150
EOF;
154151

155-
/** @var FileParser $fp */
156-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
152+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
157153
$fp->parse($code, 'relativePathName');
158154

159155
$cd = $fp->getClassDescriptions()[1];
@@ -181,8 +177,7 @@ public function methodWithAnonymous(): void
181177
}
182178
EOF;
183179

184-
/** @var FileParser $fp */
185-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
180+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
186181
$fp->parse($code, 'relativePathName');
187182

188183
$cd = $fp->getClassDescriptions()[1];
@@ -209,8 +204,7 @@ public function __construct(Request $request)
209204
}
210205
EOF;
211206

212-
/** @var FileParser $fp */
213-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
207+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
214208
$fp->parse($code, 'relativePathName');
215209
$cd = $fp->getClassDescriptions();
216210

@@ -244,8 +238,7 @@ public function __construct(Request $request, ?Nullable $nullable)
244238
}
245239
EOF;
246240

247-
/** @var FileParser $fp */
248-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
241+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
249242
$fp->parse($code, 'relativePathName');
250243
$cd = $fp->getClassDescriptions();
251244

@@ -277,8 +270,7 @@ public function __construct()
277270
}
278271
EOF;
279272

280-
/** @var FileParser $fp */
281-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
273+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
282274
$fp->parse($code, 'relativePathName');
283275

284276
$cd = $fp->getClassDescriptions();
@@ -317,8 +309,7 @@ public function doSomething(self $self, static $static)
317309
}
318310
EOF;
319311

320-
/** @var FileParser $fp */
321-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
312+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
322313
$fp->parse($code, 'relativePathName');
323314

324315
$cd = $fp->getClassDescriptions();
@@ -350,8 +341,7 @@ public function foo()
350341
}
351342
EOF;
352343

353-
/** @var FileParser $fp */
354-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
344+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
355345
$fp->parse($code, 'relativePathName');
356346

357347
$cd = $fp->getClassDescriptions();
@@ -392,8 +382,7 @@ public function getStatic(): self
392382
}
393383
EOF;
394384

395-
/** @var FileParser $fp */
396-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
385+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
397386
$fp->parse($code, 'relativePathName');
398387

399388
$cd = $fp->getClassDescriptions();
@@ -425,8 +414,7 @@ class Test implements Order
425414

426415
EOF;
427416

428-
/** @var FileParser $fp */
429-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
417+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
430418
$fp->parse($code, 'relativePathName');
431419

432420
$cd = $fp->getClassDescriptions()[2]; // class Test
@@ -454,8 +442,7 @@ public function getBookList(): QueryBuilder;
454442
}
455443
EOF;
456444

457-
/** @var FileParser $fp */
458-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
445+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
459446
$fp->parse($code, 'relativePathName');
460447

461448
$cd = $fp->getClassDescriptions();
@@ -492,8 +479,7 @@ public function foobar();
492479
}
493480
EOF;
494481

495-
/** @var FileParser $fp */
496-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
482+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
497483
$fp->parse($code, 'relativePathName');
498484

499485
$cd = $fp->getClassDescriptions();
@@ -527,8 +513,7 @@ public function getRequest(): Request //the violations is reported here
527513
}
528514
EOF;
529515

530-
/** @var FileParser $fp */
531-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
516+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
532517
$fp->parse($code, 'relativePathName');
533518
$cd = $fp->getClassDescriptions();
534519

@@ -553,8 +538,7 @@ public function __construct() {
553538
}
554539
EOF;
555540

556-
/** @var FileParser $fp */
557-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.4'));
541+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_4);
558542
$fp->parse($code, 'relativePathName');
559543

560544
$cd = $fp->getClassDescriptions();
@@ -580,8 +564,7 @@ abstract public function foo() {}
580564
}
581565
EOF;
582566

583-
/** @var FileParser $fp */
584-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.4'));
567+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_4);
585568
$fp->parse($code, 'relativePathName');
586569

587570
$cd = $fp->getClassDescriptions();
@@ -605,8 +588,7 @@ public function __construct() {
605588
}
606589
EOF;
607590

608-
/** @var FileParser $fp */
609-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.4'));
591+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_4);
610592
$fp->parse($code, 'relativePathName');
611593

612594
$cd = $fp->getClassDescriptions();

‎tests/Unit/Analyzer/FileParser/CanParseDocblocksTest.php‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public function getFoo(): int
3434
}
3535
EOF;
3636

37-
/** @var FileParser $fp */
38-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
37+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
3938
$fp->parse($code, 'relativePathName');
4039

4140
$cd = $fp->getClassDescriptions();
@@ -76,8 +75,7 @@ class ApplicationLevelDto
7675
}
7776
EOF;
7877

79-
/** @var FileParser $fp */
80-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
78+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
8179
$fp->parse($code, 'relativePathName');
8280

8381
$cd = $fp->getClassDescriptions();
@@ -107,7 +105,7 @@ class MyClass
107105
}
108106
EOF;
109107

110-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
108+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
111109
$fp->parse($code, 'relativePathName');
112110
$cd = $fp->getClassDescriptions();
113111

@@ -136,7 +134,7 @@ class MyClass
136134
}
137135
EOF;
138136

139-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
137+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
140138
$fp->parse($code, 'relativePathName');
141139
$cd = $fp->getClassDescriptions();
142140

@@ -165,7 +163,7 @@ class MyClass
165163
}
166164
EOF;
167165

168-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
166+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
169167
$fp->parse($code, 'relativePathName');
170168
$cd = $fp->getClassDescriptions();
171169

@@ -196,7 +194,7 @@ public function __construct(array $dtoList)
196194
}
197195
EOF;
198196

199-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
197+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
200198
$fp->parse($code, 'relativePathName');
201199
$cd = $fp->getClassDescriptions();
202200

@@ -227,7 +225,7 @@ public function __construct(array $dtoList)
227225
}
228226
EOF;
229227

230-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
228+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
231229
$fp->parse($code, 'relativePathName');
232230
$cd = $fp->getClassDescriptions();
233231

@@ -258,7 +256,7 @@ public function __construct(array $dtoList)
258256
}
259257
EOF;
260258

261-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
259+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
262260
$fp->parse($code, 'relativePathName');
263261
$cd = $fp->getClassDescriptions();
264262

@@ -292,7 +290,7 @@ public function __construct(string $var1, array $dtoList, $var2, array $voList)
292290
}
293291
EOF;
294292

295-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
293+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
296294
$fp->parse($code, 'relativePathName');
297295
$cd = $fp->getClassDescriptions();
298296

@@ -324,7 +322,7 @@ public function getList(): array
324322
}
325323
EOF;
326324

327-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
325+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
328326
$fp->parse($code, 'relativePathName');
329327
$cd = $fp->getClassDescriptions();
330328

@@ -356,7 +354,7 @@ public function getList(): array
356354
}
357355
EOF;
358356

359-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('7.4'));
357+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
360358
$fp->parse($code, 'relativePathName');
361359
$cd = $fp->getClassDescriptions();
362360

@@ -388,7 +386,7 @@ public function getList(): array
388386
}
389387
EOF;
390388

391-
$fp = FileParserFactory::forOldestPhpVersion();
389+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_7_4);
392390
$fp->parse($code, 'relativePathName');
393391
$cd = $fp->getClassDescriptions();
394392

@@ -418,7 +416,10 @@ class ApplicationLevelDto
418416
}
419417
EOF;
420418

421-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'), false);
419+
$fp = FileParserFactory::createFileParser(
420+
TargetPhpVersion::create(TargetPhpVersion::PHP_8_1),
421+
false
422+
);
422423
$fp->parse($code, 'relativePathName');
423424

424425
$cd = $fp->getClassDescriptions();
@@ -450,7 +451,7 @@ class ApplicationLevelDto
450451
}
451452
EOF;
452453

453-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
454+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
454455
$fp->parse($code, 'relativePathName');
455456

456457
$cd = $fp->getClassDescriptions();
@@ -482,7 +483,7 @@ class ApplicationLevelDto
482483
}
483484
EOF;
484485

485-
$fp = FileParserFactory::createFileParser(TargetPhpVersion::create('8.1'));
486+
$fp = FileParserFactory::forPhpVersion(TargetPhpVersion::PHP_8_1);
486487
$fp->parse($code, 'relativePathName');
487488

488489
$cd = $fp->getClassDescriptions();

0 commit comments

Comments
 (0)