Skip to content

Commit 1d675f7

Browse files
committed
fix
1 parent 4e6b69f commit 1d675f7

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/Rules/DoctrineKeyValueStyleRule.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use PhpParser\Node\Expr\New_;
1111
use PhpParser\Node\Name\FullyQualified;
1212
use PHPStan\Analyser\Scope;
13+
use PHPStan\Rules\IdentifierRuleError;
1314
use PHPStan\Rules\Rule;
1415
use PHPStan\Rules\RuleError;
1516
use PHPStan\Rules\RuleErrorBuilder;
@@ -65,7 +66,7 @@ public function getNodeType(): string
6566
}
6667

6768
/**
68-
* @return RuleError[]
69+
* @return list<IdentifierRuleError>
6970
*/
7071
public function processNode(Node $callLike, Scope $scope): array
7172
{
@@ -114,7 +115,7 @@ public function processNode(Node $callLike, Scope $scope): array
114115
$tableNames = $tableType->getConstantStrings();
115116
if (\count($tableNames) === 0) {
116117
return [
117-
RuleErrorBuilder::message('Argument #0 expects a constant string, got ' . $tableType->describe(VerbosityLevel::precise()))->line($callLike->getStartLine())->build(),
118+
RuleErrorBuilder::message('Argument #0 expects a constant string, got ' . $tableType->describe(VerbosityLevel::precise()))->identifier('dba.keyValue')->line($callLike->getStartLine())->build(),
118119
];
119120
}
120121

@@ -185,7 +186,7 @@ public function processNode(Node $callLike, Scope $scope): array
185186

186187
$ruleErrors = [];
187188
foreach ($errors as $error) {
188-
$ruleErrors[] = RuleErrorBuilder::message('Query error: ' . $error)->line($callLike->getStartLine())->build();
189+
$ruleErrors[] = RuleErrorBuilder::message('Query error: ' . $error)->identifier('dba.keyValue')->line($callLike->getStartLine())->build();
189190
}
190191
return $ruleErrors;
191192
}

src/Rules/PdoStatementExecuteMethodRule.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use PhpParser\Node\Expr\MethodCall;
1010
use PHPStan\Analyser\Scope;
1111
use PHPStan\Reflection\MethodReflection;
12+
use PHPStan\Rules\IdentifierRuleError;
1213
use PHPStan\Rules\Rule;
1314
use PHPStan\Rules\RuleError;
1415
use PHPStan\Rules\RuleErrorBuilder;
@@ -55,7 +56,7 @@ public function processNode(Node $methodCall, Scope $scope): array
5556
}
5657

5758
/**
58-
* @return RuleError[]
59+
* @return list<IdentifierRuleError>
5960
*/
6061
private function checkErrors(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): array
6162
{
@@ -97,7 +98,7 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met
9798
$parameters = $queryReflection->resolveParameters($parameterTypes) ?? [];
9899
} catch (UnresolvableQueryException $exception) {
99100
return [
100-
RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getStartLine())->build(),
101+
RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->identifier('dba.unresolvableQuery')->line($methodCall->getStartLine())->build(),
101102
];
102103
}
103104

@@ -110,13 +111,13 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met
110111
}
111112
} catch (UnresolvableQueryException $exception) {
112113
return [
113-
RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getStartLine())->build(),
114+
RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->identifier('dba.unresolvableQuery')->line($methodCall->getStartLine())->build(),
114115
];
115116
}
116117

117118
$ruleErrors = [];
118119
foreach ($errors as $error) {
119-
$ruleErrors[] = RuleErrorBuilder::message($error)->line($methodCall->getStartLine())->build();
120+
$ruleErrors[] = RuleErrorBuilder::message($error)->identifier('dba.invalidPlaceholder')->line($methodCall->getStartLine())->build();
120121
}
121122

122123
return $ruleErrors;

src/Rules/QueryPlanAnalyzerRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function processNode(Node $callLike, Scope $scope): array
9393
return $this->analyze($callLike, $scope);
9494
} catch (UnresolvableQueryException $exception) {
9595
return [
96-
RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getStartLine())->build(),
96+
RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->identifier('dba.unresolvableQuery')->line($callLike->getStartLine())->build(),
9797
];
9898
}
9999
}

0 commit comments

Comments
 (0)