RuleErrorTransformer - accept only IdentifierRuleError

Author: ondrejmirtes

src/Analyser/RuleErrorTransformer.php

@@ -8,9 +8,7 @@
 use PHPStan\Rules\LineRuleError;
 use PHPStan\Rules\MetadataRuleError;
 use PHPStan\Rules\NonIgnorableRuleError;
-use PHPStan\Rules\RuleError;
 use PHPStan\Rules\TipRuleError;
-use function is_string;
 
 final class RuleErrorTransformer
 {
@@ -19,7 +17,7 @@ final class RuleErrorTransformer
 	 * @param class-string<Node> $nodeType
 	 */
 	public function transform(
-		string|RuleError $ruleError,
+		IdentifierRuleError $ruleError,
 		Scope $scope,
 		string $nodeType,
 		int $nodeLine,
@@ -31,51 +29,43 @@ public function transform(
 		$filePath = $scope->getFile();
 		$traitFilePath = null;
 		$tip = null;
-		$identifier = null;
 		$metadata = [];
 		if ($scope->isInTrait()) {
 			$traitReflection = $scope->getTraitReflection();
 			if ($traitReflection->getFileName() !== null) {
 				$traitFilePath = $traitReflection->getFileName();
 			}
 		}
-		if (is_string($ruleError)) {
-			$message = $ruleError;
-		} else {
-			$message = $ruleError->getMessage();
-			if (
-				$ruleError instanceof LineRuleError
-				&& $ruleError->getLine() !== -1
-			) {
-				$line = $ruleError->getLine();
-			}
-			if (
-				$ruleError instanceof FileRuleError
-				&& $ruleError->getFile() !== ''
-			) {
-				$fileName = $ruleError->getFileDescription();
-				$filePath = $ruleError->getFile();
-				$traitFilePath = null;
-			}
 
-			if ($ruleError instanceof TipRuleError) {
-				$tip = $ruleError->getTip();
-			}
+		if (
+			$ruleError instanceof LineRuleError
+			&& $ruleError->getLine() !== -1
+		) {
+			$line = $ruleError->getLine();
+		}
+		if (
+			$ruleError instanceof FileRuleError
+			&& $ruleError->getFile() !== ''
+		) {
+			$fileName = $ruleError->getFileDescription();
+			$filePath = $ruleError->getFile();
+			$traitFilePath = null;
+		}
 
-			if ($ruleError instanceof IdentifierRuleError) {
-				$identifier = $ruleError->getIdentifier();
-			}
+		if ($ruleError instanceof TipRuleError) {
+			$tip = $ruleError->getTip();
+		}
 
-			if ($ruleError instanceof MetadataRuleError) {
-				$metadata = $ruleError->getMetadata();
-			}
+		if ($ruleError instanceof MetadataRuleError) {
+			$metadata = $ruleError->getMetadata();
+		}
 
-			if ($ruleError instanceof NonIgnorableRuleError) {
-				$canBeIgnored = false;
-			}
+		if ($ruleError instanceof NonIgnorableRuleError) {
+			$canBeIgnored = false;
 		}
+
 		return new Error(
-			$message,
+			$ruleError->getMessage(),
 			$fileName,
 			$line,
 			$canBeIgnored,
@@ -84,7 +74,7 @@ public function transform(
 			$tip,
 			$nodeLine,
 			$nodeType,
-			$identifier,
+			$ruleError->getIdentifier(),
 			$metadata,
 		);
 	}