More #[AutowiredService]

ondrejmirtes · ondrejmirtes · commit 94e4b6ee6f7b · 2025-06-05T21:47:42.000+02:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -277,34 +277,6 @@ services:
 		class: PHPStan\Collectors\Registry
 		factory: @PHPStan\Collectors\RegistryFactory::create
 
-	-
-		class: PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider
-		factory: PHPStan\DependencyInjection\Reflection\LazyClassReflectionExtensionRegistryProvider
-
-	-
-		class: PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider
-		factory: PHPStan\DependencyInjection\Type\LazyDynamicReturnTypeExtensionRegistryProvider
-
-	-
-		class: PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider
-		factory: PHPStan\DependencyInjection\Type\LazyParameterOutTypeExtensionProvider
-
-	-
-		class: PHPStan\DependencyInjection\Type\ExpressionTypeResolverExtensionRegistryProvider
-		factory: PHPStan\DependencyInjection\Type\LazyExpressionTypeResolverExtensionRegistryProvider
-
-	-
-		class: PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider
-		factory: PHPStan\DependencyInjection\Type\LazyOperatorTypeSpecifyingExtensionRegistryProvider
-
-	-
-		class: PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider
-		factory: PHPStan\DependencyInjection\Type\LazyDynamicThrowTypeExtensionProvider
-
-	-
-		class: PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider
-		factory: PHPStan\DependencyInjection\Type\LazyParameterClosureTypeExtensionProvider
-
 	-
 		implement: PHPStan\File\FileExcluderRawFactory
 
@@ -324,36 +296,14 @@ services:
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider
-		factory: PHPStan\Reflection\ReflectionProvider\LazyReflectionProviderProvider
-
 	-
 		class: PHPStan\Reflection\SignatureMap\SignatureMapProvider
 		factory: @PHPStan\Reflection\SignatureMap\SignatureMapProviderFactory::create()
 
-	-
-		class: PHPStan\Type\TypeAliasResolver
-		factory: PHPStan\Type\UsefulTypeAliasResolver
-		arguments:
-			globalTypeAliases: %typeAliases%
-
-	-
-		class: PHPStan\Type\TypeAliasResolverProvider
-		factory: PHPStan\Type\LazyTypeAliasResolverProvider
-
 	typeSpecifier:
 		class: PHPStan\Analyser\TypeSpecifier
 		factory: @typeSpecifierFactory::create
 
-	relativePathHelper:
-		class: PHPStan\File\RelativePathHelper
-		factory: PHPStan\File\FuzzyRelativePathHelper
-		arguments:
-			currentWorkingDirectory: %currentWorkingDirectory%
-			analysedPaths: %analysedPaths%
-			fallbackRelativePathHelper: @parentDirectoryRelativePathHelper
-
 	simpleRelativePathHelper:
 		class: PHPStan\File\RelativePathHelper
 		factory: PHPStan\File\SimpleRelativePathHelper
diff --git a/src/DependencyInjection/Reflection/LazyClassReflectionExtensionRegistryProvider.php b/src/DependencyInjection/Reflection/LazyClassReflectionExtensionRegistryProvider.php
@@ -3,6 +3,7 @@
 namespace PHPStan\DependencyInjection\Reflection;
 
 use PHPStan\Broker\BrokerFactory;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Reflection\Annotations\AnnotationsMethodsClassReflectionExtension;
 use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
@@ -15,6 +16,7 @@
 use PHPStan\Reflection\RequireExtension\RequireExtendsPropertiesClassReflectionExtension;
 use function array_merge;
 
+#[AutowiredService(as: ClassReflectionExtensionRegistryProvider::class)]
 final class LazyClassReflectionExtensionRegistryProvider implements ClassReflectionExtensionRegistryProvider
 {
 
diff --git a/src/DependencyInjection/Type/LazyDynamicReturnTypeExtensionRegistryProvider.php b/src/DependencyInjection/Type/LazyDynamicReturnTypeExtensionRegistryProvider.php
@@ -3,10 +3,12 @@
 namespace PHPStan\DependencyInjection\Type;
 
 use PHPStan\Broker\BrokerFactory;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\DynamicReturnTypeExtensionRegistry;
 
+#[AutowiredService(as: DynamicReturnTypeExtensionRegistryProvider::class)]
 final class LazyDynamicReturnTypeExtensionRegistryProvider implements DynamicReturnTypeExtensionRegistryProvider
 {
 
diff --git a/src/DependencyInjection/Type/LazyDynamicThrowTypeExtensionProvider.php b/src/DependencyInjection/Type/LazyDynamicThrowTypeExtensionProvider.php
@@ -2,8 +2,10 @@
 
 namespace PHPStan\DependencyInjection\Type;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService(as: DynamicThrowTypeExtensionProvider::class)]
 final class LazyDynamicThrowTypeExtensionProvider implements DynamicThrowTypeExtensionProvider
 {
 
diff --git a/src/DependencyInjection/Type/LazyExpressionTypeResolverExtensionRegistryProvider.php b/src/DependencyInjection/Type/LazyExpressionTypeResolverExtensionRegistryProvider.php
@@ -3,9 +3,11 @@
 namespace PHPStan\DependencyInjection\Type;
 
 use PHPStan\Broker\BrokerFactory;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Type\ExpressionTypeResolverExtensionRegistry;
 
+#[AutowiredService(as: ExpressionTypeResolverExtensionRegistryProvider::class)]
 final class LazyExpressionTypeResolverExtensionRegistryProvider implements ExpressionTypeResolverExtensionRegistryProvider
 {
 
diff --git a/src/DependencyInjection/Type/LazyOperatorTypeSpecifyingExtensionRegistryProvider.php b/src/DependencyInjection/Type/LazyOperatorTypeSpecifyingExtensionRegistryProvider.php
@@ -3,9 +3,11 @@
 namespace PHPStan\DependencyInjection\Type;
 
 use PHPStan\Broker\BrokerFactory;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Type\OperatorTypeSpecifyingExtensionRegistry;
 
+#[AutowiredService(as: OperatorTypeSpecifyingExtensionRegistryProvider::class)]
 final class LazyOperatorTypeSpecifyingExtensionRegistryProvider implements OperatorTypeSpecifyingExtensionRegistryProvider
 {
 
diff --git a/src/DependencyInjection/Type/LazyParameterClosureTypeExtensionProvider.php b/src/DependencyInjection/Type/LazyParameterClosureTypeExtensionProvider.php
@@ -2,8 +2,10 @@
 
 namespace PHPStan\DependencyInjection\Type;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService(as: ParameterClosureTypeExtensionProvider::class)]
 final class LazyParameterClosureTypeExtensionProvider implements ParameterClosureTypeExtensionProvider
 {
 
diff --git a/src/DependencyInjection/Type/LazyParameterOutTypeExtensionProvider.php b/src/DependencyInjection/Type/LazyParameterOutTypeExtensionProvider.php
@@ -2,8 +2,10 @@
 
 namespace PHPStan\DependencyInjection\Type;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService(as: ParameterOutTypeExtensionProvider::class)]
 final class LazyParameterOutTypeExtensionProvider implements ParameterOutTypeExtensionProvider
 {
 
diff --git a/src/File/FuzzyRelativePathHelper.php b/src/File/FuzzyRelativePathHelper.php
@@ -2,6 +2,8 @@
 
 namespace PHPStan\File;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use function count;
 use function explode;
 use function implode;
@@ -14,6 +16,7 @@
 use function substr;
 use const DIRECTORY_SEPARATOR;
 
+#[AutowiredService(name: 'relativePathHelper', as: RelativePathHelper::class)]
 final class FuzzyRelativePathHelper implements RelativePathHelper
 {
 
@@ -26,8 +29,11 @@ final class FuzzyRelativePathHelper implements RelativePathHelper
 	 * @param non-empty-string|null $directorySeparator
 	 */
 	public function __construct(
+		#[AutowiredParameter(ref: '@parentDirectoryRelativePathHelper')]
 		private RelativePathHelper $fallbackRelativePathHelper,
+		#[AutowiredParameter]
 		string $currentWorkingDirectory,
+		#[AutowiredParameter]
 		array $analysedPaths,
 		?string $directorySeparator = null,
 	)
diff --git a/src/Reflection/ReflectionProvider/LazyReflectionProviderProvider.php b/src/Reflection/ReflectionProvider/LazyReflectionProviderProvider.php
@@ -2,9 +2,11 @@
 
 namespace PHPStan\Reflection\ReflectionProvider;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Reflection\ReflectionProvider;
 
+#[AutowiredService(as: ReflectionProviderProvider::class)]
 final class LazyReflectionProviderProvider implements ReflectionProviderProvider
 {
 
diff --git a/src/Type/LazyTypeAliasResolverProvider.php b/src/Type/LazyTypeAliasResolverProvider.php
@@ -2,8 +2,10 @@
 
 namespace PHPStan\Type;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService(as: TypeAliasResolverProvider::class)]
 final class LazyTypeAliasResolverProvider implements TypeAliasResolverProvider
 {
 
diff --git a/src/Type/UsefulTypeAliasResolver.php b/src/Type/UsefulTypeAliasResolver.php
@@ -3,13 +3,16 @@
 namespace PHPStan\Type;
 
 use PHPStan\Analyser\NameScope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDoc\TypeNodeResolver;
 use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
 use function array_key_exists;
 use function sprintf;
 
+#[AutowiredService(as: TypeAliasResolver::class)]
 final class UsefulTypeAliasResolver implements TypeAliasResolver
 {
 
@@ -29,6 +32,7 @@ final class UsefulTypeAliasResolver implements TypeAliasResolver
 	 * @param array<string, string> $globalTypeAliases
 	 */
 	public function __construct(
+		#[AutowiredParameter(ref: '%typeAliases%')]
 		private array $globalTypeAliases,
 		private TypeStringResolver $typeStringResolver,
 		private TypeNodeResolver $typeNodeResolver,

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\DependencyInjection\Type;`
`4`	`4`
	`5`	`+use PHPStan\DependencyInjection\AutowiredService;`
`5`	`6`	`use PHPStan\DependencyInjection\Container;`
`6`	`7`
	`8`	`+#[AutowiredService(as: DynamicThrowTypeExtensionProvider::class)]`
`7`	`9`	`final class LazyDynamicThrowTypeExtensionProvider implements DynamicThrowTypeExtensionProvider`
`8`	`10`	`{`
`9`	`11`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,11 @@`
`3`	`3`	`namespace PHPStan\DependencyInjection\Type;`
`4`	`4`
`5`	`5`	`use PHPStan\Broker\BrokerFactory;`
	`6`	`+use PHPStan\DependencyInjection\AutowiredService;`
`6`	`7`	`use PHPStan\DependencyInjection\Container;`
`7`	`8`	`use PHPStan\Type\ExpressionTypeResolverExtensionRegistry;`
`8`	`9`
	`10`	`+#[AutowiredService(as: ExpressionTypeResolverExtensionRegistryProvider::class)]`
`9`	`11`	`final class LazyExpressionTypeResolverExtensionRegistryProvider implements ExpressionTypeResolverExtensionRegistryProvider`
`10`	`12`	`{`
`11`	`13`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\Reflection\ReflectionProvider;`
`4`	`4`
	`5`	`+use PHPStan\DependencyInjection\AutowiredService;`
`5`	`6`	`use PHPStan\DependencyInjection\Container;`
`6`	`7`	`use PHPStan\Reflection\ReflectionProvider;`
`7`	`8`
	`9`	`+#[AutowiredService(as: ReflectionProviderProvider::class)]`
`8`	`10`	`final class LazyReflectionProviderProvider implements ReflectionProviderProvider`
`9`	`11`	`{`
`10`	`12`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\Type;`
`4`	`4`
	`5`	`+use PHPStan\DependencyInjection\AutowiredService;`
`5`	`6`	`use PHPStan\DependencyInjection\Container;`
`6`	`7`
	`8`	`+#[AutowiredService(as: TypeAliasResolverProvider::class)]`
`7`	`9`	`final class LazyTypeAliasResolverProvider implements TypeAliasResolverProvider`
`8`	`10`	`{`
`9`	`11`