Cleanup

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -1458,7 +1458,7 @@ protected function findSettledStoredResult(Expr $node): ?ExpressionResult
 			return null;
 		}
 
-		return $this->container->getByType(NodeScopeResolver::class)->findSettledExpressionResult($storage, $node);
+		return $storage->findExpressionResult($node);
 	}
 
 	public function getCurrentExpressionResultStorage(): ?ExpressionResultStorage

src/Analyser/NodeScopeResolver.php

@@ -204,30 +204,6 @@ public function processNodes(
 		}
 	}
 
-	/** The stored result an outside asker may consume. */
-	public function findSettledExpressionResult(ExpressionResultStorage $storage, Expr $expr): ?ExpressionResult
-	{
-		return $storage->findExpressionResult($expr);
-	}
-
-	/** An effect-free result carrying eagerly known types, positioned at the given scope. */
-	protected function createEagerExpressionResult(MutatingScope $scope, Expr $expr, Type $type, Type $nativeType): ExpressionResult
-	{
-		return $this->expressionResultFactory->create(
-			$scope,
-			beforeScope: $scope,
-			expr: $expr,
-			hasYield: false,
-			isAlwaysTerminating: false,
-			throwPoints: [],
-			impurePoints: [],
-			typeCallback: null,
-			specifyTypesCallback: SpecifiedTypes::emptySpecifyCallback(),
-			type: $type,
-			nativeType: $nativeType,
-		);
-	}
-
 	public function storeExpressionResult(ExpressionResultStorage $storage, Expr $expr, ExpressionResult $expressionResult): void
 	{
 		if (self::$guardNewWorld) {
@@ -506,7 +482,20 @@ public function processExprOnDemand(Expr $expr, MutatingScope $scope, Expression
 			ExprHandlerRegistry::resolve($expr, $this->container) === null
 			&& !($expr instanceof Expr\CallLike && $expr->isFirstClassCallable())
 		) {
-			return $this->createEagerExpressionResult($scope, $expr, new MixedType(), new MixedType());
+			$mixed = new MixedType();
+			return $this->expressionResultFactory->create(
+				$scope,
+				beforeScope: $scope,
+				expr: $expr,
+				hasYield: false,
+				isAlwaysTerminating: false,
+				throwPoints: [],
+				impurePoints: [],
+				typeCallback: null,
+				specifyTypesCallback: SpecifiedTypes::emptySpecifyCallback(),
+				type: $mixed,
+				nativeType: $mixed,
+			);
 		}
 
 		// save/restore, never reset: on-demand walks nest (a typeCallback
@@ -532,18 +521,6 @@ public function processExprOnDemand(Expr $expr, MutatingScope $scope, Expression
 		}
 	}
 
-	/**
-	 * Processes an expression for an independent analysis pass - a reflection-
-	 * level lazy computation that builds its own scope from scratch (e.g.
-	 * private property type inference from constructor assignments). Such a
-	 * pass legitimately prices real AST nodes outside the file's main walk,
-	 * on a fresh storage of its own.
-	 */
-	public function processIndependentPassExpr(Expr $expr, MutatingScope $scope): ExpressionResult
-	{
-		return $this->processExprOnDemand($expr, $scope, new ExpressionResultStorage());
-	}
-
 	/**
 	 * The stored ExpressionResult of a node processExprNode() already processed
 	 * into the given storage - the caller asserts the processing order by

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -7,6 +7,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\Namespace_;
+use PHPStan\Analyser\ExpressionResultStorage;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\OutOfClassScope;
 use PHPStan\Analyser\PhpDocsResolver;
@@ -1239,7 +1240,7 @@ private function inferAndCachePropertyTypes(
 
 			// an independent lazy pass on its own scope - never read through
 			// Scope::getType(), which is reserved for the file's main walk
-			$propertyType = $this->nodeScopeResolver->processIndependentPassExpr($expr->expr, $methodScope)->getType();
+			$propertyType = $this->nodeScopeResolver->processExprOnDemand($expr->expr, $methodScope, new ExpressionResultStorage())->getType();
 			if ($propertyType instanceof ErrorType || $propertyType instanceof NeverType) {
 				continue;
 			}