FNSR

Author: ondrejmirtes

src/Analyser/Fiber/FiberNodeScopeResolver.php

@@ -10,6 +10,7 @@
 use PHPStan\Analyser\ExpressionResultStorage;
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
+use PHPStan\Analyser\NoopNodeCallback;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\ShouldNotHappenException;
 use function get_debug_type;
@@ -65,7 +66,7 @@ private function runFiberForNodeCallback(
 		}
 	}
 
-	protected function processPendingFibers(ExpressionResultStorage $storage, callable $nodeCallback): void
+	protected function processPendingFibers(ExpressionResultStorage $storage): void
 	{
 		foreach ($storage->pendingFibers as $pending) {
 			$request = $pending['request'];
@@ -78,12 +79,12 @@ protected function processPendingFibers(ExpressionResultStorage $storage, callab
 			$this->processExprNode(
 				new Node\Stmt\Expression($request->expr),
 				$request->expr,
-				$request->scope,
+				$request->scope->toMutatingScope(),
 				$storage,
-				$nodeCallback,
+				new NoopNodeCallback(),
 				ExpressionContext::createTopLevel(),
 			);
-			$this->processPendingFibers($storage, $nodeCallback);
+			$this->processPendingFibers($storage);
 
 			// Break and restart the loop since the array may have been modified
 			return;

src/Analyser/MutatingScope.php

@@ -27,6 +27,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\NodeFinder;
+use PHPStan\Analyser\Fiber\FiberScope;
 use PHPStan\Node\ExecutionEndNode;
 use PHPStan\Node\Expr\AlwaysRememberedExpr;
 use PHPStan\Node\Expr\ExistingArrayDimFetch;
@@ -247,6 +248,10 @@ public function __construct(
 
 	public function toFiberScope(): self
 	{
+		if (static::class === FiberScope::class) {
+			return $this;
+		}
+
 		return $this->scopeFactory->toFiberFactory()->create(
 			$this->context,
 			$this->isDeclareStrictTypes(),
@@ -267,7 +272,7 @@ public function toFiberScope(): self
 		);
 	}
 
-	protected function toMutatingScope(): self
+	public function toMutatingScope(): self
 	{
 		if (static::class === self::class) {
 			return $this;