Restore original CallToDeprecatedStaticMethodRuleTest

Author: ondrejmirtes

phpstan-baseline.neon

@@ -24,6 +24,12 @@ parameters:
 			count: 1
 			path: tests/Rules/Deprecations/InstantiationOfDeprecatedClassRuleTest.php
 
+		-
+			message: '#^Accessing PHPStan\\Rules\\Methods\\CallStaticMethodsRule\:\: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/RestrictedDeprecatedClassNameUsageExtensionTest.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

src/Rules/Deprecations/RestrictedDeprecatedClassNameUsageExtension.php

@@ -203,6 +203,33 @@ public function isRestrictedClassNameUsage(
 			);
 		}
 
+		if ($location->value === ClassNameUsageLocation::STATIC_METHOD_CALL) {
+			$method = $location->getMethod();
+			if ($method !== null) {
+				if ($method->isDeprecated()->yes() || $method->getDeclaringClass()->isDeprecated()) {
+					return null;
+				}
+			}
+		}
+
+		if ($location->value === ClassNameUsageLocation::STATIC_PROPERTY_ACCESS) {
+			$property = $location->getProperty();
+			if ($property !== null) {
+				if ($property->isDeprecated()->yes() || $property->getDeclaringClass()->isDeprecated()) {
+					return null;
+				}
+			}
+		}
+
+		if ($location->value === ClassNameUsageLocation::CLASS_CONSTANT_ACCESS) {
+			$constant = $location->getClassConstant();
+			if ($constant !== null) {
+				if ($constant->isDeprecated()->yes() || $constant->getDeclaringClass()->isDeprecated()) {
+					return null;
+				}
+			}
+		}
+
 		if (!$this->bleedingEdge) {
 			return null;
 		}

tests/Rules/Deprecations/CallToDeprecatedStaticMethodRuleTest.php

@@ -36,21 +36,13 @@ public function testDeprecatedStaticMethodCall(): void
 					9,
 				],
 				[
-					'Call to method foo() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBar.',
-					11,
-				],
-				[
-					'Call to method deprecatedFoo() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBar.',
+					'Call to deprecated method deprecatedFoo() of class CheckDeprecatedStaticMethodCall\Foo.',
 					12,
 				],
 				[
-					'Call to method deprecatedFoo2() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBar.',
+					'Call to deprecated method deprecatedFoo2() of class CheckDeprecatedStaticMethodCall\Foo.',
 					13,
 				],
-				[
-					"Call to method foo() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBaz:\nDo not touch this at all.",
-					15,
-				],
 				[
 					"Call to deprecated method deprecatedWithDescription() of class CheckDeprecatedStaticMethodCall\Foo:\nThis is probably a singleton.",
 					16,
@@ -75,6 +67,10 @@ public function testDeprecatedStaticMethodCall(): void
 					'Call to deprecated method deprecatedOtherFoo() of class CheckDeprecatedStaticMethodCall\Child.',
 					77,
 				],
+				[
+					'Call to method doDeprecatedBar() of deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBar.',
+					81,
+				],
 			],
 		);
 	}

tests/Rules/Deprecations/RestrictedDeprecatedClassNameUsageExtensionTest.php

@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Deprecations;
+
+use PHPStan\Rules\Methods\CallStaticMethodsRule;
+use PHPStan\Rules\Rule;
+use PHPStan\Testing\RuleTestCase;
+
+/**
+ * @extends RuleTestCase<CallStaticMethodsRule>
+ */
+class RestrictedDeprecatedClassNameUsageExtensionTest extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		return self::getContainer()->getByType(CallStaticMethodsRule::class);
+	}
+
+	public function testStaticMethodCallOnDeprecatedSubclass(): void
+	{
+		require_once __DIR__ . '/data/call-to-deprecated-static-method-definition.php';
+
+		$this->analyse([__DIR__ . '/data/call-to-deprecated-static-method.php'], [
+			[
+				'Call to static method foo() on deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBar.',
+				11,
+			],
+			[
+				'Call to static method foo() on deprecated class CheckDeprecatedStaticMethodCall\DeprecatedBaz.',
+				15,
+			],
+		]);
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/../../../rules.neon',
+			...parent::getAdditionalConfigFiles(),
+		];
+	}
+
+}

tests/Rules/Deprecations/data/call-to-deprecated-static-method-definition.php

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

tests/Rules/Deprecations/data/call-to-deprecated-static-method.php

@@ -77,3 +77,5 @@ public static function foo()
 		static::deprecatedOtherFoo();
 	}
 }
+
+DeprecatedBar::doDeprecatedBar();