Skip to content

Commit 04f976d

Browse files
JanTvrdikJanTvrdik
authored
Use shipmonk/coding-standard (#222)
1 parent f3b909b commit 04f976d

39 files changed

+801
-887
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"phpstan/phpstan-strict-rules": "^2.0.3",
3030
"phpstan/phpstan-symfony": "^2.0.2",
3131
"phpunit/phpunit": "^9.6.22",
32+
"shipmonk/coding-standard": "^0.1.3",
3233
"shipmonk/composer-dependency-analyser": "^1.8.2",
3334
"shipmonk/name-collision-detector": "^2.1.1",
3435
"shipmonk/phpstan-rules": "^4.1.0",
35-
"slevomat/coding-standard": "^8.16.0",
3636
"symfony/contracts": "^2.5 || ^3.0",
3737
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
3838
"symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",

‎composer.lock

Lines changed: 407 additions & 377 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phpcs.xml.dist

Lines changed: 6 additions & 414 deletions
Large diffs are not rendered by default.

‎src/Collector/ConstantFetchCollector.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ public function processNode(
7676
return $this->emitUsages($scope);
7777
}
7878

79-
private function registerFunctionCall(FuncCall $node, Scope $scope): void
79+
private function registerFunctionCall(
80+
FuncCall $node,
81+
Scope $scope
82+
): void
8083
{
8184
if (count($node->args) !== 1) {
8285
return;
@@ -127,7 +130,10 @@ private function registerFunctionCall(FuncCall $node, Scope $scope): void
127130
}
128131
}
129132

130-
private function registerFetch(ClassConstFetch $node, Scope $scope): void
133+
private function registerFetch(
134+
ClassConstFetch $node,
135+
Scope $scope
136+
): void
131137
{
132138
if ($node->class instanceof Expr) {
133139
$ownerType = $scope->getType($node->class);
@@ -160,7 +166,10 @@ private function registerFetch(ClassConstFetch $node, Scope $scope): void
160166
/**
161167
* @return list<string|null>
162168
*/
163-
private function getConstantNames(ClassConstFetch $fetch, Scope $scope): array
169+
private function getConstantNames(
170+
ClassConstFetch $fetch,
171+
Scope $scope
172+
): array
164173
{
165174
if ($fetch->name instanceof Expr) {
166175
$possibleConstantNames = [];
@@ -203,7 +212,11 @@ private function getDeclaringTypesWithConstant(
203212
return $result;
204213
}
205214

206-
private function registerUsage(ClassConstantUsage $usage, Node $node, Scope $scope): void
215+
private function registerUsage(
216+
ClassConstantUsage $usage,
217+
Node $node,
218+
Scope $scope
219+
): void
207220
{
208221
$excluderName = null;
209222

‎src/Collector/MethodCallCollector.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,10 @@ private function registerArrayCallable(
193193
}
194194
}
195195

196-
private function registerAttribute(Attribute $node, Scope $scope): void
196+
private function registerAttribute(
197+
Attribute $node,
198+
Scope $scope
199+
): void
197200
{
198201
$this->registerUsage(
199202
new ClassMethodUsage(
@@ -205,7 +208,10 @@ private function registerAttribute(Attribute $node, Scope $scope): void
205208
);
206209
}
207210

208-
private function registerClone(Clone_ $node, Scope $scope): void
211+
private function registerClone(
212+
Clone_ $node,
213+
Scope $scope
214+
): void
209215
{
210216
$methodName = '__clone';
211217
$callerType = $scope->getType($node->expr);
@@ -226,7 +232,10 @@ private function registerClone(Clone_ $node, Scope $scope): void
226232
* @param NullsafeMethodCall|MethodCall|StaticCall|New_ $call
227233
* @return list<string|null>
228234
*/
229-
private function getMethodNames(CallLike $call, Scope $scope): array
235+
private function getMethodNames(
236+
CallLike $call,
237+
Scope $scope
238+
): array
230239
{
231240
if ($call instanceof New_) {
232241
return ['__construct'];
@@ -278,7 +287,11 @@ private function getDeclaringTypesWithMethod(
278287
return $result;
279288
}
280289

281-
private function registerUsage(ClassMethodUsage $usage, Node $node, Scope $scope): void
290+
private function registerUsage(
291+
ClassMethodUsage $usage,
292+
Node $node,
293+
Scope $scope
294+
): void
282295
{
283296
$excluderName = null;
284297

‎src/Collector/ProvidedUsagesCollector.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@ private function validateUsage(
107107
}
108108
}
109109

110-
private function resolveExclusion(ClassMemberUsage $usage, Node $node, Scope $scope): CollectedUsage
110+
private function resolveExclusion(
111+
ClassMemberUsage $usage,
112+
Node $node,
113+
Scope $scope
114+
): CollectedUsage
111115
{
112116
$excluderName = null;
113117

‎src/Compatibility/BackwardCompatibilityChecker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __construct(
3434
public function check(): void
3535
{
3636
if (count($this->servicesWithOldTag) > 0) {
37-
$serviceClassNames = implode(' and ', array_map(static fn(object $service) => get_class($service), $this->servicesWithOldTag));
37+
$serviceClassNames = implode(' and ', array_map(static fn (object $service) => get_class($service), $this->servicesWithOldTag));
3838
$plural = count($this->servicesWithOldTag) > 1 ? 's' : '';
3939
$isAre = count($this->servicesWithOldTag) > 1 ? 'are' : 'is';
4040

‎src/Debug/DebugUsagePrinter.php

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ public function __construct(
6060
/**
6161
* @param array<MemberType::*, array<string, non-empty-list<CollectedUsage>>> $mixedMemberUsages
6262
*/
63-
public function printMixedMemberUsages(Output $output, array $mixedMemberUsages): void
63+
public function printMixedMemberUsages(
64+
Output $output,
65+
array $mixedMemberUsages
66+
): void
6467
{
6568
if ($mixedMemberUsages === [] || !$output->isDebug()) {
6669
return;
@@ -92,7 +95,10 @@ public function printMixedMemberUsages(Output $output, array $mixedMemberUsages)
9295
/**
9396
* @param array<MemberType::*, array<string, non-empty-list<CollectedUsage>>> $mixedMemberUsages
9497
*/
95-
private function printMixedClassNameUsages(Output $output, array $mixedMemberUsages): void
98+
private function printMixedClassNameUsages(
99+
Output $output,
100+
array $mixedMemberUsages
101+
): void
96102
{
97103
$totalCount = array_sum(array_map('count', $mixedMemberUsages));
98104

@@ -134,7 +140,10 @@ private function printMixedClassNameUsages(Output $output, array $mixedMemberUsa
134140
/**
135141
* @param array<MemberType::*, non-empty-list<CollectedUsage>> $fullyMixedUsages
136142
*/
137-
private function printMixedEverythingUsages(Output $output, array $fullyMixedUsages): void
143+
private function printMixedEverythingUsages(
144+
Output $output,
145+
array $fullyMixedUsages
146+
): void
138147
{
139148
if ($fullyMixedUsages === []) {
140149
return;
@@ -191,7 +200,10 @@ private function getExampleCaller(array $usages): string
191200
/**
192201
* @param array<string, mixed> $analysedClasses
193202
*/
194-
public function printDebugMemberUsages(Output $output, array $analysedClasses): void
203+
public function printDebugMemberUsages(
204+
Output $output,
205+
array $analysedClasses
206+
): void
195207
{
196208
if ($this->debugMembers === [] || !$output->isDebug()) {
197209
return;
@@ -279,7 +291,10 @@ private function prettyMemberKey(string $memberKey): string
279291
/**
280292
* @param list<string> $alternativeKeys
281293
*/
282-
public function recordUsage(CollectedUsage $collectedUsage, array $alternativeKeys): void
294+
public function recordUsage(
295+
CollectedUsage $collectedUsage,
296+
array $alternativeKeys
297+
): void
283298
{
284299
$memberKeys = array_unique([
285300
$collectedUsage->getUsage()->getMemberRef()->toKey(),
@@ -298,7 +313,10 @@ public function recordUsage(CollectedUsage $collectedUsage, array $alternativeKe
298313
/**
299314
* @param array<string, non-empty-list<ClassMemberUsage>> $eliminationPath
300315
*/
301-
public function markMemberAsWhite(BlackMember $blackMember, array $eliminationPath): void
316+
public function markMemberAsWhite(
317+
BlackMember $blackMember,
318+
array $eliminationPath
319+
): void
302320
{
303321
$memberKey = $blackMember->getMember()->toKey();
304322

@@ -309,7 +327,10 @@ public function markMemberAsWhite(BlackMember $blackMember, array $eliminationPa
309327
$this->debugMembers[$memberKey]['eliminationPath'] = $eliminationPath;
310328
}
311329

312-
public function markMemberAsNeverReported(BlackMember $blackMember, string $reason): void
330+
public function markMemberAsNeverReported(
331+
BlackMember $blackMember,
332+
string $reason
333+
): void
313334
{
314335
$memberKey = $blackMember->getMember()->toKey();
315336

‎src/Excluder/MemberUsageExcluder.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ interface MemberUsageExcluder
2525
*/
2626
public function getIdentifier(): string;
2727

28-
public function shouldExclude(ClassMemberUsage $usage, Node $node, Scope $scope): bool;
28+
public function shouldExclude(
29+
ClassMemberUsage $usage,
30+
Node $node,
31+
Scope $scope
32+
): bool;
2933

3034
}

‎src/Excluder/MixedUsageExcluder.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ public function getIdentifier(): string
2121
return 'usageOverMixed';
2222
}
2323

24-
public function shouldExclude(ClassMemberUsage $usage, Node $node, Scope $scope): bool
24+
public function shouldExclude(
25+
ClassMemberUsage $usage,
26+
Node $node,
27+
Scope $scope
28+
): bool
2529
{
2630
if (!$this->enabled) {
2731
return false;

0 commit comments

Comments
 (0)