Merge branch 'main' into 2.x-formatter-generic

Author: mglaman

tests/src/DeprecatedScope/DeprecationHelperScopeTest.php

@@ -5,20 +5,15 @@
 namespace mglaman\PHPStanDrupal\Tests\DeprecatedScope;
 
 use mglaman\PHPStanDrupal\Tests\DrupalRuleTestCase;
-use PHPStan\Rules\Deprecations\CallToDeprecatedFunctionRule;
-use PHPStan\Rules\Deprecations\DeprecatedScopeHelper;
+use PHPStan\Rules\RestrictedUsage\RestrictedFunctionUsageRule;
 use PHPStan\Rules\Rule;
 
 final class DeprecationHelperScopeTest extends DrupalRuleTestCase {
 
     protected function getRule(): Rule
     {
         /** @phpstan-ignore phpstanApi.constructor */
-        return new CallToDeprecatedFunctionRule(
-            self::createReflectionProvider(),
-            /** @phpstan-ignore phpstanApi.classConstant */
-            self::getContainer()->getByType(DeprecatedScopeHelper::class)
-        );
+        return self::getContainer()->getByType(RestrictedFunctionUsageRule::class);
     }
 
     public function testCustomScope(): void

tests/src/DeprecatedScope/GlobalLegacyScopeTest.php

@@ -5,20 +5,14 @@
 namespace mglaman\PHPStanDrupal\Tests\DeprecatedScope;
 
 use mglaman\PHPStanDrupal\Tests\DrupalRuleTestCase;
-use PHPStan\Rules\Deprecations\CallToDeprecatedFunctionRule;
-use PHPStan\Rules\Deprecations\DeprecatedScopeHelper;
+use PHPStan\Rules\RestrictedUsage\RestrictedFunctionUsageRule;
 use PHPStan\Rules\Rule;
 
 final class GlobalLegacyScopeTest extends DrupalRuleTestCase {
 
     protected function getRule(): Rule
     {
-        /** @phpstan-ignore phpstanApi.constructor */
-        return new CallToDeprecatedFunctionRule(
-            self::createReflectionProvider(),
-            /** @phpstan-ignore phpstanApi.classConstant */
-            self::getContainer()->getByType(DeprecatedScopeHelper::class)
-        );
+        return self::getContainer()->getByType(RestrictedFunctionUsageRule::class);
     }
 
     public function testCustomScope(): void

tests/src/DeprecatedScope/IgnoreDeprecationsScopeTest.php

@@ -5,21 +5,15 @@
 namespace mglaman\PHPStanDrupal\Tests\DeprecatedScope;
 
 use mglaman\PHPStanDrupal\Tests\DrupalRuleTestCase;
-use PHPStan\Rules\Deprecations\CallToDeprecatedFunctionRule;
-use PHPStan\Rules\Deprecations\DeprecatedScopeHelper;
+use PHPStan\Rules\RestrictedUsage\RestrictedFunctionUsageRule;
 use PHPStan\Rules\Rule;
 use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 
 final class IgnoreDeprecationsScopeTest extends DrupalRuleTestCase {
 
     protected function getRule(): Rule
     {
-        /** @phpstan-ignore phpstanApi.constructor */
-        return new CallToDeprecatedFunctionRule(
-            self::createReflectionProvider(),
-            /** @phpstan-ignore phpstanApi.classConstant */
-            self::getContainer()->getByType(DeprecatedScopeHelper::class)
-        );
+        return self::getContainer()->getByType(RestrictedFunctionUsageRule::class);
     }
 
     public function testCustomScope(): void

tests/src/Rules/RevisionableStorageInterfaceStubTest.php

@@ -5,8 +5,7 @@
 namespace mglaman\PHPStanDrupal\Tests\Rules;
 
 use mglaman\PHPStanDrupal\Tests\DrupalRuleTestCase;
-use PHPStan\Rules\Deprecations\CallToDeprecatedMethodRule;
-use PHPStan\Rules\Deprecations\DeprecatedScopeHelper;
+use PHPStan\Rules\RestrictedUsage\RestrictedMethodUsageRule;
 use PHPStan\Rules\Rule;
 
 final class RevisionableStorageInterfaceStubTest extends DrupalRuleTestCase
@@ -15,11 +14,7 @@ final class RevisionableStorageInterfaceStubTest extends DrupalRuleTestCase
     protected function getRule(): Rule
     {
         /** @phpstan-ignore phpstanApi.constructor */
-        return new CallToDeprecatedMethodRule(
-            self::createReflectionProvider(),
-            /** @phpstan-ignore phpstanApi.classConstant */
-            self::getContainer()->getByType(DeprecatedScopeHelper::class)
-        );
+        return self::getContainer()->getByType(RestrictedMethodUsageRule::class);
     }
 
     public function testRule(): void