Skip to content

Commit 821a284

Browse files
committed
fixup! use rule identifiers
1 parent af1d927 commit 821a284

11 files changed

+29
-27
lines changed

src/PHPStan/Rules/Doctrine/NoParentRepositoryRule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public function processNode(Node $node, Scope $scope): array
5151
return [];
5252
}
5353

54-
$ruleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
54+
$identifierRuleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
5555
->identifier(RuleIdentifier::DOCTRINE_NO_PARENT_REPOSITORY)
5656
->build();
5757

58-
return [$ruleError];
58+
return [$identifierRuleError];
5959
}
6060
}

src/PHPStan/Rules/Doctrine/NoRepositoryCallInDataFixtureRule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ public function processNode(Node $node, Scope $scope): array
5555
return [];
5656
}
5757

58-
$ruleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
58+
$identifierRuleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
5959
->identifier(RuleIdentifier::DOCTRINE_NO_REPOSITORY_CALL_IN_DATA_FIXTURES)
6060
->build();
6161

62-
return [$ruleError];
62+
return [$identifierRuleError];
6363
}
6464

6565
private function isDataFixtureClass(Scope $scope): bool

src/Rules/Complexity/NoConstructorOverrideRule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ public function processNode(Node $node, Scope $scope): array
6868
return [];
6969
}
7070

71-
$ruleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
71+
$identifierRuleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
7272
->identifier(RuleIdentifier::NO_CONSTRUCTOR_OVERRIDE)
7373
->build();
7474

75-
return [$ruleError];
75+
return [$identifierRuleError];
7676
}
7777
}

src/Rules/NoDynamicNameRule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
*
2525
* @implements Rule<Node>
2626
*/
27-
final class NoDynamicNameRule implements Rule
27+
final readonly class NoDynamicNameRule implements Rule
2828
{
2929
/**
3030
* @var string
3131
*/
3232
public const ERROR_MESSAGE = 'Use explicit names over dynamic ones';
3333

3434
public function __construct(
35-
private readonly CallableTypeAnalyzer $callableTypeAnalyzer,
35+
private CallableTypeAnalyzer $callableTypeAnalyzer,
3636
) {
3737
}
3838

src/Rules/NoReferenceRule.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
/**
2525
* @see \Symplify\PHPStanRules\Tests\Rules\NoReferenceRule\NoReferenceRuleTest
2626
*
27-
* @implements Rule<\PhpParser\Node>
27+
* @implements Rule<Node>
2828
*/
29-
final class NoReferenceRule implements Rule
29+
final readonly class NoReferenceRule implements Rule
3030
{
3131
/**
3232
* @var string
3333
*/
3434
public const ERROR_MESSAGE = 'Use explicit return value over magic &reference';
3535

3636
public function __construct(
37-
private readonly ParentClassMethodNodeResolver $parentClassMethodNodeResolver,
37+
private ParentClassMethodNodeResolver $parentClassMethodNodeResolver,
3838
) {
3939
}
4040

src/Rules/PHPUnit/NoMockOnlyTestRule.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Symplify\PHPStanRules\Rules\PHPUnit;
66

7+
use Symplify\PHPStanRules\Testing\PHPUnitTestAnalyser;
78
use PhpParser\Node;
89
use PhpParser\Node\Name;
910
use PhpParser\Node\Stmt\Class_;
@@ -40,7 +41,7 @@ public function getNodeType(): string
4041
*/
4142
public function processNode(Node $node, Scope $scope): array
4243
{
43-
if (! \Symplify\PHPStanRules\Testing\PHPUnitTestAnalyser::isTestClass($scope)) {
44+
if (! PHPUnitTestAnalyser::isTestClass($scope)) {
4445
return [];
4546
}
4647

@@ -71,10 +72,10 @@ public function processNode(Node $node, Scope $scope): array
7172
return [];
7273
}
7374

74-
$ruleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
75+
$identifierRuleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
7576
->identifier(RuleIdentifier::PHPUNIT_NO_MOCK_ONLY)
7677
->build();
7778

78-
return [$ruleError];
79+
return [$identifierRuleError];
7980
}
8081
}

src/Rules/PHPUnit/PublicStaticDataProviderRule.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Symplify\PHPStanRules\Rules\PHPUnit;
66

7+
use Symplify\PHPStanRules\Testing\PHPUnitTestAnalyser;
78
use PhpParser\Node;
89
use PhpParser\Node\Stmt\ClassMethod;
910
use PHPStan\Analyser\Scope;
@@ -42,15 +43,15 @@ public function getNodeType(): string
4243
*/
4344
public function processNode(Node $node, Scope $scope): array
4445
{
45-
if (! \Symplify\PHPStanRules\Testing\PHPUnitTestAnalyser::isTestClass($scope)) {
46+
if (! PHPUnitTestAnalyser::isTestClass($scope)) {
4647
return [];
4748
}
4849

4950
$ruleErrors = [];
5051

5152
$classLike = $node->getOriginalNode();
5253
foreach ($classLike->getMethods() as $classMethod) {
53-
if (! \Symplify\PHPStanRules\Testing\PHPUnitTestAnalyser::class::isTestClassMethod($classMethod)) {
54+
if (! PHPUnitTestAnalyser::class::isTestClassMethod($classMethod)) {
5455
continue;
5556
}
5657

src/Rules/PreferredClassRule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
* @implements Rule<Node>
2626
*/
27-
final class PreferredClassRule implements Rule
27+
final readonly class PreferredClassRule implements Rule
2828
{
2929
/**
3030
* @var string
@@ -35,7 +35,7 @@ final class PreferredClassRule implements Rule
3535
* @param string[] $oldToPreferredClasses
3636
*/
3737
public function __construct(
38-
private readonly array $oldToPreferredClasses
38+
private array $oldToPreferredClasses
3939
) {
4040
}
4141

src/Rules/Symfony/NoAbstractControllerConstructorRule.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public function processNode(Node $node, Scope $scope): array
5454
return [];
5555
}
5656

57-
$ruleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
57+
$identifierRuleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
5858
->identifier(RuleIdentifier::SYMFONY_NO_ABSTRACT_CONTROLLER_CONSTRUCTOR)
5959
->build();
6060

61-
return [$ruleError];
61+
return [$identifierRuleError];
6262
}
6363
}

src/Rules/Symfony/NoListenerWithoutContractRule.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ public function processNode(Node $node, Scope $scope): array
4444
return [];
4545
}
4646

47-
$class = $node->getOriginalNode();
48-
if (! $class instanceof Class_) {
47+
$classLike = $node->getOriginalNode();
48+
if (! $classLike instanceof Class_) {
4949
return [];
5050
}
5151

52-
if ($class->implements !== []) {
52+
if ($classLike->implements !== []) {
5353
return [];
5454
}
5555

56-
$ruleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
56+
$identifierRuleError = RuleErrorBuilder::message(self::ERROR_MESSAGE)
5757
->identifier(RuleIdentifier::NO_LISTENER_WITHOUT_CONTRACT)
5858
->build();
5959

60-
return [$ruleError];
60+
return [$identifierRuleError];
6161
}
6262
}

0 commit comments

Comments
 (0)