Modernize rules with RuleErrorBuilder

phpstan · May 28, 2023 · d96b5a4 · d96b5a4
1 parent d8bdab0
commit d96b5a4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php b/src/Rules/PHPUnit/AssertSameBooleanExpectedRule.php
@@ -7,6 +7,7 @@
 use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
 use function count;
 
 /**
@@ -40,13 +41,13 @@ public function processNode(Node $node, Scope $scope): array
 
 		if ($expectedArgumentValue->name->toLowerString() === 'true') {
 			return [
-				'You should use assertTrue() instead of assertSame() when expecting "true"',
+				RuleErrorBuilder::message('You should use assertTrue() instead of assertSame() when expecting "true"')->build(),
 			];
 		}
 
 		if ($expectedArgumentValue->name->toLowerString() === 'false') {
 			return [
-				'You should use assertFalse() instead of assertSame() when expecting "false"',
+				RuleErrorBuilder::message('You should use assertFalse() instead of assertSame() when expecting "false"')->build(),
 			];
 		}
 

diff --git a/src/Rules/PHPUnit/AssertSameNullExpectedRule.php b/src/Rules/PHPUnit/AssertSameNullExpectedRule.php
@@ -7,6 +7,7 @@
 use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
 use function count;
 
 /**
@@ -40,7 +41,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		if ($expectedArgumentValue->name->toLowerString() === 'null') {
 			return [
-				'You should use assertNull() instead of assertSame(null, $actual).',
+				RuleErrorBuilder::message('You should use assertNull() instead of assertSame(null, $actual).')->build(),
 			];
 		}
 

diff --git a/src/Rules/PHPUnit/AssertSameWithCountRule.php b/src/Rules/PHPUnit/AssertSameWithCountRule.php
@@ -7,6 +7,7 @@
 use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\ObjectType;
 use function count;
 
@@ -42,7 +43,7 @@ public function processNode(Node $node, Scope $scope): array
 			&& $right->name->toLowerString() === 'count'
 		) {
 			return [
-				'You should use assertCount($expectedCount, $variable) instead of assertSame($expectedCount, count($variable)).',
+				RuleErrorBuilder::message('You should use assertCount($expectedCount, $variable) instead of assertSame($expectedCount, count($variable)).')->build(),
 			];
 		}
 
@@ -56,7 +57,7 @@ public function processNode(Node $node, Scope $scope): array
 
 			if ((new ObjectType(Countable::class))->isSuperTypeOf($type)->yes()) {
 				return [
-					'You should use assertCount($expectedCount, $variable) instead of assertSame($expectedCount, $variable->count()).',
+					RuleErrorBuilder::message('You should use assertCount($expectedCount, $variable) instead of assertSame($expectedCount, $variable->count()).')->build(),
 				];
 			}
 		}

diff --git a/src/Rules/PHPUnit/ClassMethodCoversExistsRule.php b/src/Rules/PHPUnit/ClassMethodCoversExistsRule.php
@@ -62,7 +62,6 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		$errors = [];
 		$classPhpDoc = $classReflection->getResolvedPhpDoc();
 		[$classCovers, $classCoversDefaultClasses] = $this->coversHelper->getCoverAnnotations($classPhpDoc);
 

diff --git a/src/Rules/PHPUnit/MockMethodCallRule.php b/src/Rules/PHPUnit/MockMethodCallRule.php
@@ -6,6 +6,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
 use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Stub;
@@ -28,9 +29,6 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		/** @var Node\Expr\MethodCall $node */
-		$node = $node;
-
 		if (!$node->name instanceof Node\Identifier || $node->name->name !== 'method') {
 			return [];
 		}
@@ -63,11 +61,11 @@ public function processNode(Node $node, Scope $scope): array
 					continue;
 				}
 
-				$errors[] = sprintf(
+				$errors[] = RuleErrorBuilder::message(sprintf(
 					'Trying to mock an undefined method %s() on class %s.',
 					$method,
 					implode('&', $mockClasses)
-				);
+				))->build();
 				continue;
 			}
 
@@ -81,11 +79,11 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
-			$errors[] = sprintf(
+			$errors[] = RuleErrorBuilder::message(sprintf(
 				'Trying to mock an undefined method %s() on class %s.',
 				$method,
 				implode('|', $classNames)
-			);
+			))->build();
 		}
 
 		return $errors;