More #[RegisteredRule]

Author: ondrejmirtes

conf/config.level1.neon

@@ -10,11 +10,3 @@ parameters:
 autowiredAttributeServices:
 	# registers rules with #[RegisteredRule] attribute
 	level: 1
-
-services:
-	-
-		class: PHPStan\Rules\Constants\ConstantRule
-		tags:
-			- phpstan.rules.rule
-		arguments:
-			discoveringSymbolsTip: %tips.discoveringSymbols%

conf/config.level2.neon

@@ -17,49 +17,6 @@ conditionalTags:
 		phpstan.restrictedMethodUsageExtension: %featureToggles.internalTag%
 
 services:
-	-
-		class: PHPStan\Rules\Classes\MixinRule
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\PhpDoc\RequireExtendsCheck
-		arguments:
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-			discoveringSymbolsTip: %tips.discoveringSymbols%
-
-	-
-		class: PHPStan\Rules\PhpDoc\RequireImplementsDefinitionTraitRule
-		arguments:
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-			discoveringSymbolsTip: %tips.discoveringSymbols%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\Functions\CallCallablesRule
-		arguments:
-			reportMaybes: %reportMaybes%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: PHPStan\Rules\PhpDoc\InvalidPhpDocTagValueRule
-		tags:
-			- phpstan.rules.rule
-	-
-		class: PHPStan\Rules\PhpDoc\InvalidPhpDocVarTagTypeRule
-		arguments:
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-			checkMissingVarTagTypehint: %checkMissingVarTagTypehint%
-			discoveringSymbolsTip: %tips.discoveringSymbols%
-		tags:
-			- phpstan.rules.rule
-	-
-		class: PHPStan\Rules\PhpDoc\InvalidPHPStanDocTagRule
-		tags:
-			- phpstan.rules.rule
-
 	-
 		class: PHPStan\Rules\InternalTag\RestrictedInternalPropertyUsageExtension
 

src/Rules/Classes/MixinRule.php

@@ -4,12 +4,14 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\InClassNode;
 use PHPStan\Rules\Rule;
 
 /**
  * @implements Rule<InClassNode>
  */
+#[RegisteredRule(level: 2)]
 final class MixinRule implements Rule
 {
 

src/Rules/Constants/ConstantRule.php

@@ -4,17 +4,21 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use function sprintf;
 
 /**
  * @implements Rule<Node\Expr\ConstFetch>
  */
+#[RegisteredRule(level: 1)]
 final class ConstantRule implements Rule
 {
 
 	public function __construct(
+		#[AutowiredParameter(ref: '%tips.discoveringSymbols%')]
 		private bool $discoveringSymbolsTip,
 	)
 	{

src/Rules/Functions/CallCallablesRule.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\Reflection\InaccessibleMethod;
 use PHPStan\Reflection\ParametersAcceptorSelector;
@@ -25,12 +27,14 @@
 /**
  * @implements Rule<Node\Expr\FuncCall>
  */
+#[RegisteredRule(level: 2)]
 final class CallCallablesRule implements Rule
 {
 
 	public function __construct(
 		private FunctionCallParametersCheck $check,
 		private RuleLevelHelper $ruleLevelHelper,
+		#[AutowiredParameter]
 		private bool $reportMaybes,
 	)
 	{

src/Rules/PhpDoc/InvalidPHPStanDocTagRule.php

@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\VirtualNode;
 use PHPStan\PhpDocParser\Lexer\Lexer;
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
@@ -18,6 +19,7 @@
 /**
  * @implements Rule<NodeAbstract>
  */
+#[RegisteredRule(level: 2)]
 final class InvalidPHPStanDocTagRule implements Rule
 {
 

src/Rules/PhpDoc/InvalidPhpDocTagValueRule.php

@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PhpParser\NodeAbstract;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\VirtualNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\InvalidTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\TypeAliasTagValueNode;
@@ -20,6 +21,7 @@
 /**
  * @implements Rule<NodeAbstract>
  */
+#[RegisteredRule(level: 2)]
 final class InvalidPhpDocTagValueRule implements Rule
 {
 

src/Rules/PhpDoc/InvalidPhpDocVarTagTypeRule.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Internal\SprintfHelper;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\ClassNameCheck;
@@ -23,6 +25,7 @@
 /**
  * @implements Rule<Node\Stmt>
  */
+#[RegisteredRule(level: 2)]
 final class InvalidPhpDocVarTagTypeRule implements Rule
 {
 
@@ -33,8 +36,11 @@ public function __construct(
 		private GenericObjectTypeCheck $genericObjectTypeCheck,
 		private MissingTypehintCheck $missingTypehintCheck,
 		private UnresolvableTypeHelper $unresolvableTypeHelper,
+		#[AutowiredParameter]
 		private bool $checkClassCaseSensitivity,
+		#[AutowiredParameter]
 		private bool $checkMissingVarTagTypehint,
+		#[AutowiredParameter(ref: '%tips.discoveringSymbols%')]
 		private bool $discoveringSymbolsTip,
 	)
 	{

src/Rules/PhpDoc/RequireExtendsCheck.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDoc\Tag\RequireExtendsTag;
 use PHPStan\Rules\ClassNameCheck;
 use PHPStan\Rules\ClassNameNodePair;
@@ -19,12 +21,15 @@
 use function sprintf;
 use function strtolower;
 
+#[AutowiredService]
 final class RequireExtendsCheck
 {
 
 	public function __construct(
 		private ClassNameCheck $classCheck,
+		#[AutowiredParameter]
 		private bool $checkClassCaseSensitivity,
+		#[AutowiredParameter(ref: '%tips.discoveringSymbols%')]
 		private bool $discoveringSymbolsTip,
 	)
 	{

src/Rules/PhpDoc/RequireImplementsDefinitionTraitRule.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\ClassNameCheck;
 use PHPStan\Rules\ClassNameNodePair;
@@ -21,13 +23,16 @@
 /**
  * @implements Rule<Node\Stmt\Trait_>
  */
+#[RegisteredRule(level: 2)]
 final class RequireImplementsDefinitionTraitRule implements Rule
 {
 
 	public function __construct(
 		private ReflectionProvider $reflectionProvider,
 		private ClassNameCheck $classCheck,
+		#[AutowiredParameter]
 		private bool $checkClassCaseSensitivity,
+		#[AutowiredParameter(ref: '%tips.discoveringSymbols%')]
 		private bool $discoveringSymbolsTip,
 	)
 	{