RestrictedMethodUsageExtension is called for static methods too

Author: ondrejmirtes

rules.neon

@@ -28,7 +28,6 @@ rules:
 	- PHPStan\Rules\Deprecations\AccessDeprecatedPropertyRule
 	- PHPStan\Rules\Deprecations\AccessDeprecatedStaticPropertyRule
 	- PHPStan\Rules\Deprecations\CallToDeprecatedFunctionRule
-	- PHPStan\Rules\Deprecations\CallToDeprecatedStaticMethodRule
 	- PHPStan\Rules\Deprecations\FetchingClassConstOfDeprecatedClassRule
 	- PHPStan\Rules\Deprecations\FetchingDeprecatedConstRule
 	- PHPStan\Rules\Deprecations\ImplementationOfDeprecatedInterfaceRule

src/Rules/Deprecations/CallToDeprecatedStaticMethodRule.php

@@ -28,6 +28,41 @@ public function isRestrictedMethodUsage(
 			return null;
 		}
 
+		if ($methodReflection->getDeclaringClass()->isDeprecated()) {
+			$class = $methodReflection->getDeclaringClass();
+			$classDescription = $class->getDeprecatedDescription();
+			if ($classDescription === null) {
+				return RestrictedUsage::create(
+					sprintf(
+						'Call to method %s() of deprecated %s %s.',
+						$methodReflection->getName(),
+						strtolower($methodReflection->getDeclaringClass()->getClassTypeDescription()),
+						$methodReflection->getDeclaringClass()->getName(),
+					),
+					sprintf(
+						'%s.deprecated%s',
+						$methodReflection->isStatic() ? 'staticMethod' : 'method',
+						$methodReflection->getDeclaringClass()->getClassTypeDescription(),
+					),
+				);
+			}
+
+			return RestrictedUsage::create(
+				sprintf(
+					"Call to method %s() of deprecated %s %s:\n%s",
+					$methodReflection->getName(),
+					strtolower($methodReflection->getDeclaringClass()->getClassTypeDescription()),
+					$methodReflection->getDeclaringClass()->getName(),
+					$classDescription,
+				),
+				sprintf(
+					'%s.deprecated%s',
+					$methodReflection->isStatic() ? 'staticMethod' : 'method',
+					$methodReflection->getDeclaringClass()->getClassTypeDescription(),
+				),
+			);
+		}
+
 		if (!$methodReflection->isDeprecated()->yes()) {
 			return null;
 		}
@@ -41,7 +76,7 @@ public function isRestrictedMethodUsage(
 					strtolower($methodReflection->getDeclaringClass()->getClassTypeDescription()),
 					$methodReflection->getDeclaringClass()->getName(),
 				),
-				'method.deprecated',
+				sprintf('%s.deprecated', $methodReflection->isStatic() ? 'staticMethod' : 'method'),
 			);
 		}
 
@@ -53,7 +88,7 @@ public function isRestrictedMethodUsage(
 				$methodReflection->getDeclaringClass()->getName(),
 				$description,
 			),
-			'method.deprecated',
+			sprintf('%s.deprecated', $methodReflection->isStatic() ? 'staticMethod' : 'method'),
 		);
 	}
 

src/Rules/Deprecations/RestrictedDeprecatedMethodUsageExtension.php

@@ -2,23 +2,19 @@
 
 namespace PHPStan\Rules\Deprecations;
 
+use PHPStan\Rules\RestrictedUsage\RestrictedStaticMethodUsageRule;
 use PHPStan\Rules\Rule;
-use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
 
 /**
- * @extends RuleTestCase<CallToDeprecatedStaticMethodRule>
+ * @extends RuleTestCase<RestrictedStaticMethodUsageRule>
  */
 class CallToDeprecatedStaticMethodRuleTest extends RuleTestCase
 {
 
 	protected function getRule(): Rule
 	{
-		return new CallToDeprecatedStaticMethodRule(
-			$this->createReflectionProvider(),
-			self::getContainer()->getByType(RuleLevelHelper::class),
-			new DeprecatedScopeHelper([new DefaultDeprecatedScopeResolver()]),
-		);
+		return self::getContainer()->getByType(RestrictedStaticMethodUsageRule::class);
 	}
 
 	public function testDeprecatedStaticMethodCall(): void
@@ -40,27 +36,19 @@ public function testDeprecatedStaticMethodCall(): void
 					9,
 				],
 				[
-					'Call to method foo() of deprecated class CheckDeprecatedStaticMethodCall\Foo.',
+					'Call to method foo() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBar.',
 					11,
 				],
 				[
-					'Call to method deprecatedFoo() of deprecated class CheckDeprecatedStaticMethodCall\Foo.',
-					12,
-				],
-				[
-					'Call to deprecated method deprecatedFoo() of class CheckDeprecatedStaticMethodCall\Foo.',
+					'Call to method deprecatedFoo() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBar.',
 					12,
 				],
 				[
-					'Call to method deprecatedFoo2() of deprecated class CheckDeprecatedStaticMethodCall\Foo.',
-					13,
-				],
-				[
-					'Call to deprecated method deprecatedFoo2() of class CheckDeprecatedStaticMethodCall\Foo.',
+					'Call to method deprecatedFoo2() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBar.',
 					13,
 				],
 				[
-					"Call to method foo() of deprecated class CheckDeprecatedStaticMethodCall\Foo:\nDo not touch this at all.",
+					"Call to method foo() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBaz:\nDo not touch this at all.",
 					15,
 				],
 				[
@@ -91,4 +79,12 @@ public function testDeprecatedStaticMethodCall(): void
 		);
 	}
 
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/../../../rules.neon',
+			...parent::getAdditionalConfigFiles(),
+		];
+	}
+
 }

tests/Rules/Deprecations/CallToDeprecatedStaticMethodRuleTest.php

@@ -52,6 +52,27 @@ public static function deprecatedFoo()
 class DeprecatedBar extends Foo
 {
 
+	public static function foo()
+	{
+
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public static function deprecatedFoo()
+	{
+
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public static function deprecatedFoo2()
+	{
+
+	}
+
 }
 
 /**
@@ -60,4 +81,9 @@ class DeprecatedBar extends Foo
 class DeprecatedBaz extends Foo
 {
 
+	public static function foo()
+	{
+
+	}
+
 }