Fix NewHandler

Author: ondrejmirtes

src/Analyser/Generator/ExprHandler/NewHandler.php

@@ -173,6 +173,7 @@ public function analyseExpr(
 
 		if ($constructorReflection !== null) {
 			$storage = yield new PersistStorageRequest();
+			yield new RestoreStorageRequest($storage);
 			$parametersAcceptor = (yield new RunInFiberRequest(static fn () => ParametersAcceptorSelector::selectFromArgs(
 				$scope,
 				$expr->getArgs(),
@@ -230,6 +231,7 @@ private function processAnonymousClass(
 		if ($classReflection->hasConstructor()) {
 			$constructorReflection = $classReflection->getConstructor();
 			$storage = yield new PersistStorageRequest();
+			yield new RestoreStorageRequest($storage);
 			$parametersAcceptor = (yield new RunInFiberRequest(static fn () => ParametersAcceptorSelector::selectFromArgs(
 				$scope,
 				$expr->getArgs(),
@@ -397,6 +399,7 @@ private function exactInstantiation(GeneratorScope $scope, New_ $node, Name $cla
 		);
 
 		$storage = yield new PersistStorageRequest();
+		yield new RestoreStorageRequest($storage);
 		$parametersAcceptor = (yield new RunInFiberRequest(static fn () => ParametersAcceptorSelector::selectFromArgs(
 			$scope,
 			$methodCall->getArgs(),
@@ -424,8 +427,6 @@ private function exactInstantiation(GeneratorScope $scope, New_ $node, Name $cla
 			}
 		}
 
-		yield new RestoreStorageRequest($storage);
-
 		if (count($resolvedTypes) > 0) {
 			return TypeCombinator::union(...$resolvedTypes);
 		}
@@ -435,6 +436,8 @@ private function exactInstantiation(GeneratorScope $scope, New_ $node, Name $cla
 			return $methodResult;
 		}
 
+		yield new RestoreStorageRequest($storage);
+
 		$objectType = $isStatic ? new StaticType($classReflection) : new ObjectType($resolvedClassName, classReflection: $classReflection);
 		if (!$classReflection->isGeneric()) {
 			return $objectType;

tests/PHPStan/Analyser/Generator/data/gnsr.php

@@ -168,6 +168,6 @@ public function __construct($a)
 }
 
 function (): void {
-	//$foo = new FooGeneric(5);
-	//assertType('GeneratorNodeScopeResolverTest\\FooGeneric<int>', $foo);
+	$foo = new FooGeneric(5);
+	assertType('GeneratorNodeScopeResolverTest\\FooGeneric<int>', $foo);
 };