Fixed native expression type for by-ref variable after closure

Author: ruudk

src/Analyser/MutatingScope.php

@@ -4000,6 +4000,7 @@ public function processClosureScope(
 		array $byRefUses
 	): self
 	{
+		$nativeExpressionTypes = $this->nativeExpressionTypes;
 		$variableTypes = $this->variableTypes;
 		if (count($byRefUses) === 0) {
 			return $this;
@@ -4014,6 +4015,7 @@ public function processClosureScope(
 
 			if (!$closureScope->hasVariableType($variableName)->yes()) {
 				$variableTypes[$variableName] = VariableTypeHolder::createYes(new NullType());
+				$nativeExpressionTypes[sprintf('$%s', $variableName)] = new NullType();
 				continue;
 			}
 
@@ -4028,6 +4030,7 @@ public function processClosureScope(
 			}
 
 			$variableTypes[$variableName] = VariableTypeHolder::createYes($variableType);
+			$nativeExpressionTypes[sprintf('$%s', $variableName)] = $variableType;
 		}
 
 		return $this->scopeFactory->create(
@@ -4043,7 +4046,7 @@ public function processClosureScope(
 			$this->anonymousFunctionReflection,
 			$this->inFirstLevelStatement,
 			[],
-			$this->nativeExpressionTypes,
+			$nativeExpressionTypes,
 			$this->inFunctionCallsStack,
 			$this->afterExtractCall,
 			$this->parentScope

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -5686,6 +5686,11 @@ public function dataBug4213(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4213.php');
 	}
 
+	public function dataBug4657(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4657.php');
+	}
+
 	/**
 	 * @dataProvider dataArrayFunctions
 	 * @param string $description
@@ -11306,6 +11311,7 @@ private function gatherAssertTypes(string $file): array
 	 * @dataProvider dataBug3558
 	 * @dataProvider dataBug3351
 	 * @dataProvider dataBug4213
+	 * @dataProvider dataBug4657
 	 * @param string $assertType
 	 * @param string $file
 	 * @param mixed ...$args

tests/PHPStan/Analyser/data/bug-4657.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Bug4657;
+
+use DateTime;
+use function PHPStan\Analyser\assertType;
+use function PHPStan\Analyser\assertNativeType;
+
+function (): void {
+	$value = null;
+	$other = null;
+	$callback = function () use (&$value, &$other) : void {
+		$value = new DateTime();
+	};
+	$callback();
+
+	assertType('DateTime|null', $value);
+	assertNativeType('DateTime|null', $value);
+
+	assertType('null', $other);
+	assertNativeType('null', $other);
+};

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -399,4 +399,11 @@ public function testBug2714(): void
 		$this->analyse([__DIR__ . '/data/bug-2714.php'], []);
 	}
 
+	public function testBug4657(): void
+	{
+		$this->checkAlwaysTrueCheckTypeFunctionCall = true;
+		$this->treatPhpDocTypesAsCertain = false;
+		$this->analyse([__DIR__ . '/data/bug-4657.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Comparison/data/bug-4657.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Bug4657;
+
+use DateTime;
+
+function (): void {
+	$value = null;
+	$callback = function () use (&$value) : void {
+		$value = new DateTime();
+	};
+	$callback();
+
+	assert(!is_null($value));
+};