Address review comments for possibly-impure tip

- Carry declared return type as expression type in assignExpression()
  instead of as a PossiblyImpureCallExpr constructor parameter
- Remove unnecessary hasTips() check on new error builder in
  MatchExpressionRule
- Remove hasTips condition in PossiblyImpureTipHelper and remove
  hasTips() method from RuleErrorBuilder

Co-authored-by: Ondřej Mirtes <ondrejmirtes@users.noreply.github.com>

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -815,7 +815,7 @@ public function findPossiblyImpureCallDescriptions(Expr $expr): array
 			// narrowing affected the type (the cached value was narrowed).
 			assert($found instanceof Expr);
 			$scopeType = $this->getType($found);
-			$declaredReturnType = $holderExpr->getDeclaredReturnType();
+			$declaredReturnType = $holder->getType();
 			if ($declaredReturnType->isSuperTypeOf($scopeType)->yes() && $scopeType->isSuperTypeOf($declaredReturnType)->yes()) {
 				continue;
 			}

src/Analyser/NodeScopeResolver.php

@@ -2929,8 +2929,8 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				&& $parametersAcceptor !== null
 			) {
 				$scope = $scope->assignExpression(
-					new PossiblyImpureCallExpr($normalizedExpr, $normalizedExpr, sprintf('%s()', $functionReflection->getName()), $parametersAcceptor->getReturnType()),
-					new MixedType(),
+					new PossiblyImpureCallExpr($normalizedExpr, $normalizedExpr, sprintf('%s()', $functionReflection->getName())),
+					$parametersAcceptor->getReturnType(),
 					new MixedType(),
 				);
 			}
@@ -3235,8 +3235,8 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 					$scope = $scope->invalidateExpression($normalizedExpr->var, true, $methodReflection->getDeclaringClass());
 				} elseif ($this->rememberPossiblyImpureFunctionValues && $methodReflection->hasSideEffects()->maybe() && !$methodReflection->getDeclaringClass()->isBuiltin() && $parametersAcceptor !== null) {
 					$scope = $scope->assignExpression(
-						new PossiblyImpureCallExpr($normalizedExpr, $normalizedExpr->var, sprintf('%s::%s()', $methodReflection->getDeclaringClass()->getDisplayName(), $methodReflection->getName()), $parametersAcceptor->getReturnType()),
-						new MixedType(),
+						new PossiblyImpureCallExpr($normalizedExpr, $normalizedExpr->var, sprintf('%s::%s()', $methodReflection->getDeclaringClass()->getDisplayName(), $methodReflection->getName())),
+						$parametersAcceptor->getReturnType(),
 						new MixedType(),
 					);
 				}
@@ -3459,8 +3459,8 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				&& $scope->getClassReflection()->is($methodReflection->getDeclaringClass()->getName())
 			) {
 				$scope = $scope->assignExpression(
-					new PossiblyImpureCallExpr($normalizedExpr, new Variable('this'), sprintf('%s::%s()', $methodReflection->getDeclaringClass()->getDisplayName(), $methodReflection->getName()), $parametersAcceptor->getReturnType()),
-					new MixedType(),
+					new PossiblyImpureCallExpr($normalizedExpr, new Variable('this'), sprintf('%s::%s()', $methodReflection->getDeclaringClass()->getDisplayName(), $methodReflection->getName())),
+					$parametersAcceptor->getReturnType(),
 					new MixedType(),
 				);
 			}

src/Node/Expr/PossiblyImpureCallExpr.php

@@ -5,7 +5,6 @@
 use Override;
 use PhpParser\Node\Expr;
 use PHPStan\Node\VirtualNode;
-use PHPStan\Type\Type;
 
 final class PossiblyImpureCallExpr extends Expr implements VirtualNode
 {
@@ -14,7 +13,6 @@ public function __construct(
 		public Expr $callExpr,
 		public Expr $impactedExpr,
 		private string $callDescription,
-		private Type $declaredReturnType,
 	)
 	{
 		parent::__construct([]);
@@ -25,11 +23,6 @@ public function getCallDescription(): string
 		return $this->callDescription;
 	}
 
-	public function getDeclaredReturnType(): Type
-	{
-		return $this->declaredReturnType;
-	}
-
 	#[Override]
 	public function getType(): string
 	{

src/Rules/Comparison/MatchExpressionRule.php

@@ -117,10 +117,8 @@ public function processNode(Node $node, Scope $scope): array
 				);
 				$errorBuilder = RuleErrorBuilder::message($message)
 					->line($armLine)
-					->identifier('match.alwaysTrue');
-				if (!$errorBuilder->hasTips()) {
-					$errorBuilder->tip('Remove remaining cases below this one and this error will disappear too.');
-				}
+					->identifier('match.alwaysTrue')
+					->tip('Remove remaining cases below this one and this error will disappear too.');
 				$this->possiblyImpureTipHelper->addTip($armConditionScope, $armConditionExpr, $errorBuilder);
 				$errors[] = $errorBuilder->build();
 			}

src/Rules/Comparison/PossiblyImpureTipHelper.php

@@ -30,9 +30,6 @@ public function addTip(
 		if (!$this->possiblyImpureTip) {
 			return $ruleErrorBuilder;
 		}
-		if ($ruleErrorBuilder->hasTips()) {
-			return $ruleErrorBuilder;
-		}
 		if (!$scope instanceof MutatingScope) {
 			return $ruleErrorBuilder;
 		}

src/Rules/RuleErrorBuilder.php

@@ -241,11 +241,6 @@ public function possiblyImpureTip(array $callDescriptions): self
 		return $this;
 	}
 
-	public function hasTips(): bool
-	{
-		return count($this->tips) > 0;
-	}
-
 	/**
 	 * Sets an error identifier.
 	 *