phpstan · ondrejmirtes · May 25, 2025 · May 25, 2025 · May 25, 2025 · May 25, 2025
diff --git a/conf/config.neon b/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:
@@ -441,32 +408,17 @@ services:
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Analyser\IgnoreErrorExtensionProvider
-
-	-
-		class: PHPStan\Analyser\LocalIgnoresProcessor
-
-	-
-		class: PHPStan\Analyser\RuleErrorTransformer
-
 	-
 		class: PHPStan\Analyser\Ignore\IgnoredErrorHelper
 		arguments:
 			ignoreErrors: %ignoreErrors%
 			reportUnmatchedIgnoredErrors: %reportUnmatchedIgnoredErrors%
 
-	-
-		class: PHPStan\Analyser\Ignore\IgnoreLexer
-
 	-
 		class: PHPStan\Analyser\LazyInternalScopeFactory
 		autowired:
 			- PHPStan\Analyser\InternalScopeFactory
 
-	-
-		class: PHPStan\Analyser\ScopeFactory
-
 	-
 		class: PHPStan\Analyser\NodeScopeResolver
 		arguments:
@@ -486,9 +438,6 @@ services:
 		class: PHPStan\Analyser\ConstantResolver
 		factory: @PHPStan\Analyser\ConstantResolverFactory::create()
 
-	-
-		class: PHPStan\Analyser\ConstantResolverFactory
-
 	-
 		implement: PHPStan\Analyser\ResultCache\ResultCacheManagerFactory
 		arguments:
@@ -511,9 +460,6 @@ services:
 		arguments:
 			cacheFilePath: %resultCachePath%
 
-	-
-		class: PHPStan\Analyser\RicherScopeGetTypeHelper
-
 	-
 		class: PHPStan\Cache\Cache
 		arguments:
@@ -523,15 +469,6 @@ services:
 		class: PHPStan\Collectors\Registry
 		factory: @PHPStan\Collectors\RegistryFactory::create
 
-	-
-		class: PHPStan\Collectors\RegistryFactory
-
-	-
-		class: PHPStan\Command\AnalyseApplication
-
-	-
-		class: PHPStan\Command\AnalyserRunner
-
 	-
 		class: PHPStan\Command\FixerApplication
 		arguments:
@@ -551,12 +488,6 @@ services:
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Dependency\ExportedNodeResolver
-
-	-
-		class: PHPStan\Dependency\ExportedNodeVisitor
-
 	-
 		class: PHPStan\DependencyInjection\Container
 		factory: PHPStan\DependencyInjection\MemoizingContainer
@@ -684,12 +615,6 @@ services:
 		tags:
 			- phpstan.diagnoseExtension
 
-	-
-		class: PHPStan\Process\CpuCoreCounter
-
-	-
-		class: PHPStan\Reflection\AttributeReflectionFactory
-
 	-
 		implement: PHPStan\Reflection\FunctionReflectionFactory
 		arguments:
@@ -706,34 +631,22 @@ services:
 	-
 		class: PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension
 
-	-
-		class: PHPStan\Reflection\BetterReflection\SourceLocator\CachingVisitor
-
 	-
 		class: PHPStan\Reflection\BetterReflection\SourceLocator\FileNodesFetcher
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Reflection\BetterReflection\SourceLocator\ComposerJsonAndInstalledJsonSourceLocatorMaker
-
 	-
 		class: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorFactory
 		arguments:
 			fileFinder: @fileFinderScan
 
-	-
-		class: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorRepository
-
 	-
 		implement: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedPsrAutoloaderLocatorFactory
 
 	-
 		implement: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorFactory
 
-	-
-		class: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository
-
 	-
 		class: PHPStan\Reflection\BetterReflection\Type\AdapterReflectionEnumCaseDynamicReturnTypeExtension
 		arguments:
@@ -946,37 +859,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,54 +896,24 @@ 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:
@@ -1060,12 +923,6 @@ services:
 	-
 		class: PHPStan\Rules\Properties\UninitializedPropertyRule
 
-	-
-		class: PHPStan\Rules\Properties\LazyReadWritePropertiesExtensionProvider
-
-	-
-		class: PHPStan\Rules\Properties\PropertyDescriptor
-
 	-
 		class: PHPStan\Rules\RuleLevelHelper
 		arguments:

diff --git a/src/Analyser/ConstantResolverFactory.php b/src/Analyser/ConstantResolverFactory.php
@@ -2,10 +2,12 @@
 
 namespace PHPStan\Analyser;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Php\ComposerPhpVersionFactory;
 use PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider;
 
+#[AutowiredService]
 final class ConstantResolverFactory
 {
 

diff --git a/src/Analyser/Ignore/IgnoreLexer.php b/src/Analyser/Ignore/IgnoreLexer.php
@@ -4,9 +4,11 @@
 
 use Nette\Utils\Strings;
 use PHPStan\Analyser\Error;
+use PHPStan\DependencyInjection\AutowiredService;
 use function implode;
 use const PREG_SET_ORDER;
 
+#[AutowiredService]
 final class IgnoreLexer
 {
 

diff --git a/src/Analyser/IgnoreErrorExtensionProvider.php b/src/Analyser/IgnoreErrorExtensionProvider.php
@@ -2,8 +2,10 @@
 
 namespace PHPStan\Analyser;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService]
 final class IgnoreErrorExtensionProvider
 {
 

diff --git a/src/Analyser/LocalIgnoresProcessor.php b/src/Analyser/LocalIgnoresProcessor.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Analyser;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use function array_key_exists;
 use function array_values;
 use function count;
@@ -10,6 +11,7 @@
 /**
  * @phpstan-import-type LinesToIgnore from FileAnalyserResult
  */
+#[AutowiredService]
 final class LocalIgnoresProcessor
 {
 

diff --git a/src/Analyser/RicherScopeGetTypeHelper.php b/src/Analyser/RicherScopeGetTypeHelper.php
@@ -5,12 +5,14 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\Variable;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\TypeResult;
 use function is_string;
 
+#[AutowiredService]
 final class RicherScopeGetTypeHelper
 {
 

diff --git a/src/Analyser/RuleErrorTransformer.php b/src/Analyser/RuleErrorTransformer.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Analyser;
 
 use PhpParser\Node;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Rules\FileRuleError;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\LineRuleError;
@@ -11,6 +12,7 @@
 use PHPStan\Rules\RuleError;
 use PHPStan\Rules\TipRuleError;
 
+#[AutowiredService]
 final class RuleErrorTransformer
 {
 

diff --git a/src/Analyser/ScopeFactory.php b/src/Analyser/ScopeFactory.php
@@ -2,9 +2,12 @@
 
 namespace PHPStan\Analyser;
 
+use PHPStan\DependencyInjection\AutowiredService;
+
 /**
  * @api
  */
+#[AutowiredService]
 final class ScopeFactory
 {