diff --git a/conf/config.neon b/conf/config.neon index abdf0f6067..a81c5f69df 100644 --- 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 index 5ccc516e42..57a3284f76 100644 --- 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 index bcaf00ec10..dbfa2ebf42 100644 --- 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 index 79604a5845..ff5af37169 100644 --- 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 index d5c0197dd6..192b909251 100644 --- 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 index ba7c6c618a..e8c6fa2d91 100644 --- 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 index b45ce15acd..c7ab2604a8 100644 --- 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 index ade6e1d894..be9ca1982d 100644 --- 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 { diff --git a/src/Collectors/RegistryFactory.php b/src/Collectors/RegistryFactory.php index 675740d99a..a95dbe2a51 100644 --- a/src/Collectors/RegistryFactory.php +++ b/src/Collectors/RegistryFactory.php @@ -2,8 +2,10 @@ namespace PHPStan\Collectors; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\DependencyInjection\Container; +#[AutowiredService] final class RegistryFactory { diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php index 20450f9813..07e36fb1b3 100644 --- a/src/Command/AnalyseApplication.php +++ b/src/Command/AnalyseApplication.php @@ -9,6 +9,7 @@ use PHPStan\Analyser\Ignore\IgnoredErrorHelper; use PHPStan\Analyser\ResultCache\ResultCacheManagerFactory; use PHPStan\Collectors\CollectedData; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Internal\BytesHelper; use PHPStan\PhpDoc\StubFilesProvider; use PHPStan\PhpDoc\StubValidator; @@ -26,6 +27,7 @@ * @phpstan-import-type CollectorData from CollectedData * @phpstan-import-type LinesToIgnore from FileAnalyserResult */ +#[AutowiredService] final class AnalyseApplication { diff --git a/src/Command/AnalyserRunner.php b/src/Command/AnalyserRunner.php index 5b97a115ea..f6ea231e84 100644 --- a/src/Command/AnalyserRunner.php +++ b/src/Command/AnalyserRunner.php @@ -5,6 +5,7 @@ use Closure; use PHPStan\Analyser\Analyser; use PHPStan\Analyser\AnalyserResult; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Parallel\ParallelAnalyser; use PHPStan\Parallel\Scheduler; use PHPStan\Process\CpuCoreCounter; @@ -19,6 +20,7 @@ use function is_file; use function memory_get_peak_usage; +#[AutowiredService] final class AnalyserRunner { diff --git a/src/Dependency/ExportedNodeResolver.php b/src/Dependency/ExportedNodeResolver.php index 38f1ceb616..5a6afabe70 100644 --- a/src/Dependency/ExportedNodeResolver.php +++ b/src/Dependency/ExportedNodeResolver.php @@ -23,6 +23,7 @@ use PHPStan\Dependency\ExportedNode\ExportedPropertyHookNode; use PHPStan\Dependency\ExportedNode\ExportedTraitNode; use PHPStan\Dependency\ExportedNode\ExportedTraitUseAdaptation; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Node\Printer\ExprPrinter; use PHPStan\Node\Printer\NodeTypePrinter; use PHPStan\Reflection\ReflectionProvider; @@ -32,6 +33,7 @@ use function is_string; use function sprintf; +#[AutowiredService] final class ExportedNodeResolver { diff --git a/src/Dependency/ExportedNodeVisitor.php b/src/Dependency/ExportedNodeVisitor.php index 34dfd1efe1..f802763704 100644 --- a/src/Dependency/ExportedNodeVisitor.php +++ b/src/Dependency/ExportedNodeVisitor.php @@ -5,8 +5,10 @@ use PhpParser\Node; use PhpParser\NodeVisitor; use PhpParser\NodeVisitorAbstract; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\ShouldNotHappenException; +#[AutowiredService] final class ExportedNodeVisitor extends NodeVisitorAbstract { diff --git a/src/Parser/LexerFactory.php b/src/Parser/LexerFactory.php index e02bc5ed2c..1f844ff7cd 100644 --- a/src/Parser/LexerFactory.php +++ b/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 { diff --git a/src/PhpDoc/ConstExprNodeResolver.php b/src/PhpDoc/ConstExprNodeResolver.php index 257883af2c..7d1b0ad824 100644 --- a/src/PhpDoc/ConstExprNodeResolver.php +++ b/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 { diff --git a/src/PhpDoc/JsonValidateStubFilesExtension.php b/src/PhpDoc/JsonValidateStubFilesExtension.php index 3bfcfe862c..61ba6aca5d 100644 --- a/src/PhpDoc/JsonValidateStubFilesExtension.php +++ b/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 { diff --git a/src/PhpDoc/PhpDocStringResolver.php b/src/PhpDoc/PhpDocStringResolver.php index 7c8129a3cc..30a6e1df0e 100644 --- a/src/PhpDoc/PhpDocStringResolver.php +++ b/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 { diff --git a/src/PhpDoc/ReflectionClassStubFilesExtension.php b/src/PhpDoc/ReflectionClassStubFilesExtension.php index 1abd672f68..f47fe54bba 100644 --- a/src/PhpDoc/ReflectionClassStubFilesExtension.php +++ b/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 { diff --git a/src/PhpDoc/ReflectionEnumStubFilesExtension.php b/src/PhpDoc/ReflectionEnumStubFilesExtension.php index ed9b43b6be..d48519b735 100644 --- a/src/PhpDoc/ReflectionEnumStubFilesExtension.php +++ b/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 { diff --git a/src/PhpDoc/StubValidator.php b/src/PhpDoc/StubValidator.php index b0737cbcc9..3d1318fcd8 100644 --- a/src/PhpDoc/StubValidator.php +++ b/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 { diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php index 0ec112131f..21284c9129 100644 --- a/src/PhpDoc/TypeNodeResolver.php +++ b/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 { diff --git a/src/PhpDoc/TypeStringResolver.php b/src/PhpDoc/TypeStringResolver.php index 2bdb4ff94f..9aa0b151bc 100644 --- a/src/PhpDoc/TypeStringResolver.php +++ b/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 { diff --git a/src/Process/CpuCoreCounter.php b/src/Process/CpuCoreCounter.php index 2fd49e7cfa..a0558bcbeb 100644 --- a/src/Process/CpuCoreCounter.php +++ b/src/Process/CpuCoreCounter.php @@ -4,7 +4,9 @@ use Fidry\CpuCoreCounter\CpuCoreCounter as FidryCpuCoreCounter; use Fidry\CpuCoreCounter\NumberOfCpuCoreNotFound; +use PHPStan\DependencyInjection\AutowiredService; +#[AutowiredService] final class CpuCoreCounter { diff --git a/src/Reflection/AttributeReflectionFactory.php b/src/Reflection/AttributeReflectionFactory.php index 74a7d0efaa..5cd5cd9cb9 100644 --- a/src/Reflection/AttributeReflectionFactory.php +++ b/src/Reflection/AttributeReflectionFactory.php @@ -6,12 +6,14 @@ use PhpParser\Node\Expr; use PHPStan\BetterReflection\Reflection\Adapter\FakeReflectionAttribute; use PHPStan\BetterReflection\Reflection\Adapter\ReflectionAttribute; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider; use PHPStan\Type\TypeCombinator; use function array_key_exists; use function count; use function is_int; +#[AutowiredService] final class AttributeReflectionFactory { diff --git a/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php b/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php index 6eb1f57604..8d78fa4e1e 100644 --- a/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php +++ b/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php @@ -9,9 +9,11 @@ use PHPStan\BetterReflection\Reflection\Exception\InvalidConstantNode; use PHPStan\BetterReflection\SourceLocator\Located\LocatedSource; use PHPStan\BetterReflection\Util\ConstantNodeChecker; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\ConstantNameHelper; use function strtolower; +#[AutowiredService] final class CachingVisitor extends NodeVisitorAbstract { diff --git a/src/Reflection/BetterReflection/SourceLocator/ComposerJsonAndInstalledJsonSourceLocatorMaker.php b/src/Reflection/BetterReflection/SourceLocator/ComposerJsonAndInstalledJsonSourceLocatorMaker.php index 9e687100f7..1195311fd2 100644 --- a/src/Reflection/BetterReflection/SourceLocator/ComposerJsonAndInstalledJsonSourceLocatorMaker.php +++ b/src/Reflection/BetterReflection/SourceLocator/ComposerJsonAndInstalledJsonSourceLocatorMaker.php @@ -8,6 +8,7 @@ use PHPStan\BetterReflection\SourceLocator\Type\Composer\Psr\Psr0Mapping; use PHPStan\BetterReflection\SourceLocator\Type\Composer\Psr\Psr4Mapping; use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\File\CouldNotReadFileException; use PHPStan\File\FileReader; use PHPStan\Internal\ComposerHelper; @@ -25,6 +26,7 @@ use function str_contains; use const GLOB_ONLYDIR; +#[AutowiredService] final class ComposerJsonAndInstalledJsonSourceLocatorMaker { diff --git a/src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocatorRepository.php b/src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocatorRepository.php index f71d4dcf8a..e0404ad629 100644 --- a/src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocatorRepository.php +++ b/src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocatorRepository.php @@ -2,8 +2,10 @@ namespace PHPStan\Reflection\BetterReflection\SourceLocator; +use PHPStan\DependencyInjection\AutowiredService; use function array_key_exists; +#[AutowiredService] final class OptimizedDirectorySourceLocatorRepository { diff --git a/src/Reflection/BetterReflection/SourceLocator/OptimizedSingleFileSourceLocatorRepository.php b/src/Reflection/BetterReflection/SourceLocator/OptimizedSingleFileSourceLocatorRepository.php index bd857f7489..b97c230f79 100644 --- a/src/Reflection/BetterReflection/SourceLocator/OptimizedSingleFileSourceLocatorRepository.php +++ b/src/Reflection/BetterReflection/SourceLocator/OptimizedSingleFileSourceLocatorRepository.php @@ -2,8 +2,10 @@ namespace PHPStan\Reflection\BetterReflection\SourceLocator; +use PHPStan\DependencyInjection\AutowiredService; use function array_key_exists; +#[AutowiredService] final class OptimizedSingleFileSourceLocatorRepository { diff --git a/src/Rules/Constants/LazyAlwaysUsedClassConstantsExtensionProvider.php b/src/Rules/Constants/LazyAlwaysUsedClassConstantsExtensionProvider.php index e91391e8bb..9425eb8849 100644 --- a/src/Rules/Constants/LazyAlwaysUsedClassConstantsExtensionProvider.php +++ b/src/Rules/Constants/LazyAlwaysUsedClassConstantsExtensionProvider.php @@ -2,8 +2,10 @@ namespace PHPStan\Rules\Constants; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\DependencyInjection\Container; +#[AutowiredService] final class LazyAlwaysUsedClassConstantsExtensionProvider implements AlwaysUsedClassConstantsExtensionProvider { diff --git a/src/Rules/FunctionReturnTypeCheck.php b/src/Rules/FunctionReturnTypeCheck.php index 994b3943f2..e61965ca3a 100644 --- a/src/Rules/FunctionReturnTypeCheck.php +++ b/src/Rules/FunctionReturnTypeCheck.php @@ -6,6 +6,7 @@ use PhpParser\Node; use PhpParser\Node\Expr; use PHPStan\Analyser\Scope; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Type\ErrorType; use PHPStan\Type\NeverType; use PHPStan\Type\Type; @@ -13,6 +14,7 @@ use PHPStan\Type\VerbosityLevel; use function sprintf; +#[AutowiredService] final class FunctionReturnTypeCheck { diff --git a/src/Rules/Generics/CrossCheckInterfacesHelper.php b/src/Rules/Generics/CrossCheckInterfacesHelper.php index 3e9c477cb3..25b57e10e6 100644 --- a/src/Rules/Generics/CrossCheckInterfacesHelper.php +++ b/src/Rules/Generics/CrossCheckInterfacesHelper.php @@ -2,6 +2,7 @@ namespace PHPStan\Rules\Generics; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\ClassReflection; use PHPStan\Rules\IdentifierRuleError; use PHPStan\Rules\RuleErrorBuilder; @@ -9,6 +10,7 @@ use function array_key_exists; use function sprintf; +#[AutowiredService] final class CrossCheckInterfacesHelper { diff --git a/src/Rules/Generics/GenericObjectTypeCheck.php b/src/Rules/Generics/GenericObjectTypeCheck.php index c0a4936bdc..0ed2f74166 100644 --- a/src/Rules/Generics/GenericObjectTypeCheck.php +++ b/src/Rules/Generics/GenericObjectTypeCheck.php @@ -2,6 +2,7 @@ namespace PHPStan\Rules\Generics; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Rules\IdentifierRuleError; use PHPStan\Rules\RuleErrorBuilder; use PHPStan\ShouldNotHappenException; @@ -23,6 +24,7 @@ use function sprintf; use function strtolower; +#[AutowiredService] final class GenericObjectTypeCheck { diff --git a/src/Rules/Generics/MethodTagTemplateTypeCheck.php b/src/Rules/Generics/MethodTagTemplateTypeCheck.php index afa672f983..31eb219ad8 100644 --- a/src/Rules/Generics/MethodTagTemplateTypeCheck.php +++ b/src/Rules/Generics/MethodTagTemplateTypeCheck.php @@ -4,6 +4,7 @@ use PhpParser\Node\Stmt\ClassLike; use PHPStan\Analyser\Scope; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Internal\SprintfHelper; use PHPStan\Reflection\ClassReflection; use PHPStan\Rules\IdentifierRuleError; @@ -15,6 +16,7 @@ use function array_merge; use function sprintf; +#[AutowiredService] final class MethodTagTemplateTypeCheck { diff --git a/src/Rules/Generics/VarianceCheck.php b/src/Rules/Generics/VarianceCheck.php index d01dbf75a3..cd8d7192bf 100644 --- a/src/Rules/Generics/VarianceCheck.php +++ b/src/Rules/Generics/VarianceCheck.php @@ -2,6 +2,7 @@ namespace PHPStan\Rules\Generics; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\ExtendedParametersAcceptor; use PHPStan\Rules\IdentifierRuleError; use PHPStan\Rules\RuleErrorBuilder; @@ -10,6 +11,7 @@ use PHPStan\Type\Type; use function sprintf; +#[AutowiredService] final class VarianceCheck { diff --git a/src/Rules/InternalTag/RestrictedInternalUsageHelper.php b/src/Rules/InternalTag/RestrictedInternalUsageHelper.php index 1767c02fbb..f5c6147b13 100644 --- a/src/Rules/InternalTag/RestrictedInternalUsageHelper.php +++ b/src/Rules/InternalTag/RestrictedInternalUsageHelper.php @@ -3,10 +3,12 @@ namespace PHPStan\Rules\InternalTag; use PHPStan\Analyser\Scope; +use PHPStan\DependencyInjection\AutowiredService; use function array_slice; use function explode; use function str_starts_with; +#[AutowiredService] final class RestrictedInternalUsageHelper { diff --git a/src/Rules/Methods/LazyAlwaysUsedMethodExtensionProvider.php b/src/Rules/Methods/LazyAlwaysUsedMethodExtensionProvider.php index 6fca3226a5..1a2b49ee38 100644 --- a/src/Rules/Methods/LazyAlwaysUsedMethodExtensionProvider.php +++ b/src/Rules/Methods/LazyAlwaysUsedMethodExtensionProvider.php @@ -2,8 +2,10 @@ namespace PHPStan\Rules\Methods; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\DependencyInjection\Container; +#[AutowiredService] final class LazyAlwaysUsedMethodExtensionProvider implements AlwaysUsedMethodExtensionProvider { diff --git a/src/Rules/Methods/MethodParameterComparisonHelper.php b/src/Rules/Methods/MethodParameterComparisonHelper.php index 34f66bb8bb..a52dbe86f5 100644 --- a/src/Rules/Methods/MethodParameterComparisonHelper.php +++ b/src/Rules/Methods/MethodParameterComparisonHelper.php @@ -2,6 +2,7 @@ namespace PHPStan\Rules\Methods; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Php\PhpVersion; use PHPStan\Reflection\ClassReflection; use PHPStan\Reflection\ExtendedMethodReflection; @@ -21,6 +22,7 @@ use function count; use function sprintf; +#[AutowiredService] final class MethodParameterComparisonHelper { diff --git a/src/Rules/Methods/MethodVisibilityComparisonHelper.php b/src/Rules/Methods/MethodVisibilityComparisonHelper.php index 4807453f2a..f0e922deec 100755 --- a/src/Rules/Methods/MethodVisibilityComparisonHelper.php +++ b/src/Rules/Methods/MethodVisibilityComparisonHelper.php @@ -2,6 +2,7 @@ namespace PHPStan\Rules\Methods; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\ClassReflection; use PHPStan\Reflection\ExtendedMethodReflection; use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection; @@ -9,6 +10,7 @@ use PHPStan\Rules\RuleErrorBuilder; use function sprintf; +#[AutowiredService] final class MethodVisibilityComparisonHelper { diff --git a/src/Rules/NullsafeCheck.php b/src/Rules/NullsafeCheck.php index a4424b69ac..4bd8d724ad 100644 --- a/src/Rules/NullsafeCheck.php +++ b/src/Rules/NullsafeCheck.php @@ -3,7 +3,9 @@ namespace PHPStan\Rules; use PhpParser\Node\Expr; +use PHPStan\DependencyInjection\AutowiredService; +#[AutowiredService] final class NullsafeCheck { diff --git a/src/Rules/ParameterCastableToStringCheck.php b/src/Rules/ParameterCastableToStringCheck.php index 9753863557..244cd1ba4f 100644 --- a/src/Rules/ParameterCastableToStringCheck.php +++ b/src/Rules/ParameterCastableToStringCheck.php @@ -5,12 +5,14 @@ use PhpParser\Node\Arg; use PHPStan\Analyser\ArgumentsNormalizer; use PHPStan\Analyser\Scope; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\ParameterReflection; use PHPStan\Type\ErrorType; use PHPStan\Type\Type; use PHPStan\Type\VerbosityLevel; use function sprintf; +#[AutowiredService] final class ParameterCastableToStringCheck { diff --git a/src/Rules/PhpDoc/ConditionalReturnTypeRuleHelper.php b/src/Rules/PhpDoc/ConditionalReturnTypeRuleHelper.php index f48a8abc7a..af7cfda155 100644 --- a/src/Rules/PhpDoc/ConditionalReturnTypeRuleHelper.php +++ b/src/Rules/PhpDoc/ConditionalReturnTypeRuleHelper.php @@ -2,6 +2,7 @@ namespace PHPStan\Rules\PhpDoc; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\ExtendedParametersAcceptor; use PHPStan\Rules\IdentifierRuleError; use PHPStan\Rules\RuleErrorBuilder; @@ -17,6 +18,7 @@ use function sprintf; use function substr; +#[AutowiredService] final class ConditionalReturnTypeRuleHelper { diff --git a/src/Rules/PhpDoc/GenericCallableRuleHelper.php b/src/Rules/PhpDoc/GenericCallableRuleHelper.php index c32491fe42..d38279a659 100644 --- a/src/Rules/PhpDoc/GenericCallableRuleHelper.php +++ b/src/Rules/PhpDoc/GenericCallableRuleHelper.php @@ -4,6 +4,7 @@ use PhpParser\Node; use PHPStan\Analyser\Scope; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\PhpDoc\Tag\TemplateTag; use PHPStan\Reflection\ClassReflection; use PHPStan\Rules\Generics\TemplateTypeCheck; @@ -18,6 +19,7 @@ use function array_keys; use function sprintf; +#[AutowiredService] final class GenericCallableRuleHelper { diff --git a/src/Rules/PhpDoc/IncompatiblePhpDocTypeCheck.php b/src/Rules/PhpDoc/IncompatiblePhpDocTypeCheck.php index 56c0ac529e..8fcc1569d2 100644 --- a/src/Rules/PhpDoc/IncompatiblePhpDocTypeCheck.php +++ b/src/Rules/PhpDoc/IncompatiblePhpDocTypeCheck.php @@ -4,6 +4,7 @@ use PhpParser\Node; use PHPStan\Analyser\Scope; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Internal\SprintfHelper; use PHPStan\PhpDoc\ResolvedPhpDocBlock; use PHPStan\PhpDoc\Tag\ParamOutTag; @@ -19,6 +20,7 @@ use function in_array; use function sprintf; +#[AutowiredService] final class IncompatiblePhpDocTypeCheck { diff --git a/src/Rules/PhpDoc/UnresolvableTypeHelper.php b/src/Rules/PhpDoc/UnresolvableTypeHelper.php index 25b485dfad..69f539f373 100644 --- a/src/Rules/PhpDoc/UnresolvableTypeHelper.php +++ b/src/Rules/PhpDoc/UnresolvableTypeHelper.php @@ -2,11 +2,13 @@ namespace PHPStan\Rules\PhpDoc; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Type\ErrorType; use PHPStan\Type\NeverType; use PHPStan\Type\Type; use PHPStan\Type\TypeTraverser; +#[AutowiredService] final class UnresolvableTypeHelper { diff --git a/src/Rules/Playground/NeverRuleHelper.php b/src/Rules/Playground/NeverRuleHelper.php index 9865d3d1ce..a0870f7ce3 100644 --- a/src/Rules/Playground/NeverRuleHelper.php +++ b/src/Rules/Playground/NeverRuleHelper.php @@ -3,10 +3,12 @@ namespace PHPStan\Rules\Playground; use PhpParser\Node; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Node\ReturnStatementsNode; use PHPStan\Type\NeverType; use PHPStan\Type\Type; +#[AutowiredService] final class NeverRuleHelper { diff --git a/src/Rules/Properties/LazyReadWritePropertiesExtensionProvider.php b/src/Rules/Properties/LazyReadWritePropertiesExtensionProvider.php index f42cb7e7d5..07dfafea6b 100644 --- a/src/Rules/Properties/LazyReadWritePropertiesExtensionProvider.php +++ b/src/Rules/Properties/LazyReadWritePropertiesExtensionProvider.php @@ -2,8 +2,10 @@ namespace PHPStan\Rules\Properties; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\DependencyInjection\Container; +#[AutowiredService] final class LazyReadWritePropertiesExtensionProvider implements ReadWritePropertiesExtensionProvider { diff --git a/src/Rules/Properties/PropertyDescriptor.php b/src/Rules/Properties/PropertyDescriptor.php index 8588a1a57a..d9d6e10c99 100644 --- a/src/Rules/Properties/PropertyDescriptor.php +++ b/src/Rules/Properties/PropertyDescriptor.php @@ -4,11 +4,13 @@ use PhpParser\Node; use PHPStan\Analyser\Scope; +use PHPStan\DependencyInjection\AutowiredService; use PHPStan\Reflection\PropertyReflection; use PHPStan\Type\ObjectType; use PHPStan\Type\VerbosityLevel; use function sprintf; +#[AutowiredService] final class PropertyDescriptor {