Remember narrowed readonly types in anonymous functions

Author: staabm

src/Analyser/MutatingScope.php

@@ -3708,19 +3708,40 @@ private function enterAnonymousFunctionWithoutReflection(
 
 		foreach ($this->invalidateStaticExpressions($this->expressionTypes) as $exprString => $typeHolder) {
 			$expr = $typeHolder->getExpr();
-			if ($expr instanceof Variable) {
-				continue;
-			}
-			$variables = (new NodeFinder())->findInstanceOf([$expr], Variable::class);
-			if ($variables === [] && !$this->expressionTypeIsUnchangeable($typeHolder)) {
-				continue;
-			}
-			foreach ($variables as $variable) {
-				if (!is_string($variable->name)) {
-					continue 2;
+
+			if (
+				$expr instanceof PropertyFetch
+				&& $expr->name instanceof Node\Identifier
+				&& $expr->var instanceof Variable
+				&& is_string($expr->var->name)
+				&& $expr->var->name === 'this'
+				&& $this->phpVersion->supportsReadOnlyProperties()
+			) {
+				$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($expr, $this);
+				if ($propertyReflection === null) {
+					continue;
 				}
-				if (!array_key_exists($variable->name, $nonRefVariableNames)) {
-					continue 2;
+				$nativePropertyReflection = $propertyReflection->getNativeReflection();
+				if ($nativePropertyReflection === null || !$nativePropertyReflection->isReadOnly()) {
+					continue;
+				}
+			} else {
+				if ($expr instanceof Variable) {
+					continue;
+				}
+
+				$variables = (new NodeFinder())->findInstanceOf([$expr], Variable::class);
+				if ($variables === [] && !$this->expressionTypeIsUnchangeable($typeHolder)) {
+					continue;
+				}
+
+				foreach ($variables as $variable) {
+					if (!is_string($variable->name)) {
+						continue 2;
+					}
+					if (!array_key_exists($variable->name, $nonRefVariableNames)) {
+						continue 2;
+					}
 				}
 			}
 

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

@@ -0,0 +1,42 @@
+<?php
+
+namespace Bug13321;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	public function __construct(public readonly string $value)
+	{
+	}
+}
+
+class Bar
+{
+	public function __construct(
+		private readonly ?Foo $foo,
+		private ?Foo $writableFoo = null,
+	)
+	{
+	}
+
+	public function bar(): void
+	{
+		if ($this->foo === null) {
+			return;
+		}
+		if ($this->writableFoo === null) {
+			return;
+		}
+
+		$test = function () {
+			assertType(Foo::class, $this->foo);
+			assertType(Foo::class.'|null', $this->writableFoo);
+
+			echo $this->foo->value;
+		};
+
+		$test();
+	}
+
+}