Fix conditional types in PHPDocs from stubs for native functions

phpstan · Apr 3, 2024 · 8ae0b28 · 8ae0b28
1 parent 518d3a3
commit 8ae0b28
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/PhpDoc/ResolvedPhpDocBlock.php b/src/PhpDoc/ResolvedPhpDocBlock.php
@@ -281,14 +281,26 @@ public function changeParameterNamesByMapping(array $parameterNameMapping): self
 			return $this;
 		}
 
+		$mapParameterCb = static function (Type $type, callable $traverse) use ($parameterNameMapping): Type {
+			if ($type instanceof ConditionalTypeForParameter) {
+				$parameterName = substr($type->getParameterName(), 1);
+				if (array_key_exists($parameterName, $parameterNameMapping)) {
+					$type = $type->changeParameterName('$' . $parameterNameMapping[$parameterName]);
+				}
+			}
+
+			return $traverse($type);
+		};
+
 		$paramTags = $this->getParamTags();
 
 		$newParamTags = [];
 		foreach ($paramTags as $key => $paramTag) {
 			if (!array_key_exists($key, $parameterNameMapping)) {
 				continue;
 			}
-			$newParamTags[$parameterNameMapping[$key]] = $paramTag;
+			$transformedType = TypeTraverser::map($paramTag->getType(), $mapParameterCb);
+			$newParamTags[$parameterNameMapping[$key]] = $paramTag->withType($transformedType);
 		}
 
 		$paramOutTags = $this->getParamOutTags();
@@ -298,21 +310,14 @@ public function changeParameterNamesByMapping(array $parameterNameMapping): self
 			if (!array_key_exists($key, $parameterNameMapping)) {
 				continue;
 			}
-			$newParamOutTags[$parameterNameMapping[$key]] = $paramOutTag;
+
+			$transformedType = TypeTraverser::map($paramOutTag->getType(), $mapParameterCb);
+			$newParamOutTags[$parameterNameMapping[$key]] = $paramOutTag->withType($transformedType);
 		}
 
 		$returnTag = $this->getReturnTag();
 		if ($returnTag !== null) {
-			$transformedType = TypeTraverser::map($returnTag->getType(), static function (Type $type, callable $traverse) use ($parameterNameMapping): Type {
-				if ($type instanceof ConditionalTypeForParameter) {
-					$parameterName = substr($type->getParameterName(), 1);
-					if (array_key_exists($parameterName, $parameterNameMapping)) {
-						$type = $type->changeParameterName('$' . $parameterNameMapping[$parameterName]);
-					}
-				}
-
-				return $traverse($type);
-			});
+			$transformedType = TypeTraverser::map($returnTag->getType(), $mapParameterCb);
 			$returnTag = $returnTag->withType($transformedType);
 		}