more autowire

Author: staabm

conf/config.neon

@@ -230,9 +230,6 @@ services:
 	-
 		class: PhpParser\BuilderFactory
 
-	-
-		class: PHPStan\Parser\LexerFactory
-
 	-
 		class: PhpParser\NodeVisitor\NameResolver
 		arguments:
@@ -384,25 +381,10 @@ services:
 	-
 		class: PHPStan\PhpDocParser\Printer\Printer
 
-	-
-		class: PHPStan\PhpDoc\PhpDocStringResolver
-
-	-
-		class: PHPStan\PhpDoc\ConstExprNodeResolver
-
-	-
-		class: PHPStan\PhpDoc\TypeNodeResolver
-
 	-
 		class: PHPStan\PhpDoc\TypeNodeResolverExtensionRegistryProvider
 		factory: PHPStan\PhpDoc\LazyTypeNodeResolverExtensionRegistryProvider
 
-	-
-		class: PHPStan\PhpDoc\TypeStringResolver
-
-	-
-		class: PHPStan\PhpDoc\StubValidator
-
 	-
 		class: PHPStan\PhpDoc\DefaultStubFilesProvider
 		arguments:
@@ -411,21 +393,6 @@ services:
 		autowired:
 			- PHPStan\PhpDoc\StubFilesProvider
 
-	-
-		class: PHPStan\PhpDoc\JsonValidateStubFilesExtension
-		tags:
-			- phpstan.stubFilesExtension
-
-	-
-		class: PHPStan\PhpDoc\ReflectionClassStubFilesExtension
-		tags:
-			- phpstan.stubFilesExtension
-
-	-
-		class: PHPStan\PhpDoc\ReflectionEnumStubFilesExtension
-		tags:
-			- phpstan.stubFilesExtension
-
 	-
 		class: PHPStan\Analyser\Analyser
 		arguments:

src/Parser/LexerFactory.php

@@ -3,9 +3,11 @@
 namespace PHPStan\Parser;
 
 use PhpParser\Lexer;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 use const PHP_VERSION_ID;
 
+#[AutowiredService]
 final class LexerFactory
 {
 

src/PhpDoc/ConstExprNodeResolver.php

@@ -3,6 +3,7 @@
 namespace PHPStan\PhpDoc;
 
 use PHPStan\Analyser\NameScope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprArrayNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFalseNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFloatNode;
@@ -26,6 +27,7 @@
 use PHPStan\Type\Type;
 use function strtolower;
 
+#[AutowiredService]
 final class ConstExprNodeResolver
 {
 

src/PhpDoc/JsonValidateStubFilesExtension.php

@@ -2,8 +2,10 @@
 
 namespace PHPStan\PhpDoc;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 
+#[AutowiredService]
 final class JsonValidateStubFilesExtension implements StubFilesExtension
 {
 

src/PhpDoc/PhpDocStringResolver.php

@@ -2,11 +2,13 @@
 
 namespace PHPStan\PhpDoc;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
 use PHPStan\PhpDocParser\Lexer\Lexer;
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 
+#[AutowiredService]
 final class PhpDocStringResolver
 {
 

src/PhpDoc/ReflectionClassStubFilesExtension.php

@@ -2,8 +2,10 @@
 
 namespace PHPStan\PhpDoc;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 
+#[AutowiredService]
 final class ReflectionClassStubFilesExtension implements StubFilesExtension
 {
 

src/PhpDoc/ReflectionEnumStubFilesExtension.php

@@ -2,8 +2,10 @@
 
 namespace PHPStan\PhpDoc;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 
+#[AutowiredService]
 final class ReflectionEnumStubFilesExtension implements StubFilesExtension
 {
 

src/PhpDoc/StubValidator.php

@@ -7,6 +7,7 @@
 use PHPStan\Analyser\InternalError;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Collectors\Registry as CollectorRegistry;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\DerivativeContainerFactory;
 use PHPStan\Php\PhpVersion;
@@ -101,6 +102,7 @@
 use function count;
 use function sprintf;
 
+#[AutowiredService]
 final class StubValidator
 {
 

src/PhpDoc/TypeNodeResolver.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Name;
 use PHPStan\Analyser\ConstantResolver;
 use PHPStan\Analyser\NameScope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDoc\Tag\TemplateTag;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprArrayNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFalseNode;
@@ -124,6 +125,7 @@
 use function strtolower;
 use function substr;
 
+#[AutowiredService]
 final class TypeNodeResolver
 {
 

src/PhpDoc/TypeStringResolver.php

@@ -3,11 +3,13 @@
 namespace PHPStan\PhpDoc;
 
 use PHPStan\Analyser\NameScope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDocParser\Lexer\Lexer;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
 use PHPStan\Type\Type;
 
+#[AutowiredService]
 final class TypeStringResolver
 {