Fix transforming @param-closure-this when inherited from stubs for native functions

ondrejmirtes · ondrejmirtes · commit 3ef48831acf9 · 2024-04-03T11:55:47.000+02:00
diff --git a/src/PhpDoc/ResolvedPhpDocBlock.php b/src/PhpDoc/ResolvedPhpDocBlock.php
@@ -300,7 +300,12 @@ public function changeParameterNamesByMapping(array $parameterNameMapping): self
 				continue;
 			}
 			$transformedType = TypeTraverser::map($paramTag->getType(), $mapParameterCb);
-			$newParamTags[$parameterNameMapping[$key]] = $paramTag->withType($transformedType);
+			$paramTag = $paramTag->withType($transformedType);
+			if ($paramTag->getClosureThisType() !== null) {
+				$transformedClosureThisType = TypeTraverser::map($paramTag->getClosureThisType(), $mapParameterCb);
+				$paramTag = $paramTag->withClosureThisType($transformedClosureThisType);
+			}
+			$newParamTags[$parameterNameMapping[$key]] = $paramTag;
 		}
 
 		$paramOutTags = $this->getParamOutTags();

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,12 @@ public function changeParameterNamesByMapping(array $parameterNameMapping): self`
`300`	`300`	`continue;`
`301`	`301`	`}`
`302`	`302`	`$transformedType = TypeTraverser::map($paramTag->getType(), $mapParameterCb);`
`303`		`- $newParamTags[$parameterNameMapping[$key]] = $paramTag->withType($transformedType);`
	`303`	`+ $paramTag = $paramTag->withType($transformedType);`
	`304`	`+ if ($paramTag->getClosureThisType() !== null) {`
	`305`	`+ $transformedClosureThisType = TypeTraverser::map($paramTag->getClosureThisType(), $mapParameterCb);`
	`306`	`+ $paramTag = $paramTag->withClosureThisType($transformedClosureThisType);`
	`307`	`+ }`
	`308`	`+ $newParamTags[$parameterNameMapping[$key]] = $paramTag;`
`304`	`309`	`}`
`305`	`310`
`306`	`311`	`$paramOutTags = $this->getParamOutTags();`