fix: resolve static/self/parent relative to @param-closure-this bound class

src/Analyser/MutatingScope.php

@@ -2020,7 +2020,7 @@ public function restoreThis(self $restoreThisScope): self
 			$expressionTypes,
 			$nativeExpressionTypes,
 			$this->conditionalExpressions,
-			$this->inClosureBindScopeClasses,
+			$restoreThisScope->inClosureBindScopeClasses,
 			$this->anonymousFunctionReflection,
 			$this->inFirstLevelStatement,
 			[],
@@ -2059,6 +2059,31 @@ public function isInClosureBind(): bool
 		return $this->inClosureBindScopeClasses !== [];
 	}
 
+	/**
+	 * @param list<non-empty-string> $scopeClasses
+	 */
+	public function withClosureBindScopeClasses(array $scopeClasses): self
+	{
+		return $this->scopeFactory->create(
+			$this->context,
+			$this->isDeclareStrictTypes(),
+			$this->getFunction(),
+			$this->getNamespace(),
+			$this->expressionTypes,
+			$this->nativeExpressionTypes,
+			$this->conditionalExpressions,
+			$scopeClasses,
+			$this->anonymousFunctionReflection,
+			$this->isInFirstLevelStatement(),
+			$this->currentlyAssignedExpressions,
+			$this->currentlyAllowedUndefinedExpressions,
+			$this->inFunctionCallsStack,
+			$this->afterExtractCall,
+			$this->parentScope,
+			$this->nativeTypesPromoted,
+		);
+	}
+
 	/**
 	 * @api
 	 * @param ParameterReflection[]|null $callableParameters
@@ -2397,6 +2422,23 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
 				false,
 			)), new AccessoryArrayListType()]);
 		}
+		if (
+			$type instanceof Name
+			&& $this->inClosureBindScopeClasses !== []
+			&& $this->inClosureBindScopeClasses !== ['static']
+			&& in_array($type->toLowerString(), ['static', 'self', 'parent'], true)
+			&& $this->reflectionProvider->hasClass($this->inClosureBindScopeClasses[0])
+		) {
+			return $this->initializerExprTypeResolver->getFunctionType(
+				$type,
+				$isNullable,
+				false,
+				InitializerExprContext::fromClassReflection(
+					$this->reflectionProvider->getClass($this->inClosureBindScopeClasses[0]),
+				),
+			);
+		}
+
 		return $this->initializerExprTypeResolver->getFunctionType($type, $isNullable, false, InitializerExprContext::fromScope($this));
 	}
 

src/Analyser/NodeScopeResolver.php

@@ -3656,7 +3656,8 @@ public function processArgs(
 					$closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 					if ($closureThisType !== null) {
 						$restoreThisScope = $scopeToPass;
-						$scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
+						$scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
+							->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 					}
 				}
 
@@ -3722,7 +3723,8 @@ public function processArgs(
 				) {
 					$closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 					if ($closureThisType !== null) {
-						$scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
+						$scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
+							->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 					}
 				}
 

tests/PHPStan/Analyser/nsrt/param-closure-this.php

@@ -316,3 +316,31 @@ public function doFoo(): void
 	}
 
 }
+
+class StaticReturnClosureThis
+{
+
+	/**
+	 * @param-closure-this Foo $cb
+	 */
+	public function withFoo(callable $cb): void
+	{
+
+	}
+
+}
+
+class TestStaticResolutionInParamClosureThis
+{
+
+	public function test(StaticReturnClosureThis $o): void
+	{
+		$o->withFoo(function (): static {
+			assertType('ParamClosureThis\Foo', $this);
+			return $this;
+		});
+
+		$o->withFoo(fn (): static => $this);
+	}
+
+}