More #[RegisteredRule]

Author: ondrejmirtes

conf/config.level3.neon

@@ -7,63 +7,3 @@ autowiredAttributeServices:
 
 parameters:
 	checkPhpDocMethodSignatures: true
-
-services:
-	-
-		class: PHPStan\Rules\Arrays\InvalidKeyInArrayDimFetchRule
-		arguments:
-			reportMaybes: %reportMaybes%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Arrays\InvalidKeyInArrayItemRule
-		arguments:
-			reportMaybes: %reportMaybes%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Arrays\NonexistentOffsetInArrayDimFetchRule
-		arguments:
-			reportMaybes: %reportMaybes%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Exceptions\ThrowsVoidFunctionWithExplicitThrowPointRule
-		arguments:
-			exceptionTypeResolver: @exceptionTypeResolver
-			missingCheckedExceptionInThrows: %exceptions.check.missingCheckedExceptionInThrows%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Exceptions\ThrowsVoidMethodWithExplicitThrowPointRule
-		arguments:
-			exceptionTypeResolver: @exceptionTypeResolver
-			missingCheckedExceptionInThrows: %exceptions.check.missingCheckedExceptionInThrows%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Exceptions\ThrowsVoidPropertyHookWithExplicitThrowPointRule
-		arguments:
-			exceptionTypeResolver: @exceptionTypeResolver
-			missingCheckedExceptionInThrows: %exceptions.check.missingCheckedExceptionInThrows%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Generators\YieldFromTypeRule
-		arguments:
-			reportMaybes: %reportMaybes%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Generators\YieldInGeneratorRule
-		arguments:
-			reportMaybes: %reportMaybes%
-		tags:
-			- phpstan.rules.rule

conf/config.level4.neon

@@ -17,42 +17,6 @@ parameters:
 	checkAdvancedIsset: true
 
 services:
-	-
-		class: PHPStan\Rules\Classes\ImpossibleInstanceOfRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\BooleanAndConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\BooleanOrConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\BooleanNotConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
 	-
 		class: PHPStan\Rules\DeadCode\ConstructorWithoutImpurePointsCollector
 		tags:
@@ -88,134 +52,6 @@ services:
 		tags:
 			 - phpstan.collector
 
-	-
-		class: PHPStan\Rules\DeadCode\UnusedPrivatePropertyRule
-		arguments:
-			alwaysWrittenTags: %propertyAlwaysWrittenTags%
-			alwaysReadTags: %propertyAlwaysReadTags%
-			checkUninitializedProperties: %checkUninitializedProperties%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\DoWhileLoopConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\ElseIfConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\IfConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\ImpossibleCheckTypeFunctionCallRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\ImpossibleCheckTypeMethodCallRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\ImpossibleCheckTypeStaticMethodCallRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\LogicalXorConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\MatchExpressionRule
-		arguments:
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\NumberComparisonOperatorsConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\StrictComparisonOfDifferentTypesRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\ConstantLooseComparisonRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			reportAlwaysTrueInLastCondition: %reportAlwaysTrueInLastCondition%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\TernaryOperatorConstantConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\WhileLoopAlwaysFalseConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Comparison\WhileLoopAlwaysTrueConditionRule
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-			treatPhpDocTypesAsCertainTip: %tips.treatPhpDocTypesAsCertain%
-		tags:
-			- phpstan.rules.rule
-
 	-
 		class: PHPStan\Rules\Exceptions\TooWideFunctionThrowTypeRule
 
@@ -225,18 +61,6 @@ services:
 	-
 		class: PHPStan\Rules\Exceptions\TooWidePropertyHookThrowTypeRule
 
-	-
-		class: PHPStan\Rules\TooWideTypehints\TooWideMethodReturnTypehintRule
-		arguments:
-			checkProtectedAndPublicMethods: %checkTooWideReturnTypesInProtectedAndPublicMethods%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Properties\NullsafePropertyFetchRule
-		tags:
-			- phpstan.rules.rule
-
 	-
 		class: PHPStan\Rules\Traits\TraitDeclarationCollector
 		tags:
@@ -246,11 +70,3 @@ services:
 		class: PHPStan\Rules\Traits\TraitUseCollector
 		tags:
 			- phpstan.collector
-
-	-
-		class: PHPStan\Rules\Exceptions\CatchWithUnthrownExceptionRule
-		arguments:
-			exceptionTypeResolver: @exceptionTypeResolver
-			reportUncheckedExceptionDeadCatch: %exceptions.reportUncheckedExceptionDeadCatch%
-		tags:
-			- phpstan.rules.rule

src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Rules\RuleLevelHelper;
@@ -16,11 +18,13 @@
 /**
  * @implements Rule<Node\Expr\ArrayDimFetch>
  */
+#[RegisteredRule(level: 3)]
 final class InvalidKeyInArrayDimFetchRule implements Rule
 {
 
 	public function __construct(
 		private RuleLevelHelper $ruleLevelHelper,
+		#[AutowiredParameter]
 		private bool $reportMaybes,
 	)
 	{

src/Rules/Arrays/InvalidKeyInArrayItemRule.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\MixedType;
@@ -13,10 +15,14 @@
 /**
  * @implements Rule<Node\ArrayItem>
  */
+#[RegisteredRule(level: 3)]
 final class InvalidKeyInArrayItemRule implements Rule
 {
 
-	public function __construct(private bool $reportMaybes)
+	public function __construct(
+		#[AutowiredParameter]
+		private bool $reportMaybes,
+	)
 	{
 	}
 

src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php

@@ -5,6 +5,8 @@
 use PhpParser\Node;
 use PHPStan\Analyser\NullsafeOperatorHelper;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Internal\SprintfHelper;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -20,12 +22,14 @@
 /**
  * @implements Rule<Node\Expr\ArrayDimFetch>
  */
+#[RegisteredRule(level: 3)]
 final class NonexistentOffsetInArrayDimFetchRule implements Rule
 {
 
 	public function __construct(
 		private RuleLevelHelper $ruleLevelHelper,
 		private NonexistentOffsetInArrayDimFetchCheck $nonexistentOffsetInArrayDimFetchCheck,
+		#[AutowiredParameter]
 		private bool $reportMaybes,
 	)
 	{

src/Rules/Classes/ImpossibleInstanceOfRule.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Parser\LastConditionVisitor;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -18,12 +20,16 @@
 /**
  * @implements Rule<Node\Expr\Instanceof_>
  */
+#[RegisteredRule(level: 4)]
 final class ImpossibleInstanceOfRule implements Rule
 {
 
 	public function __construct(
+		#[AutowiredParameter]
 		private bool $treatPhpDocTypesAsCertain,
+		#[AutowiredParameter]
 		private bool $reportAlwaysTrueInLastCondition,
+		#[AutowiredParameter(ref: '%tips.treatPhpDocTypesAsCertain%')]
 		private bool $treatPhpDocTypesAsCertainTip,
 	)
 	{

src/Rules/Comparison/BooleanAndConstantConditionRule.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\BooleanAndNode;
 use PHPStan\Parser\LastConditionVisitor;
 use PHPStan\Rules\Rule;
@@ -15,13 +17,17 @@
 /**
  * @implements Rule<BooleanAndNode>
  */
+#[RegisteredRule(level: 4)]
 final class BooleanAndConstantConditionRule implements Rule
 {
 
 	public function __construct(
 		private ConstantConditionRuleHelper $helper,
+		#[AutowiredParameter]
 		private bool $treatPhpDocTypesAsCertain,
+		#[AutowiredParameter]
 		private bool $reportAlwaysTrueInLastCondition,
+		#[AutowiredParameter(ref: '%tips.treatPhpDocTypesAsCertain%')]
 		private bool $treatPhpDocTypesAsCertainTip,
 	)
 	{