FNSR ExpressionResultStorage

build/PHPStan/Build/FinalClassRule.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Modifiers;
 use PhpParser\Node;
+use PHPStan\Analyser\MutatingScope;
+use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\Scope;
 use PHPStan\File\FileHelper;
 use PHPStan\Node\InClassNode;
@@ -55,6 +57,8 @@ public function processNode(Node $node, Scope $scope): array
 			ExtendedFunctionVariant::class,
 			DummyParameter::class,
 			PhpFunctionFromParserNodeReflection::class,
+			NodeScopeResolver::class,
+			MutatingScope::class,
 		], true)) {
 			return [];
 		}

conf/config.neon

@@ -238,6 +238,7 @@ extensions:
 	autowiredAttributeServices: PHPStan\DependencyInjection\AutowiredAttributeServicesExtension
 	validateServiceTags: PHPStan\DependencyInjection\ValidateServiceTagsExtension
 	gnsr: PHPStan\DependencyInjection\GnsrExtension
+	fnsr: PHPStan\DependencyInjection\FnsrExtension
 
 autowiredAttributeServices:
 	level: null

src/Analyser/AnalyserResultFinalizer.php

@@ -118,11 +118,11 @@ public function finalize(AnalyserResult $analyserResult, bool $onlyFiles, bool $
 			$linesToIgnore = $allLinesToIgnore[$file] ?? [];
 			$unmatchedLineIgnores = $allUnmatchedLineIgnores[$file] ?? [];
 			$localIgnoresProcessorResult = $this->localIgnoresProcessor->process(
-				[$tempCollectorError],
+				[[$tempCollectorError, 0]],
 				$linesToIgnore,
 				$unmatchedLineIgnores,
 			);
-			foreach ($localIgnoresProcessorResult->getFileErrors() as $error) {
+			foreach ($localIgnoresProcessorResult->getFileErrors() as [$error]) {
 				$errors[] = $error;
 				$collectorErrors[] = $error;
 			}

src/Analyser/DirectInternalScopeFactory.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Analyser;
 
 use PhpParser\Node;
+use PHPStan\Analyser\Fiber\FiberScope;
 use PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider;
 use PHPStan\DependencyInjection\Type\ExpressionTypeResolverExtensionRegistryProvider;
 use PHPStan\Node\Printer\ExprPrinter;
@@ -38,6 +39,7 @@ public function __construct(
 		private int|array|null $configPhpVersion,
 		private $nodeCallback,
 		private ConstantResolver $constantResolver,
+		private bool $fiber = false,
 	)
 	{
 	}
@@ -61,7 +63,12 @@ public function create(
 		bool $nativeTypesPromoted = false,
 	): MutatingScope
 	{
-		return new MutatingScope(
+		$className = MutatingScope::class;
+		if ($this->fiber) {
+			$className = FiberScope::class;
+		}
+
+		return new $className(
 			$this,
 			$this->reflectionProvider,
 			$this->initializerExprTypeResolver,
@@ -97,4 +104,48 @@ public function create(
 		);
 	}
 
+	public function toFiberFactory(): InternalScopeFactory
+	{
+		return new self(
+			$this->reflectionProvider,
+			$this->initializerExprTypeResolver,
+			$this->dynamicReturnTypeExtensionRegistryProvider,
+			$this->expressionTypeResolverExtensionRegistryProvider,
+			$this->exprPrinter,
+			$this->typeSpecifier,
+			$this->propertyReflectionFinder,
+			$this->parser,
+			$this->nodeScopeResolver,
+			$this->richerScopeGetTypeHelper,
+			$this->phpVersion,
+			$this->attributeReflectionFactory,
+			$this->configPhpVersion,
+			$this->nodeCallback,
+			$this->constantResolver,
+			true,
+		);
+	}
+
+	public function toMutatingFactory(): InternalScopeFactory
+	{
+		return new self(
+			$this->reflectionProvider,
+			$this->initializerExprTypeResolver,
+			$this->dynamicReturnTypeExtensionRegistryProvider,
+			$this->expressionTypeResolverExtensionRegistryProvider,
+			$this->exprPrinter,
+			$this->typeSpecifier,
+			$this->propertyReflectionFinder,
+			$this->parser,
+			$this->nodeScopeResolver,
+			$this->richerScopeGetTypeHelper,
+			$this->phpVersion,
+			$this->attributeReflectionFactory,
+			$this->configPhpVersion,
+			$this->nodeCallback,
+			$this->constantResolver,
+			false,
+		);
+	}
+
 }

src/Analyser/ExpressionResult.php

@@ -23,6 +23,7 @@ final class ExpressionResult
 	 */
 	public function __construct(
 		private MutatingScope $scope,
+		private MutatingScope $beforeScope,
 		private bool $hasYield,
 		private bool $isAlwaysTerminating,
 		private array $throwPoints,
@@ -40,6 +41,11 @@ public function getScope(): MutatingScope
 		return $this->scope;
 	}
 
+	public function getBeforeScope(): MutatingScope
+	{
+		return $this->beforeScope;
+	}
+
 	public function hasYield(): bool
 	{
 		return $this->hasYield;

src/Analyser/ExpressionResultStorage.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser;
+
+use Fiber;
+use PhpParser\Node\Expr;
+use PHPStan\Analyser\Fiber\ExpressionAnalysisRequest;
+use PHPStan\ShouldNotHappenException;
+use SplObjectStorage;
+use function get_class;
+use function sprintf;
+
+final class ExpressionResultStorage
+{
+
+	/** @var SplObjectStorage<Expr, ExpressionResult> */
+	private SplObjectStorage $results;
+
+	/** @var array<array{fiber: Fiber<mixed, ExpressionResult, null, ExpressionAnalysisRequest>, request: ExpressionAnalysisRequest}> */
+	public array $pendingFibers = [];
+
+	public function __construct()
+	{
+		$this->results = new SplObjectStorage();
+	}
+
+	public function duplicate(): self
+	{
+		$new = new self();
+		$new->results->addAll($this->results);
+		return $new;
+	}
+
+	public function storeResult(Expr $expr, ExpressionResult $result): void
+	{
+		if (isset($this->results[$expr])) {
+			throw new ShouldNotHappenException(sprintf('already stored %s on line %d', get_class($expr), $expr->getStartLine()));
+		}
+		$this->results[$expr] = $result;
+	}
+
+	public function findResult(Expr $expr): ?ExpressionResult
+	{
+		return $this->results[$expr] ?? null;
+	}
+
+}

src/Analyser/Fiber/ExpressionAnalysisRequest.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser\Fiber;
+
+use PhpParser\Node\Expr;
+use PHPStan\Analyser\MutatingScope;
+
+final class ExpressionAnalysisRequest
+{
+
+	public function __construct(public readonly Expr $expr, public readonly MutatingScope $scope)
+	{
+	}
+
+}

src/Analyser/Fiber/FiberNodeScopeResolver.php

@@ -0,0 +1,132 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser\Fiber;
+
+use Fiber;
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PHPStan\Analyser\ExpressionContext;
+use PHPStan\Analyser\ExpressionResult;
+use PHPStan\Analyser\ExpressionResultStorage;
+use PHPStan\Analyser\MutatingScope;
+use PHPStan\Analyser\NodeScopeResolver;
+use PHPStan\Analyser\NoopNodeCallback;
+use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\ShouldNotHappenException;
+use function get_class;
+use function get_debug_type;
+use function sprintf;
+
+#[AutowiredService(as: FiberNodeScopeResolver::class)]
+final class FiberNodeScopeResolver extends NodeScopeResolver
+{
+
+	/**
+	 * @param callable(Node $node, Scope $scope): void $nodeCallback
+	 */
+	protected function callNodeCallback(
+		callable $nodeCallback,
+		Node $node,
+		MutatingScope $scope,
+		ExpressionResultStorage $storage,
+	): void
+	{
+		$fiber = new Fiber(static function () use ($node, $scope, $nodeCallback) {
+			$nodeCallback($node, $scope->toFiberScope());
+		});
+		$request = $fiber->start();
+		$this->runFiberForNodeCallback($storage, $fiber, $request);
+	}
+
+	/**
+	 * @param Fiber<mixed, ExpressionResult, null, ExpressionAnalysisRequest> $fiber
+	 */
+	private function runFiberForNodeCallback(
+		ExpressionResultStorage $storage,
+		Fiber $fiber,
+		?ExpressionAnalysisRequest $request,
+	): void
+	{
+		while (!$fiber->isTerminated()) {
+			if ($request instanceof ExpressionAnalysisRequest) {
+				$result = $storage->findResult($request->expr);
+				if ($result !== null) {
+					$request = $fiber->resume($result);
+					continue;
+				}
+
+				$storage->pendingFibers[] = [
+					'fiber' => $fiber,
+					'request' => $request,
+				];
+				return;
+			}
+
+			throw new ShouldNotHappenException(
+				'Unknown fiber suspension: ' . get_debug_type($request),
+			);
+		}
+
+		if ($request !== null) {
+			throw new ShouldNotHappenException(
+				'Fiber terminated but we did not handle its request ' . get_debug_type($request),
+			);
+		}
+	}
+
+	protected function processPendingFibers(ExpressionResultStorage $storage): void
+	{
+		foreach ($storage->pendingFibers as $pending) {
+			$request = $pending['request'];
+			$result = $storage->findResult($request->expr);
+
+			if ($result !== null) {
+				throw new ShouldNotHappenException('Pending fibers at the end should be about synthetic nodes');
+			}
+
+			$this->processExprNode(
+				new Node\Stmt\Expression($request->expr),
+				$request->expr,
+				$request->scope->toMutatingScope(),
+				$storage,
+				new NoopNodeCallback(),
+				ExpressionContext::createTopLevel(),
+			);
+			if ($storage->findResult($request->expr) === null) {
+				throw new ShouldNotHappenException(sprintf('processExprNode should have stored the result of %s on line %s', get_class($request->expr), $request->expr->getStartLine()));
+			}
+			$this->processPendingFibers($storage);
+
+			// Break and restart the loop since the array may have been modified
+			return;
+		}
+	}
+
+	protected function processPendingFibersForRequestedExpr(ExpressionResultStorage $storage, Expr $expr, ExpressionResult $result): void
+	{
+		$restartLoop = true;
+
+		while ($restartLoop) {
+			$restartLoop = false;
+
+			foreach ($storage->pendingFibers as $key => $pending) {
+				$request = $pending['request'];
+				if ($request->expr !== $expr) {
+					continue;
+				}
+
+				unset($storage->pendingFibers[$key]);
+				$restartLoop = true;
+
+				$fiber = $pending['fiber'];
+				$request = $fiber->resume($result);
+				$this->runFiberForNodeCallback($storage, $fiber, $request);
+
+				// Break and restart the loop since the array may have been modified
+				break;
+			}
+		}
+	}
+
+}