Moved richParserNodeVisitor services from config.neon to #[AutowiredService] attribute

ondrejmirtes · ondrejmirtes · commit c0ef34cd3ce6 · 2025-05-26T10:52:40.000+02:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -237,96 +237,6 @@ services:
 			options:
 				preserveOriginalNames: true
 
-	-
-		class: PHPStan\Parser\AnonymousClassVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ArrayFilterArgVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ArrayFindArgVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ArrayMapArgVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ArrayWalkArgVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ClosureArgVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ClosureBindToVarVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ClosureBindArgVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\CurlSetOptArgVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ArrowFunctionArgVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\MagicConstantParamDefaultVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\NewAssignedToPropertyVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\ParentStmtTypesVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\StandaloneThrowExprVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\TryCatchTypeVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\TypeTraverserInstanceofVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\VariadicMethodsVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
-	-
-		class: PHPStan\Parser\VariadicFunctionsVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
 	-
 		class: PHPStan\Node\Printer\Printer
 		autowired:
diff --git a/src/Parser/AnonymousClassVisitor.php b/src/Parser/AnonymousClassVisitor.php
@@ -4,9 +4,11 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\AnonymousClassNode;
 use function count;
 
+#[AutowiredService]
 final class AnonymousClassVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ArrayFilterArgVisitor.php b/src/Parser/ArrayFilterArgVisitor.php
@@ -4,7 +4,9 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class ArrayFilterArgVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ArrayFindArgVisitor.php b/src/Parser/ArrayFindArgVisitor.php
@@ -4,8 +4,10 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use function in_array;
 
+#[AutowiredService]
 final class ArrayFindArgVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ArrayMapArgVisitor.php b/src/Parser/ArrayMapArgVisitor.php
@@ -4,9 +4,11 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use function array_slice;
 use function count;
 
+#[AutowiredService]
 final class ArrayMapArgVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ArrayWalkArgVisitor.php b/src/Parser/ArrayWalkArgVisitor.php
@@ -4,7 +4,9 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class ArrayWalkArgVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ArrowFunctionArgVisitor.php b/src/Parser/ArrowFunctionArgVisitor.php
@@ -4,8 +4,10 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use function count;
 
+#[AutowiredService]
 final class ArrowFunctionArgVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ClosureArgVisitor.php b/src/Parser/ClosureArgVisitor.php
@@ -4,8 +4,10 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use function count;
 
+#[AutowiredService]
 final class ClosureArgVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ClosureBindArgVisitor.php b/src/Parser/ClosureBindArgVisitor.php
@@ -5,8 +5,10 @@
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use function count;
 
+#[AutowiredService]
 final class ClosureBindArgVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ClosureBindToVarVisitor.php b/src/Parser/ClosureBindToVarVisitor.php
@@ -5,7 +5,9 @@
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class ClosureBindToVarVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/CurlSetOptArgVisitor.php b/src/Parser/CurlSetOptArgVisitor.php
@@ -4,7 +4,9 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class CurlSetOptArgVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/MagicConstantParamDefaultVisitor.php b/src/Parser/MagicConstantParamDefaultVisitor.php
@@ -4,7 +4,9 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class MagicConstantParamDefaultVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/NewAssignedToPropertyVisitor.php b/src/Parser/NewAssignedToPropertyVisitor.php
@@ -4,7 +4,9 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class NewAssignedToPropertyVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/ParentStmtTypesVisitor.php b/src/Parser/ParentStmtTypesVisitor.php
@@ -4,10 +4,12 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use function array_pop;
 use function count;
 use function get_class;
 
+#[AutowiredService]
 final class ParentStmtTypesVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/StandaloneThrowExprVisitor.php b/src/Parser/StandaloneThrowExprVisitor.php
@@ -4,7 +4,9 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class StandaloneThrowExprVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/TryCatchTypeVisitor.php b/src/Parser/TryCatchTypeVisitor.php
@@ -4,10 +4,12 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use function array_pop;
 use function array_reverse;
 use function count;
 
+#[AutowiredService]
 final class TryCatchTypeVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/TypeTraverserInstanceofVisitor.php b/src/Parser/TypeTraverserInstanceofVisitor.php
@@ -4,7 +4,9 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class TypeTraverserInstanceofVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/VariadicFunctionsVisitor.php b/src/Parser/VariadicFunctionsVisitor.php
@@ -5,11 +5,13 @@
 use PhpParser\Node;
 use PhpParser\Node\Name;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ParametersAcceptor;
 use function array_filter;
 use function array_key_exists;
 use function in_array;
 
+#[AutowiredService]
 final class VariadicFunctionsVisitor extends NodeVisitorAbstract
 {
 
diff --git a/src/Parser/VariadicMethodsVisitor.php b/src/Parser/VariadicMethodsVisitor.php
@@ -6,13 +6,15 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ParametersAcceptor;
 use function array_key_exists;
 use function array_pop;
 use function count;
 use function in_array;
 use function sprintf;
 
+#[AutowiredService]
 final class VariadicMethodsVisitor extends NodeVisitorAbstract
 {
 

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,11 @@`
`4`	`4`
`5`	`5`	`use PhpParser\Node;`
`6`	`6`	`use PhpParser\NodeVisitorAbstract;`
	`7`	`+use PHPStan\DependencyInjection\AutowiredService;`
`7`	`8`	`use PHPStan\Node\AnonymousClassNode;`
`8`	`9`	`use function count;`
`9`	`10`
	`11`	`+#[AutowiredService]`
`10`	`12`	`final class AnonymousClassVisitor extends NodeVisitorAbstract`
`11`	`13`	`{`
`12`	`14`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`
`5`	`5`	`use PhpParser\Node;`
`6`	`6`	`use PhpParser\NodeVisitorAbstract;`
	`7`	`+use PHPStan\DependencyInjection\AutowiredService;`
`7`	`8`
	`9`	`+#[AutowiredService]`
`8`	`10`	`final class ArrayFilterArgVisitor extends NodeVisitorAbstract`
`9`	`11`	`{`
`10`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,10 @@`
`4`	`4`
`5`	`5`	`use PhpParser\Node;`
`6`	`6`	`use PhpParser\NodeVisitorAbstract;`
	`7`	`+use PHPStan\DependencyInjection\AutowiredService;`
`7`	`8`	`use function in_array;`
`8`	`9`
	`10`	`+#[AutowiredService]`
`9`	`11`	`final class ArrayFindArgVisitor extends NodeVisitorAbstract`
`10`	`12`	`{`
`11`	`13`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,10 @@`
`5`	`5`	`use PhpParser\Node;`
`6`	`6`	`use PhpParser\Node\Identifier;`
`7`	`7`	`use PhpParser\NodeVisitorAbstract;`
	`8`	`+use PHPStan\DependencyInjection\AutowiredService;`
`8`	`9`	`use function count;`
`9`	`10`
	`11`	`+#[AutowiredService]`
`10`	`12`	`final class ClosureBindArgVisitor extends NodeVisitorAbstract`
`11`	`13`	`{`
`12`	`14`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`use PhpParser\Node;`
`6`	`6`	`use PhpParser\Node\Identifier;`
`7`	`7`	`use PhpParser\NodeVisitorAbstract;`
	`8`	`+use PHPStan\DependencyInjection\AutowiredService;`
`8`	`9`
	`10`	`+#[AutowiredService]`
`9`	`11`	`final class ClosureBindToVarVisitor extends NodeVisitorAbstract`
`10`	`12`	`{`
`11`	`13`