More #[AutowiredService]

Author: ondrejmirtes

conf/config.neon

@@ -374,43 +374,21 @@ services:
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorFactory
-		arguments:
-			fileFinder: @fileFinderScan
-
 	-
 		implement: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedPsrAutoloaderLocatorFactory
 
 	-
 		implement: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorFactory
 
-	-
-		class: PHPStan\Reflection\ConstructorsHelper
-		arguments:
-			additionalConstructors: %additionalConstructors%
-
 	-
 		implement: PHPStan\Reflection\Php\PhpMethodReflectionFactory
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Reflection\Php\UniversalObjectCratesClassReflectionExtension
-		tags:
-			- phpstan.broker.propertiesClassReflectionExtension
-		arguments:
-			classes: %universalObjectCratesClasses%
-
 	-
 		class: PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider
 		factory: PHPStan\Reflection\ReflectionProvider\LazyReflectionProviderProvider
 
-	-
-		class: PHPStan\Reflection\SignatureMap\NativeFunctionReflectionProvider
-		arguments:
-			reflector: @betterReflectionReflector
-
 	-
 		class: PHPStan\Reflection\SignatureMap\FunctionSignatureMapProvider
 		arguments:
@@ -427,63 +405,6 @@ services:
 		class: PHPStan\Reflection\SignatureMap\SignatureMapProvider
 		factory: @PHPStan\Reflection\SignatureMap\SignatureMapProviderFactory::create()
 
-	-
-		class: PHPStan\Rules\AttributesCheck
-		arguments:
-			deprecationRulesInstalled: %deprecationRulesInstalled%
-
-	-
-		class: PHPStan\Rules\Arrays\NonexistentOffsetInArrayDimFetchCheck
-		arguments:
-			reportMaybes: %reportMaybes%
-			reportPossiblyNonexistentGeneralArrayOffset: %reportPossiblyNonexistentGeneralArrayOffset%
-			reportPossiblyNonexistentConstantArrayOffset: %reportPossiblyNonexistentConstantArrayOffset%
-
-	-
-		class: PHPStan\Rules\ClassCaseSensitivityCheck
-		arguments:
-			checkInternalClassCaseSensitivity: %checkInternalClassCaseSensitivity%
-
-	-
-		class: PHPStan\Rules\Classes\LocalTypeAliasesCheck
-		arguments:
-			globalTypeAliases: %typeAliases%
-			checkMissingTypehints: %checkMissingTypehints%
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-			discoveringSymbolsTip: %tips.discoveringSymbols%
-
-	-
-		class: PHPStan\Rules\Classes\MethodTagCheck
-		arguments:
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-			checkMissingTypehints: %checkMissingTypehints%
-			discoveringSymbolsTip: %tips.discoveringSymbols%
-
-	-
-		class: PHPStan\Rules\Classes\MixinCheck
-		arguments:
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-			checkMissingTypehints: %checkMissingTypehints%
-			discoveringSymbolsTip: %tips.discoveringSymbols%
-
-	-
-		class: PHPStan\Rules\Classes\PropertyTagCheck
-		arguments:
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-			checkMissingTypehints: %checkMissingTypehints%
-			discoveringSymbolsTip: %tips.discoveringSymbols%
-
-	-
-		class: PHPStan\Rules\Comparison\ConstantConditionRuleHelper
-		arguments:
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-
-	-
-		class: PHPStan\Rules\Comparison\ImpossibleCheckTypeHelper
-		arguments:
-			universalObjectCratesClasses: %universalObjectCratesClasses%
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-
 	-
 		class: PHPStan\Rules\Exceptions\DefaultExceptionTypeResolver
 		arguments:
@@ -494,74 +415,6 @@ services:
 		autowired:
 			- PHPStan\Rules\Exceptions\DefaultExceptionTypeResolver
 
-	-
-		class: PHPStan\Rules\Exceptions\MissingCheckedExceptionInThrowsCheck
-		arguments:
-			exceptionTypeResolver: @exceptionTypeResolver
-
-	-
-		class: PHPStan\Rules\FunctionCallParametersCheck
-		arguments:
-			checkArgumentTypes: %checkFunctionArgumentTypes%
-			checkArgumentsPassedByReference: %checkArgumentsPassedByReference%
-			checkExtraArguments: %checkExtraArguments%
-			checkMissingTypehints: %checkMissingTypehints%
-
-	-
-		class: PHPStan\Rules\Generics\GenericAncestorsCheck
-		arguments:
-			skipCheckGenericClasses: %featureToggles.skipCheckGenericClasses%
-			checkMissingTypehints: %checkMissingTypehints%
-
-	-
-		class: PHPStan\Rules\Generics\TemplateTypeCheck
-		arguments:
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-
-	-
-		class: PHPStan\Rules\IssetCheck
-		arguments:
-			checkAdvancedIsset: %checkAdvancedIsset%
-			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
-
-	-
-		class: PHPStan\Rules\Methods\MethodCallCheck
-		arguments:
-			checkFunctionNameCase: %checkFunctionNameCase%
-			reportMagicMethods: %reportMagicMethods%
-
-	-
-		class: PHPStan\Rules\Methods\StaticMethodCallCheck
-		arguments:
-			checkFunctionNameCase: %checkFunctionNameCase%
-			discoveringSymbolsTip: %tips.discoveringSymbols%
-			reportMagicMethods: %reportMagicMethods%
-
-	-
-		# checked as part of OverridingMethodRule
-		class: PHPStan\Rules\Methods\MethodSignatureRule
-		arguments:
-			reportMaybes: %reportMaybesInMethodSignatures%
-			reportStatic: %reportStaticMethodSignatures%
-
-	-
-		class: PHPStan\Rules\MissingTypehintCheck
-		arguments:
-			checkMissingCallableSignature: %checkMissingCallableSignature%
-			skipCheckGenericClasses: %featureToggles.skipCheckGenericClasses%
-
-	-
-		class: PHPStan\Rules\PhpDoc\AssertRuleHelper
-		arguments:
-			checkMissingTypehints: %checkMissingTypehints%
-			checkClassCaseSensitivity: %checkClassCaseSensitivity%
-
-	-
-		class: PHPStan\Rules\PhpDoc\VarTagTypeRuleHelper
-		arguments:
-			checkTypeAgainstPhpDocType: %reportWrongPhpDocTypeInVarTag%
-			strictWideningCheck: %reportAnyTypeWideningInVarTag%
-
 	-
 		class: PHPStan\Rules\Properties\AccessPropertiesCheck
 		arguments:

conf/services.neon

@@ -160,6 +160,13 @@ services:
 	-
 		class: PHPStan\Rules\Properties\UninitializedPropertyRule
 
+	-
+		# checked as part of OverridingMethodRule
+		class: PHPStan\Rules\Methods\MethodSignatureRule
+		arguments:
+			reportMaybes: %reportMaybesInMethodSignatures%
+			reportStatic: %reportStaticMethodSignatures%
+
 	betterReflectionSourceLocator:
 		class: PHPStan\BetterReflection\SourceLocator\Type\SourceLocator
 		factory: @PHPStan\Reflection\BetterReflection\BetterReflectionSourceLocatorFactory::create

src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocatorFactory.php

@@ -3,6 +3,8 @@
 namespace PHPStan\Reflection\BetterReflection\SourceLocator;
 
 use PHPStan\Cache\Cache;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\File\FileFinder;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\ConstantNameHelper;
@@ -17,6 +19,7 @@
 use function sprintf;
 use function strtolower;
 
+#[AutowiredService]
 final class OptimizedDirectorySourceLocatorFactory
 {
 
@@ -26,6 +29,7 @@ final class OptimizedDirectorySourceLocatorFactory
 
 	public function __construct(
 		private FileNodesFetcher $fileNodesFetcher,
+		#[AutowiredParameter(ref: '@fileFinderScan')]
 		private FileFinder $fileFinder,
 		private PhpVersion $phpVersion,
 		private Cache $cache,

src/Reflection/ConstructorsHelper.php

@@ -2,11 +2,14 @@
 
 namespace PHPStan\Reflection;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use ReflectionException;
 use function array_key_exists;
 use function explode;
 
+#[AutowiredService]
 final class ConstructorsHelper
 {
 
@@ -18,6 +21,7 @@ final class ConstructorsHelper
 	 */
 	public function __construct(
 		private Container $container,
+		#[AutowiredParameter]
 		private array $additionalConstructors,
 	)
 	{

src/Reflection/Php/UniversalObjectCratesClassReflectionExtension.php

@@ -2,13 +2,16 @@
 
 namespace PHPStan\Reflection\Php;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\MixedType;
 
+#[AutowiredService]
 final class UniversalObjectCratesClassReflectionExtension
 	implements PropertiesClassReflectionExtension
 {
@@ -18,6 +21,7 @@ final class UniversalObjectCratesClassReflectionExtension
 	 */
 	public function __construct(
 		private ReflectionProvider $reflectionProvider,
+		#[AutowiredParameter(ref: '%universalObjectCratesClasses%')]
 		private array $classes,
 		private AnnotationsPropertiesClassReflectionExtension $annotationClassReflection,
 	)

src/Reflection/SignatureMap/NativeFunctionReflectionProvider.php

@@ -6,6 +6,8 @@
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionFunction;
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
 use PHPStan\BetterReflection\Reflector\Reflector;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDoc\ResolvedPhpDocBlock;
 use PHPStan\PhpDoc\StubPhpDocProvider;
 use PHPStan\Reflection\Assertions;
@@ -24,6 +26,7 @@
 use function array_map;
 use function strtolower;
 
+#[AutowiredService]
 final class NativeFunctionReflectionProvider
 {
 
@@ -32,6 +35,7 @@ final class NativeFunctionReflectionProvider
 
 	public function __construct(
 		private SignatureMapProvider $signatureMapProvider,
+		#[AutowiredParameter(ref: '@betterReflectionReflector')]
 		private Reflector $reflector,
 		private FileTypeMapper $fileTypeMapper,
 		private StubPhpDocProvider $stubPhpDocProvider,

src/Rules/Arrays/NonexistentOffsetInArrayDimFetchCheck.php

@@ -5,6 +5,8 @@
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\NullsafeOperatorHelper;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Rules\RuleLevelHelper;
@@ -17,13 +19,17 @@
 use function count;
 use function sprintf;
 
+#[AutowiredService]
 final class NonexistentOffsetInArrayDimFetchCheck
 {
 
 	public function __construct(
 		private RuleLevelHelper $ruleLevelHelper,
+		#[AutowiredParameter]
 		private bool $reportMaybes,
+		#[AutowiredParameter]
 		private bool $reportPossiblyNonexistentGeneralArrayOffset,
+		#[AutowiredParameter]
 		private bool $reportPossiblyNonexistentConstantArrayOffset,
 	)
 	{

src/Rules/AttributesCheck.php

@@ -6,6 +6,8 @@
 use PhpParser\Node\AttributeGroup;
 use PhpParser\Node\Expr\New_;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Internal\SprintfHelper;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ReflectionProvider;
@@ -14,13 +16,15 @@
 use function sprintf;
 use function strtolower;
 
+#[AutowiredService]
 final class AttributesCheck
 {
 
 	public function __construct(
 		private ReflectionProvider $reflectionProvider,
 		private FunctionCallParametersCheck $functionCallParametersCheck,
 		private ClassNameCheck $classCheck,
+		#[AutowiredParameter]
 		private bool $deprecationRulesInstalled,
 	)
 	{

src/Rules/ClassCaseSensitivityCheck.php

@@ -2,14 +2,21 @@
 
 namespace PHPStan\Rules;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ReflectionProvider;
 use function sprintf;
 use function strtolower;
 
+#[AutowiredService]
 final class ClassCaseSensitivityCheck
 {
 
-	public function __construct(private ReflectionProvider $reflectionProvider, private bool $checkInternalClassCaseSensitivity)
+	public function __construct(
+		private ReflectionProvider $reflectionProvider,
+		#[AutowiredParameter]
+		private bool $checkInternalClassCaseSensitivity,
+	)
 	{
 	}