more autowire

staabm · staabm · commit 8b2d4f156fa9 · 2025-05-25T15:43:40.000+02:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -913,15 +913,6 @@ services:
 		autowired:
 			- PHPStan\Rules\Exceptions\DefaultExceptionTypeResolver
 
-	-
-		class: PHPStan\Rules\Exceptions\MissingCheckedExceptionInFunctionThrowsRule
-
-	-
-		class: PHPStan\Rules\Exceptions\MissingCheckedExceptionInMethodThrowsRule
-
-	-
-		class: PHPStan\Rules\Exceptions\MissingCheckedExceptionInPropertyHookThrowsRule
-
 	-
 		class: PHPStan\Rules\Exceptions\MissingCheckedExceptionInThrowsCheck
 		arguments:
@@ -946,37 +937,17 @@ services:
 			checkClassCaseSensitivity: %checkClassCaseSensitivity%
 			checkThisOnly: %checkThisOnly%
 
-	-
-		class: PHPStan\Rules\FunctionReturnTypeCheck
-	-
-		class: PHPStan\Rules\ParameterCastableToStringCheck
-
-	-
-		class: PHPStan\Rules\Generics\CrossCheckInterfacesHelper
-
 	-
 		class: PHPStan\Rules\Generics\GenericAncestorsCheck
 		arguments:
 			skipCheckGenericClasses: %featureToggles.skipCheckGenericClasses%
 			checkMissingTypehints: %checkMissingTypehints%
 
-	-
-		class: PHPStan\Rules\Generics\GenericObjectTypeCheck
-
-	-
-		class: PHPStan\Rules\Generics\MethodTagTemplateTypeCheck
-
 	-
 		class: PHPStan\Rules\Generics\TemplateTypeCheck
 		arguments:
 			checkClassCaseSensitivity: %checkClassCaseSensitivity%
 
-	-
-		class: PHPStan\Rules\Generics\VarianceCheck
-
-	-
-		class: PHPStan\Rules\InternalTag\RestrictedInternalUsageHelper
-
 	-
 		class: PHPStan\Rules\IssetCheck
 		arguments:
@@ -1003,69 +974,30 @@ services:
 			reportMaybes: %reportMaybesInMethodSignatures%
 			reportStatic: %reportStaticMethodSignatures%
 
-	-
-		class: PHPStan\Rules\Methods\MethodParameterComparisonHelper
-
-	-
-		class: PHPStan\Rules\Methods\MethodVisibilityComparisonHelper
-
 	-
 		class: PHPStan\Rules\MissingTypehintCheck
 		arguments:
 			checkMissingCallableSignature: %checkMissingCallableSignature%
 			skipCheckGenericClasses: %featureToggles.skipCheckGenericClasses%
 
-	-
-		class: PHPStan\Rules\NullsafeCheck
-
-	-
-		class: PHPStan\Rules\Constants\LazyAlwaysUsedClassConstantsExtensionProvider
-
-	-
-		class: PHPStan\Rules\Methods\LazyAlwaysUsedMethodExtensionProvider
-
-	-
-		class: PHPStan\Rules\PhpDoc\ConditionalReturnTypeRuleHelper
-
 	-
 		class: PHPStan\Rules\PhpDoc\AssertRuleHelper
 		arguments:
 			checkMissingTypehints: %checkMissingTypehints%
 			checkClassCaseSensitivity: %checkClassCaseSensitivity%
 
-	-
-		class: PHPStan\Rules\PhpDoc\UnresolvableTypeHelper
-
-	-
-		class: PHPStan\Rules\PhpDoc\GenericCallableRuleHelper
-
-	-
-		class: PHPStan\Rules\PhpDoc\IncompatiblePhpDocTypeCheck
-
 	-
 		class: PHPStan\Rules\PhpDoc\VarTagTypeRuleHelper
 		arguments:
 			checkTypeAgainstPhpDocType: %reportWrongPhpDocTypeInVarTag%
 			strictWideningCheck: %reportAnyTypeWideningInVarTag%
 
-	-
-		class: PHPStan\Rules\Playground\NeverRuleHelper
-
 	-
 		class: PHPStan\Rules\Properties\AccessPropertiesCheck
 		arguments:
 			reportMagicProperties: %reportMagicProperties%
 			checkDynamicProperties: %checkDynamicProperties%
 
-	-
-		class: PHPStan\Rules\Properties\UninitializedPropertyRule
-
-	-
-		class: PHPStan\Rules\Properties\LazyReadWritePropertiesExtensionProvider
-
-	-
-		class: PHPStan\Rules\Properties\PropertyDescriptor
-
 	-
 		class: PHPStan\Rules\RuleLevelHelper
 		arguments:
diff --git a/src/Rules/Constants/LazyAlwaysUsedClassConstantsExtensionProvider.php b/src/Rules/Constants/LazyAlwaysUsedClassConstantsExtensionProvider.php
@@ -2,8 +2,10 @@
 
 namespace PHPStan\Rules\Constants;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService]
 final class LazyAlwaysUsedClassConstantsExtensionProvider implements AlwaysUsedClassConstantsExtensionProvider
 {
 
diff --git a/src/Rules/Exceptions/MissingCheckedExceptionInFunctionThrowsRule.php b/src/Rules/Exceptions/MissingCheckedExceptionInFunctionThrowsRule.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\FunctionReturnStatementsNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -12,6 +13,7 @@
 /**
  * @implements Rule<FunctionReturnStatementsNode>
  */
+#[AutowiredService]
 final class MissingCheckedExceptionInFunctionThrowsRule implements Rule
 {
 
diff --git a/src/Rules/Exceptions/MissingCheckedExceptionInMethodThrowsRule.php b/src/Rules/Exceptions/MissingCheckedExceptionInMethodThrowsRule.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\MethodReturnStatementsNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -12,6 +13,7 @@
 /**
  * @implements Rule<MethodReturnStatementsNode>
  */
+#[AutowiredService]
 final class MissingCheckedExceptionInMethodThrowsRule implements Rule
 {
 
diff --git a/src/Rules/Exceptions/MissingCheckedExceptionInPropertyHookThrowsRule.php b/src/Rules/Exceptions/MissingCheckedExceptionInPropertyHookThrowsRule.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\PropertyHookReturnStatementsNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -14,6 +15,7 @@
 /**
  * @implements Rule<PropertyHookReturnStatementsNode>
  */
+#[AutowiredService]
 final class MissingCheckedExceptionInPropertyHookThrowsRule implements Rule
 {
 
diff --git a/src/Rules/FunctionReturnTypeCheck.php b/src/Rules/FunctionReturnTypeCheck.php
@@ -6,13 +6,15 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\VerbosityLevel;
 use function sprintf;
 
+#[AutowiredService]
 final class FunctionReturnTypeCheck
 {
 
diff --git a/src/Rules/Generics/CrossCheckInterfacesHelper.php b/src/Rules/Generics/CrossCheckInterfacesHelper.php
@@ -2,13 +2,15 @@
 
 namespace PHPStan\Rules\Generics;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\VerbosityLevel;
 use function array_key_exists;
 use function sprintf;
 
+#[AutowiredService]
 final class CrossCheckInterfacesHelper
 {
 
diff --git a/src/Rules/Generics/GenericObjectTypeCheck.php b/src/Rules/Generics/GenericObjectTypeCheck.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Generics;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\ShouldNotHappenException;
@@ -23,6 +24,7 @@
 use function sprintf;
 use function strtolower;
 
+#[AutowiredService]
 final class GenericObjectTypeCheck
 {
 
diff --git a/src/Rules/Generics/MethodTagTemplateTypeCheck.php b/src/Rules/Generics/MethodTagTemplateTypeCheck.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Stmt\ClassLike;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Internal\SprintfHelper;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Rules\IdentifierRuleError;
@@ -15,6 +16,7 @@
 use function array_merge;
 use function sprintf;
 
+#[AutowiredService]
 final class MethodTagTemplateTypeCheck
 {
 
diff --git a/src/Rules/Generics/VarianceCheck.php b/src/Rules/Generics/VarianceCheck.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Generics;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ExtendedParametersAcceptor;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -10,6 +11,7 @@
 use PHPStan\Type\Type;
 use function sprintf;
 
+#[AutowiredService]
 final class VarianceCheck
 {
 
diff --git a/src/Rules/InternalTag/RestrictedInternalUsageHelper.php b/src/Rules/InternalTag/RestrictedInternalUsageHelper.php
@@ -3,10 +3,12 @@
 namespace PHPStan\Rules\InternalTag;
 
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use function array_slice;
 use function explode;
 use function str_starts_with;
 
+#[AutowiredService]
 final class RestrictedInternalUsageHelper
 {
 
diff --git a/src/Rules/Methods/LazyAlwaysUsedMethodExtensionProvider.php b/src/Rules/Methods/LazyAlwaysUsedMethodExtensionProvider.php
@@ -2,8 +2,10 @@
 
 namespace PHPStan\Rules\Methods;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService]
 final class LazyAlwaysUsedMethodExtensionProvider implements AlwaysUsedMethodExtensionProvider
 {
 
diff --git a/src/Rules/Methods/MethodParameterComparisonHelper.php b/src/Rules/Methods/MethodParameterComparisonHelper.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Methods;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ExtendedMethodReflection;
@@ -21,6 +22,7 @@
 use function count;
 use function sprintf;
 
+#[AutowiredService]
 final class MethodParameterComparisonHelper
 {
 
diff --git a/src/Rules/Methods/MethodVisibilityComparisonHelper.php b/src/Rules/Methods/MethodVisibilityComparisonHelper.php
@@ -2,13 +2,15 @@
 
 namespace PHPStan\Rules\Methods;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use function sprintf;
 
+#[AutowiredService]
 final class MethodVisibilityComparisonHelper
 {
 
diff --git a/src/Rules/NullsafeCheck.php b/src/Rules/NullsafeCheck.php
@@ -3,7 +3,9 @@
 namespace PHPStan\Rules;
 
 use PhpParser\Node\Expr;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class NullsafeCheck
 {
 
diff --git a/src/Rules/ParameterCastableToStringCheck.php b/src/Rules/ParameterCastableToStringCheck.php
@@ -5,12 +5,14 @@
 use PhpParser\Node\Arg;
 use PHPStan\Analyser\ArgumentsNormalizer;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\Type;
 use PHPStan\Type\VerbosityLevel;
 use function sprintf;
 
+#[AutowiredService]
 final class ParameterCastableToStringCheck
 {
 
diff --git a/src/Rules/PhpDoc/ConditionalReturnTypeRuleHelper.php b/src/Rules/PhpDoc/ConditionalReturnTypeRuleHelper.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\PhpDoc;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ExtendedParametersAcceptor;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -17,6 +18,7 @@
 use function sprintf;
 use function substr;
 
+#[AutowiredService]
 final class ConditionalReturnTypeRuleHelper
 {
 
diff --git a/src/Rules/PhpDoc/GenericCallableRuleHelper.php b/src/Rules/PhpDoc/GenericCallableRuleHelper.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDoc\Tag\TemplateTag;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Rules\Generics\TemplateTypeCheck;
@@ -18,6 +19,7 @@
 use function array_keys;
 use function sprintf;
 
+#[AutowiredService]
 final class GenericCallableRuleHelper
 {
 
diff --git a/src/Rules/PhpDoc/IncompatiblePhpDocTypeCheck.php b/src/Rules/PhpDoc/IncompatiblePhpDocTypeCheck.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Internal\SprintfHelper;
 use PHPStan\PhpDoc\ResolvedPhpDocBlock;
 use PHPStan\PhpDoc\Tag\ParamOutTag;
@@ -19,6 +20,7 @@
 use function in_array;
 use function sprintf;
 
+#[AutowiredService]
 final class IncompatiblePhpDocTypeCheck
 {
 
diff --git a/src/Rules/PhpDoc/UnresolvableTypeHelper.php b/src/Rules/PhpDoc/UnresolvableTypeHelper.php
diff --git a/src/Rules/Playground/NeverRuleHelper.php b/src/Rules/Playground/NeverRuleHelper.php
diff --git a/src/Rules/Properties/LazyReadWritePropertiesExtensionProvider.php b/src/Rules/Properties/LazyReadWritePropertiesExtensionProvider.php
diff --git a/src/Rules/Properties/PropertyDescriptor.php b/src/Rules/Properties/PropertyDescriptor.php
diff --git a/src/Rules/Properties/UninitializedPropertyRule.php b/src/Rules/Properties/UninitializedPropertyRule.php

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\Rules\Constants;`
`4`	`4`
	`5`	`+use PHPStan\DependencyInjection\AutowiredService;`
`5`	`6`	`use PHPStan\DependencyInjection\Container;`
`6`	`7`
	`8`	`+#[AutowiredService]`
`7`	`9`	`final class LazyAlwaysUsedClassConstantsExtensionProvider implements AlwaysUsedClassConstantsExtensionProvider`
`8`	`10`	`{`
`9`	`11`