Implicit inheritance for @param-closure-this

Author: ondrejmirtes

src/PhpDoc/ResolvedPhpDocBlock.php

@@ -843,10 +843,25 @@ private static function mergeOneParentParamTags(array $paramTags, self $parent,
 				if ($paramTags[$name]->isImmediatelyInvokedCallable()->maybe()) {
 					$paramTags[$name] = $paramTags[$name]->withImmediatelyInvokedCallable($parentParamTag->isImmediatelyInvokedCallable());
 				}
+				if (
+					$paramTags[$name]->getClosureThisType() === null
+					&& $parentParamTag->getClosureThisType() !== null
+				) {
+					$paramTags[$name] = $paramTags[$name]->withClosureThisType($phpDocBlock->transformConditionalReturnTypeWithParameterNameMapping($parentParamTag->getClosureThisType()));
+				}
 				continue;
 			}
 
-			$paramTags[$name] = self::resolveTemplateTypeInTag($parentParamTag, $phpDocBlock, TemplateTypeVariance::createContravariant());
+			$parentParamTag = $parentParamTag->withType($phpDocBlock->transformConditionalReturnTypeWithParameterNameMapping($parentParamTag->getType()));
+			if ($parentParamTag->getClosureThisType() !== null) {
+				$parentParamTag = $parentParamTag->withClosureThisType($phpDocBlock->transformConditionalReturnTypeWithParameterNameMapping($parentParamTag->getClosureThisType()));
+			}
+
+			$paramTags[$name] = self::resolveTemplateTypeInTag(
+				$parentParamTag,
+				$phpDocBlock,
+				TemplateTypeVariance::createContravariant(),
+			);
 		}
 
 		return $paramTags;

src/PhpDoc/Tag/ParamTag.php

@@ -41,14 +41,16 @@ public function withType(Type $type): TypedTag
 		return new self($type, $this->isVariadic, $this->immediatelyInvokedCallable, $this->closureThisType);
 	}
 
-	/**
-	 * @return self
-	 */
-	public function withImmediatelyInvokedCallable(TrinaryLogic $immediatelyInvokedCallable): TypedTag
+	public function withImmediatelyInvokedCallable(TrinaryLogic $immediatelyInvokedCallable): self
 	{
 		return new self($this->type, $this->isVariadic, $immediatelyInvokedCallable, $this->closureThisType);
 	}
 
+	public function withClosureThisType(Type $closureThisType): self
+	{
+		return new self($this->type, $this->isVariadic, $this->immediatelyInvokedCallable, $closureThisType);
+	}
+
 	public function getClosureThisType(): ?Type
 	{
 		return $this->closureThisType;

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

@@ -204,3 +204,115 @@ function (Bar $b): void {
 		assertType(Bar::class, $this);
 	});
 };
+
+class ImplicitInheritance extends Foo
+{
+
+	public function paramClosureClass(callable $cb)
+	{
+
+	}
+
+	public function paramClosureSelf(callable $cb)
+	{
+
+	}
+
+	public function paramClosureStatic(callable $cb)
+	{
+
+	}
+
+	public function paramClosureConditional(int $j, callable $ca)
+	{
+		// renamed parameter names
+	}
+
+	public function doFoo(): void
+	{
+		$this->paramClosureClass(function () {
+			assertType(Some::class, $this);
+		});
+		$this->paramClosureClass(static function () {
+			assertType('*ERROR*', $this);
+		});
+		$this->paramClosureSelf(function () use (&$a) {
+			assertType(Foo::class, $this);
+		});
+		$this->paramClosureStatic(function () use (&$a) {
+			assertType('static(ParamClosureThis\ImplicitInheritance)', $this);
+		});
+		$this->paramClosureConditional(1, function () {
+			assertType(Foo::class, $this);
+		});
+		$this->paramClosureConditional(2, function () {
+			assertType(Some::class, $this);
+		});
+		$this->paramClosureGenerics(\stdClass::class, function () {
+			assertType(\stdClass::class, $this);
+		});
+	}
+
+}
+
+class ImplicitInheritanceMoreComplicated extends Foo
+{
+
+	/**
+	 * @param callable $cb
+	 */
+	public function paramClosureClass(callable $cb)
+	{
+
+	}
+
+	/**
+	 * @param callable $cb
+	 */
+	public function paramClosureSelf(callable $cb)
+	{
+
+	}
+
+	/**
+	 * @param callable $cb
+	 */
+	public function paramClosureStatic(callable $cb)
+	{
+
+	}
+
+	/**
+	 * @param callable $ca
+	 */
+	public function paramClosureConditional(int $j, callable $ca)
+	{
+		// renamed parameter names
+	}
+
+	public function doFoo(): void
+	{
+		$this->paramClosureClass(function () {
+			assertType(Some::class, $this);
+		});
+		$this->paramClosureClass(static function () {
+			assertType('*ERROR*', $this);
+		});
+		$this->paramClosureSelf(function () use (&$a) {
+			assertType(Foo::class, $this);
+		});
+		$this->paramClosureStatic(function () use (&$a) {
+			assertType('static(ParamClosureThis\ImplicitInheritanceMoreComplicated)', $this);
+		});
+		$this->paramClosureConditional(1, function () {
+			assertType(Foo::class, $this);
+		});
+		$this->paramClosureConditional(2, function () {
+			assertType(Some::class, $this);
+		});
+		$this->paramClosureGenerics(\stdClass::class, function () {
+			assertType(\stdClass::class, $this);
+		});
+	}
+
+}