Merge branch refs/heads/1.12.x into 2.0.x

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -44,7 +44,6 @@
 use PHPStan\Node\Printer\ExprPrinter;
 use PHPStan\Node\PropertyAssignNode;
 use PHPStan\Parser\ArrayMapArgVisitor;
-use PHPStan\Parser\ImmediatelyInvokedClosureVisitor;
 use PHPStan\Parser\NewAssignedToPropertyVisitor;
 use PHPStan\Parser\Parser;
 use PHPStan\Php\PhpVersion;
@@ -4760,7 +4759,6 @@ private function processFinallyScopeVariableTypeHolders(
 	 * @param Node\ClosureUse[] $byRefUses
 	 */
 	public function processClosureScope(
-		Expr\Closure $expr,
 		self $closureScope,
 		?self $prevScope,
 		array $byRefUses,
@@ -4793,9 +4791,7 @@ public function processClosureScope(
 				$prevVariableType = $prevScope->getVariableType($variableName);
 				if (!$variableType->equals($prevVariableType)) {
 					$variableType = TypeCombinator::union($variableType, $prevVariableType);
-					if ($expr->getAttribute(ImmediatelyInvokedClosureVisitor::ATTRIBUTE_NAME) !== true) {
-						$variableType = self::generalizeType($variableType, $prevVariableType, 0);
-					}
+					$variableType = self::generalizeType($variableType, $prevVariableType, 0);
 				}
 			}
 

src/Analyser/NodeScopeResolver.php

@@ -118,6 +118,7 @@
 use PHPStan\Node\VarTagChangedExpressionTypeNode;
 use PHPStan\Parser\ArrowFunctionArgVisitor;
 use PHPStan\Parser\ClosureArgVisitor;
+use PHPStan\Parser\ImmediatelyInvokedClosureVisitor;
 use PHPStan\Parser\Parser;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDoc\PhpDocInheritanceResolver;
@@ -4228,7 +4229,7 @@ private function processClosureNode(
 		}
 
 		$closureScope = $scope->enterAnonymousFunction($expr, $callableParameters);
-		$closureScope = $closureScope->processClosureScope($expr, $scope, null, $byRefUses);
+		$closureScope = $closureScope->processClosureScope($scope, null, $byRefUses);
 		$closureType = $closureScope->getAnonymousFunctionReflection();
 		if (!$closureType instanceof ClosureType) {
 			throw new ShouldNotHappenException();
@@ -4273,6 +4274,7 @@ private function processClosureNode(
 
 			$gatheredReturnStatements[] = new ReturnStatement($scope, $node);
 		};
+
 		if (count($byRefUses) === 0) {
 			$statementResult = $this->processStmtNodes($expr, $expr->stmts, $closureScope, $closureStmtsCallback, StatementContext::createTopLevel());
 			$nodeCallback(new ClosureReturnStatementsNode(
@@ -4288,6 +4290,7 @@ private function processClosureNode(
 		}
 
 		$count = 0;
+		$closureResultScope = null;
 		do {
 			$prevScope = $closureScope;
 
@@ -4297,8 +4300,15 @@ private function processClosureNode(
 			foreach ($intermediaryClosureScopeResult->getExitPoints() as $exitPoint) {
 				$intermediaryClosureScope = $intermediaryClosureScope->mergeWith($exitPoint->getScope());
 			}
+
+			if ($expr->getAttribute(ImmediatelyInvokedClosureVisitor::ATTRIBUTE_NAME) === true) {
+				$closureResultScope = $intermediaryClosureScope;
+				break;
+			}
+
 			$closureScope = $scope->enterAnonymousFunction($expr, $callableParameters);
-			$closureScope = $closureScope->processClosureScope($expr, $intermediaryClosureScope, $prevScope, $byRefUses);
+			$closureScope = $closureScope->processClosureScope($intermediaryClosureScope, $prevScope, $byRefUses);
+
 			if ($closureScope->equals($prevScope)) {
 				break;
 			}
@@ -4308,6 +4318,10 @@ private function processClosureNode(
 			$count++;
 		} while ($count < self::LOOP_SCOPE_ITERATIONS);
 
+		if ($closureResultScope === null) {
+			$closureResultScope = $closureScope;
+		}
+
 		$statementResult = $this->processStmtNodes($expr, $expr->stmts, $closureScope, $closureStmtsCallback, StatementContext::createTopLevel());
 		$nodeCallback(new ClosureReturnStatementsNode(
 			$expr,
@@ -4318,7 +4332,7 @@ private function processClosureNode(
 			array_merge($statementResult->getImpurePoints(), $closureImpurePoints),
 		), $closureScope);
 
-		return new ProcessClosureResult($scope->processClosureScope($expr, $closureScope, null, $byRefUses), $statementResult->getThrowPoints(), $statementResult->getImpurePoints(), $invalidateExpressions);
+		return new ProcessClosureResult($scope->processClosureScope($closureResultScope, null, $byRefUses), $statementResult->getThrowPoints(), $statementResult->getImpurePoints(), $invalidateExpressions);
 	}
 
 	/**

tests/PHPStan/Analyser/nsrt/bug-11561.php

@@ -12,13 +12,13 @@ function main(mixed $c): void{
 	assertType('array{date: DateTime, id: 1}', $c);
 
 	$x = (function() use (&$c) {
-		assertType("array{date: DateTime, id: 1, name?: 'ruud'}", $c);
+		assertType("array{date: DateTime, id: 1}", $c);
 		$c['name'] = 'ruud';
 		assertType("array{date: DateTime, id: 1, name: 'ruud'}", $c);
 		return 'x';
 	})();
 
-	assertType("array{date: DateTime, id: 1, name?: 'ruud'}", $c);
+	assertType("array{date: DateTime, id: 1, name: 'ruud'}", $c);
 }
 
 
@@ -30,11 +30,51 @@ function main2(mixed $c): void{
 	assertType("array{date: DateTime, id: 1, name: 'staabm'}", $c);
 
 	$x = (function() use (&$c) {
-		assertType("array{date: DateTime, id: 1, name: 'ruud'|'staabm'}", $c);
+		assertType("array{date: DateTime, id: 1, name: 'staabm'}", $c);
 		$c['name'] = 'ruud';
 		assertType("array{date: DateTime, id: 1, name: 'ruud'}", $c);
 		return 'x';
 	})();
 
+	assertType("array{date: DateTime, id: 1, name: 'ruud'}", $c);
+}
+
+/** @param array{date: DateTime} $c */
+function main3(mixed $c): void{
+	assertType('array{date: DateTime}', $c);
+	$c['id']=1;
+	$c['name'] = 'staabm';
+	assertType("array{date: DateTime, id: 1, name: 'staabm'}", $c);
+
+	$x = (function() use (&$c) {
+		assertType("array{date: DateTime, id: 1, name: 'staabm'}", $c);
+		if (rand(0,1)) {
+			$c['name'] = 'ruud';
+		}
+		assertType("array{date: DateTime, id: 1, name: 'ruud'|'staabm'}", $c);
+		return 'x';
+	})();
+
+	assertType("array{date: DateTime, id: 1, name: 'ruud'|'staabm'}", $c);
+}
+
+/** @param array{date: DateTime} $c */
+function main4(mixed $c): void{
+	assertType('array{date: DateTime}', $c);
+	$c['id']=1;
+	$c['name'] = 'staabm';
+	assertType("array{date: DateTime, id: 1, name: 'staabm'}", $c);
+
+	$x = (function() use (&$c) {
+		assertType("array{date: DateTime, id: 1, name: 'staabm'}", $c);
+		if (rand(0,1)) {
+			$c['name'] = 'ruud';
+			assertType("array{date: DateTime, id: 1, name: 'ruud'}", $c);
+			return 'y';
+		}
+		assertType("array{date: DateTime, id: 1, name: 'staabm'}", $c);
+		return 'x';
+	})();
+
 	assertType("array{date: DateTime, id: 1, name: 'ruud'|'staabm'}", $c);
 }