Replace TypeHintDeprecated*Rule with RestrictedDeprecatedClassNameUsageExtension

Author: ondrejmirtes

phpstan-baseline.neon

@@ -30,6 +30,24 @@ parameters:
 			count: 1
 			path: tests/Rules/Deprecations/RestrictedDeprecatedClassNameUsageExtensionTest.php
 
+		-
+			message: '#^Accessing PHPStan\\Rules\\Methods\\ExistingClassesInTypehintsRule\:\:class is not covered by backward compatibility promise\. The class might change in a minor PHPStan version\.$#'
+			identifier: phpstanApi.classConstant
+			count: 1
+			path: tests/Rules/Deprecations/TypeHintDeprecatedInClassMethodSignatureRuleTest.php
+
+		-
+			message: '#^Accessing PHPStan\\Rules\\Functions\\ExistingClassesInClosureTypehintsRule\:\:class is not covered by backward compatibility promise\. The class might change in a minor PHPStan version\.$#'
+			identifier: phpstanApi.classConstant
+			count: 1
+			path: tests/Rules/Deprecations/TypeHintDeprecatedInClosureSignatureRuleTest.php
+
+		-
+			message: '#^Accessing PHPStan\\Rules\\Functions\\ExistingClassesInTypehintsRule\:\:class is not covered by backward compatibility promise\. The class might change in a minor PHPStan version\.$#'
+			identifier: phpstanApi.classConstant
+			count: 1
+			path: tests/Rules/Deprecations/TypeHintDeprecatedInFunctionSignatureRuleTest.php
+
 		-
 			message: '#^Accessing PHPStan\\Rules\\Classes\\ExistingClassInTraitUseRule\:\:class is not covered by backward compatibility promise\. The class might change in a minor PHPStan version\.$#'
 			identifier: phpstanApi.classConstant

rules.neon

@@ -2,9 +2,6 @@ parameters:
 	deprecationRulesInstalled: true
 
 services:
-	-
-		class: PHPStan\Rules\Deprecations\DeprecatedClassHelper
-
 	-
 		class: PHPStan\DependencyInjection\LazyDeprecatedScopeResolverProvider
 	-
@@ -37,9 +34,6 @@ rules:
 	- PHPStan\Rules\Deprecations\CallToDeprecatedFunctionRule
 	- PHPStan\Rules\Deprecations\FetchingClassConstOfDeprecatedClassRule
 	- PHPStan\Rules\Deprecations\FetchingDeprecatedConstRule
-	- PHPStan\Rules\Deprecations\TypeHintDeprecatedInClassMethodSignatureRule
-	- PHPStan\Rules\Deprecations\TypeHintDeprecatedInClosureSignatureRule
-	- PHPStan\Rules\Deprecations\TypeHintDeprecatedInFunctionSignatureRule
 	- PHPStan\Rules\Deprecations\UsageOfDeprecatedCastRule
 
 conditionalTags:

src/Rules/Deprecations/DeprecatedClassHelper.php

@@ -8,6 +8,7 @@
 use PHPStan\Rules\ClassNameUsageLocation;
 use PHPStan\Rules\RestrictedUsage\RestrictedClassNameUsageExtension;
 use PHPStan\Rules\RestrictedUsage\RestrictedUsage;
+use function rtrim;
 use function sprintf;
 use function strtolower;
 
@@ -226,6 +227,19 @@ public function isRestrictedClassNameUsage(
 			return $defaultUsage;
 		}
 
+		if ($location->value === ClassNameUsageLocation::PARAMETER_TYPE || $location->value === ClassNameUsageLocation::RETURN_TYPE) {
+			$message = $location->createMessage(
+				sprintf('deprecated %s %s', strtolower($classReflection->getClassTypeDescription()), $classReflection->getDisplayName()),
+			);
+			if ($classReflection->getDeprecatedDescription() !== null) {
+				$message = rtrim($message, '.') . ":\n" . $classReflection->getDeprecatedDescription();
+			}
+			return RestrictedUsage::create(
+				$message,
+				$location->createIdentifier($identifierPart),
+			);
+		}
+
 		if (!$this->bleedingEdge) {
 			return null;
 		}