TooWideTypeCheck - do not report PHPDocs that are not subtype of native type

Author: ondrejmirtes

src/Rules/TooWideTypehints/TooWideTypeCheck.php

@@ -88,7 +88,7 @@ public function checkProperty(
 		$boolMessagePattern = '%s (%s) is never assigned %%s so the property type can be changed to %%s.';
 
 		if (!$phpDocPropertyType instanceof MixedType || $phpDocPropertyType->isExplicitMixed()) {
-			$phpDocPropertyType = TypeUtils::resolveLateResolvableTypes($phpDocPropertyType);
+			$phpDocPropertyType = TypeUtils::resolveLateResolvableTypes(TypehintHelper::decideType($nativePropertyType, $phpDocPropertyType));
 			$narrowedPhpDocType = $this->narrowType($phpDocPropertyType, $assignedType, $scope, false);
 			if (!$narrowedPhpDocType->equals($phpDocPropertyType)) {
 				$phpDocPropertyTypeDescription = $phpDocPropertyType->describe(VerbosityLevel::getRecommendedLevelByType($phpDocPropertyType));
@@ -178,7 +178,7 @@ public function checkFunctionReturnType(
 		$boolMessagePattern = sprintf('%s never returns %%s so the return type can be changed to %%s.', $functionDescription);
 
 		if (!$phpDocFunctionReturnType instanceof MixedType || $phpDocFunctionReturnType->isExplicitMixed()) {
-			$phpDocFunctionReturnType = TypeUtils::resolveLateResolvableTypes($phpDocFunctionReturnType);
+			$phpDocFunctionReturnType = TypeUtils::resolveLateResolvableTypes(TypehintHelper::decideType($nativeFunctionReturnType, $phpDocFunctionReturnType));
 
 			// Do not require to have @return null/true/false in descendant classes
 			if (

tests/PHPStan/Rules/TooWideTypehints/data/too-wide-property-type.php

@@ -85,3 +85,16 @@ public function doFoo(): void
 	}
 
 }
+
+class InvalidPhpDoc
+{
+
+	/** @var int|string */
+	private int $a;
+
+	public function doFoo(): void
+	{
+		$this->a = 1;
+	}
+
+}

tests/PHPStan/Rules/TooWideTypehints/data/tooWideMethodReturnType-private.php

@@ -123,3 +123,16 @@ private function conditionalType(int $flag)
 
 
 }
+
+class InvalidPhpDoc
+{
+
+	/**
+	 * @return int|string
+	 */
+	private function doFoo(): int
+	{
+		return 1;
+	}
+
+}