Rework

Author: VincentLanglet

src/Analyser/RuleErrorTransformer.php

@@ -76,7 +76,7 @@ public function transform(
 		) {
 			$line = $ruleError->getLine();
 		} else {
-			$line = self::getLineFromNode($node);
+			$line = self::getStartLineFromNode($node);
 		}
 		if (
 			$ruleError instanceof FileRuleError
@@ -168,20 +168,16 @@ public function transform(
 		);
 	}
 
-	public static function getLineFromNode(Node $node): int
+	public static function getStartLineFromNode(Node $node): int
 	{
-		if ($node instanceof PropertyAssignNode) {
-			return self::getLineFromNode($node->getPropertyFetch());
-		}
-
-		if (
-			$node instanceof Node\Expr\PropertyFetch
-			|| $node instanceof Node\Expr\MethodCall
-		) {
-			return $node->name->getStartLine();
-		}
-
-		return $node->getStartLine();
+		$line = match (true) {
+			$node instanceof PropertyAssignNode => self::getStartLineFromNode($node->getPropertyFetch()),
+			$node instanceof Node\Expr\PropertyFetch,
+			$node instanceof Node\Expr\MethodCall => $node->name->getStartLine(),
+			default => -1,
+		};
+
+		return $line !== -1 ? $line : $node->getStartLine();
 	}
 
 }

src/Rules/FunctionCallParametersCheck.php

@@ -90,7 +90,7 @@ public function check(
 		string $namedArgumentMessage,
 	): array
 	{
-		$funcCallLine = RuleErrorTransformer::getLineFromNode($funcCall);
+		$funcCallLine = RuleErrorTransformer::getStartLineFromNode($funcCall);
 
 		$functionParametersMinCount = 0;
 		$functionParametersMaxCount = 0;

tests/PHPStan/Rules/Properties/data/bug-14150.php

@@ -9,7 +9,7 @@ class HelloWorld
 	/**
 	 * @return $this
 	 */
-	public function x(): static
+	public function x()
 	{
 		return $this;
 	}