Skip to content

Commit 4c05d1a

Browse files
committed
Fix PHPCS errors
1 parent d9b4448 commit 4c05d1a

File tree

5 files changed

+31
-25
lines changed

5 files changed

+31
-25
lines changed

src/CompareClasses.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
use Psl\Regex;
99
use Psl\Str;
1010
use Roave\BackwardCompatibility\DetectChanges\BCBreak\ClassBased\ClassBased;
11+
use Roave\BackwardCompatibility\DetectChanges\BCBreak\EnumBased\EnumBased;
1112
use Roave\BackwardCompatibility\DetectChanges\BCBreak\InterfaceBased\InterfaceBased;
1213
use Roave\BackwardCompatibility\DetectChanges\BCBreak\TraitBased\TraitBased;
13-
use Roave\BackwardCompatibility\DetectChanges\BCBreak\EnumBased\EnumBased;
1414
use Roave\BetterReflection\Reflection\ReflectionClass;
1515
use Roave\BetterReflection\Reflector\Exception\IdentifierNotFound;
1616
use Roave\BetterReflection\Reflector\Reflector;

src/DetectChanges/BCBreak/EnumBased/CasesChanged.php

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
use Roave\BetterReflection\Reflection\ReflectionEnum;
1212
use Roave\BetterReflection\Reflection\ReflectionEnumCase;
1313

14+
use function array_filter;
15+
use function array_map;
16+
use function array_values;
17+
1418
class CasesChanged implements EnumBased
1519
{
1620
public function __invoke(ReflectionClass $fromEnum, ReflectionClass $toEnum): Changes
@@ -32,12 +36,8 @@ static function (ReflectionEnumCase $case) use ($fromEnum): bool {
3236
return false;
3337
}
3438

35-
if ($fromEnum->hasCase($case->getName())) {
36-
return false;
37-
}
38-
39-
return true;
40-
}
39+
return ! $fromEnum->hasCase($case->getName());
40+
},
4141
);
4242

4343
$removedCases = array_filter(
@@ -47,24 +47,26 @@ static function (ReflectionEnumCase $case) use ($toEnum): bool {
4747
return false;
4848
}
4949

50-
return !$toEnum->hasCase($case->getName());
51-
}
50+
return ! $toEnum->hasCase($case->getName());
51+
},
5252
);
5353

54-
$caseRemovedChanges = array_values(array_map(function (ReflectionEnumCase $case) use ($fromEnumName): Change {
55-
$caseName = $case->getName();
54+
$caseRemovedChanges = array_values(array_map(
55+
static function (ReflectionEnumCase $case) use ($fromEnumName): Change {
56+
$caseName = $case->getName();
5657

57-
return Change::removed("Case {$fromEnumName}::{$caseName} was removed");
58-
},
59-
$removedCases
58+
return Change::removed('Case ' . $fromEnumName . '::' . $caseName . ' was removed');
59+
},
60+
$removedCases,
6061
));
6162

62-
$caseAddedChanges = array_values(array_map(function (ReflectionEnumCase $case) use ($fromEnumName): Change {
63-
$caseName = $case->getName();
63+
$caseAddedChanges = array_values(array_map(
64+
static function (ReflectionEnumCase $case) use ($fromEnumName): Change {
65+
$caseName = $case->getName();
6466

65-
return Change::added("Case {$fromEnumName}::{$caseName} was added");
67+
return Change::added('Case ' . $fromEnumName . '::' . $caseName . ' was added');
6668
},
67-
$addedCases
69+
$addedCases,
6870
));
6971

7072
return Changes::fromList(...$caseRemovedChanges, ...$caseAddedChanges);
@@ -79,4 +81,4 @@ private static function isInternalDocComment(string|null $comment): bool
7981
return $comment !== null
8082
&& Regex\matches($comment, '/\s+@internal\s+/');
8183
}
82-
};
84+
}
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Roave\BackwardCompatibility\DetectChanges\BCBreak\EnumBased;
46

57
use Roave\BackwardCompatibility\Changes;
@@ -8,4 +10,4 @@
810
interface EnumBased
911
{
1012
public function __invoke(ReflectionClass $fromInterface, ReflectionClass $toInterface): Changes;
11-
}
13+
}

test/unit/CompareClassesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function setUp(): void
4545
$this->classBasedComparison = $this->createMock(ClassBased::class);
4646
$this->interfaceBasedComparison = $this->createMock(InterfaceBased::class);
4747
$this->traitBasedComparison = $this->createMock(TraitBased::class);
48-
$this->enumBasedComparison = $this->createMock(EnumBased::class);
48+
$this->enumBasedComparison = $this->createMock(EnumBased::class);
4949
$this->compareClasses = new CompareClasses(
5050
$this->classBasedComparison,
5151
$this->interfaceBasedComparison,

test/unit/DetectChanges/BCBreak/EnumBased/EnumCaseAddedTest.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
use Roave\BetterReflection\Reflector\DefaultReflector;
1313
use Roave\BetterReflection\SourceLocator\Type\SingleFileSourceLocator;
1414

15+
use function array_map;
16+
use function iterator_to_array;
17+
1518
/** @covers \Roave\BackwardCompatibility\DetectChanges\BCBreak\EnumBased\CasesChanged */
1619
final class EnumCaseAddedTest extends TestCase
1720
{
@@ -23,9 +26,8 @@ final class EnumCaseAddedTest extends TestCase
2326
public function testDiffs(
2427
ReflectionClass $fromEnum,
2528
ReflectionClass $toEnum,
26-
array $expectedMessages,
27-
): void
28-
{
29+
array $expectedMessages,
30+
): void {
2931
$changes = (new CasesChanged())($fromEnum, $toEnum);
3032

3133
self::assertSame(
@@ -40,7 +42,7 @@ public function testDiffs(
4042
* @return array<string, array<int, ReflectionClass|array<int, string>>>
4143
* @psalm-return array<string, array{0: ReflectionClass, 1: ReflectionClass, 2: list<string>}>
4244
*/
43-
public function enumsToBeTested()
45+
public function enumsToBeTested(): array
4446
{
4547
$locator = (new BetterReflection())->astLocator();
4648

0 commit comments

Comments
 (0)