Prevent overly greedy $scope->getType() calls in NodeScopeResolver

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -1622,8 +1622,9 @@ private function ensureShallowNonNullability(MutatingScope $scope, Scope $origin
 		$exprTypeWithoutNull = TypeCombinator::removeNull($exprType);
 		if ($exprType->equals($exprTypeWithoutNull)) {
 			$originalExprType = $originalScope->getType($exprToSpecify);
-			$originalNativeType = $originalScope->getNativeType($exprToSpecify);
 			if (!$originalExprType->equals($exprTypeWithoutNull)) {
+				$originalNativeType = $originalScope->getNativeType($exprToSpecify);
+
 				return new EnsuredNonNullabilityResult($scope, [
 					new EnsuredNonNullabilityResultExpression($exprToSpecify, $originalExprType, $originalNativeType),
 				]);
@@ -2643,14 +2644,17 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 			$elseResult = $this->processExprNode($expr->else, $ifFalseScope, $nodeCallback, $context);
 			$throwPoints = array_merge($throwPoints, $elseResult->getThrowPoints());
 			$ifFalseScope = $elseResult->getScope();
-			$ifFalseType = $ifFalseScope->getType($expr->else);
 
 			if ($ifTrueType instanceof NeverType && $ifTrueType->isExplicit()) {
 				$finalScope = $ifFalseScope;
-			} elseif ($ifFalseType instanceof NeverType && $ifFalseType->isExplicit()) {
-				$finalScope = $ifTrueScope;
 			} else {
-				$finalScope = $ifTrueScope->mergeWith($ifFalseScope);
+				$ifFalseType = $ifFalseScope->getType($expr->else);
+
+				if ($ifFalseType instanceof NeverType && $ifFalseType->isExplicit()) {
+					$finalScope = $ifTrueScope;
+				} else {
+					$finalScope = $ifTrueScope->mergeWith($ifFalseScope);
+				}
 			}
 
 			return new ExpressionResult(