AutowiredService - support for "as" - limiting the type under which the service is known to autowiring

Author: ondrejmirtes

conf/config.neon

@@ -233,11 +233,6 @@ conditionalTags:
 
 services:
 
-	-
-		class: PHPStan\Node\Printer\Printer
-		autowired:
-			- PHPStan\Node\Printer\Printer
-
 	-
 		class: PHPStan\Php\PhpVersion
 		factory: @PHPStan\Php\PhpVersionFactory::create
@@ -250,19 +245,6 @@ services:
 		class: PHPStan\PhpDoc\TypeNodeResolverExtensionRegistryProvider
 		factory: PHPStan\PhpDoc\LazyTypeNodeResolverExtensionRegistryProvider
 
-	-
-		class: PHPStan\PhpDoc\DefaultStubFilesProvider
-		arguments:
-			stubFiles: %stubFiles%
-			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
-		autowired:
-			- PHPStan\PhpDoc\StubFilesProvider
-
-	-
-		class: PHPStan\Analyser\LazyInternalScopeFactory
-		autowired:
-			- PHPStan\Analyser\InternalScopeFactory
-
 	-
 		class: PHPStan\Analyser\NodeScopeResolver
 		arguments:
@@ -309,11 +291,6 @@ services:
 		arguments:
 			originalContainer: @PHPStan\DependencyInjection\Nette\NetteContainer
 
-	-
-		class: PHPStan\DependencyInjection\Nette\NetteContainer
-		autowired:
-			- PHPStan\DependencyInjection\Nette\NetteContainer
-
 	-
 		class: PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider
 		factory: PHPStan\DependencyInjection\Reflection\LazyClassReflectionExtensionRegistryProvider
@@ -365,32 +342,10 @@ services:
 		class: PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider
 		factory: PHPStan\Reflection\ReflectionProvider\LazyReflectionProviderProvider
 
-	-
-		class: PHPStan\Reflection\SignatureMap\FunctionSignatureMapProvider
-		arguments:
-			stricterFunctionMap: %featureToggles.stricterFunctionMap%
-		autowired:
-			- PHPStan\Reflection\SignatureMap\FunctionSignatureMapProvider
-
-	-
-		class: PHPStan\Reflection\SignatureMap\Php8SignatureMapProvider
-		autowired:
-			- PHPStan\Reflection\SignatureMap\Php8SignatureMapProvider
-
 	-
 		class: PHPStan\Reflection\SignatureMap\SignatureMapProvider
 		factory: @PHPStan\Reflection\SignatureMap\SignatureMapProviderFactory::create()
 
-	-
-		class: PHPStan\Rules\Exceptions\DefaultExceptionTypeResolver
-		arguments:
-			uncheckedExceptionRegexes: %exceptions.uncheckedExceptionRegexes%
-			uncheckedExceptionClasses: %exceptions.uncheckedExceptionClasses%
-			checkedExceptionRegexes: %exceptions.checkedExceptionRegexes%
-			checkedExceptionClasses: %exceptions.checkedExceptionClasses%
-		autowired:
-			- PHPStan\Rules\Exceptions\DefaultExceptionTypeResolver
-
 	-
 		class: PHPStan\Type\TypeAliasResolver
 		factory: PHPStan\Type\UsefulTypeAliasResolver
@@ -430,11 +385,6 @@ services:
 			parentDirectory: %currentWorkingDirectory%
 		autowired: false
 
-	registry:
-		class: PHPStan\Rules\LazyRegistry
-		autowired:
-			- PHPStan\Rules\Registry
-
 	# Reflection providers
 
 	betterReflectionReflector:
@@ -484,10 +434,3 @@ services:
 			allConfigFiles: %allConfigFiles%
 			configPhpVersion: %phpVersion%
 		autowired: false
-
-	# Error formatters
-
-	-
-		class: PHPStan\Command\ErrorFormatter\CiDetectedErrorFormatter
-		autowired:
-			- PHPStan\Command\ErrorFormatter\CiDetectedErrorFormatter

src/Analyser/LazyInternalScopeFactory.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Analyser;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider;
 use PHPStan\DependencyInjection\Type\ExpressionTypeResolverExtensionRegistryProvider;
@@ -14,6 +15,7 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
 
+#[AutowiredService(as: InternalScopeFactory::class)]
 final class LazyInternalScopeFactory implements InternalScopeFactory
 {
 

src/Command/ErrorFormatter/CiDetectedErrorFormatter.php

@@ -6,10 +6,12 @@
 use OndraM\CiDetector\Exception\CiNotDetectedException;
 use PHPStan\Command\AnalysisResult;
 use PHPStan\Command\Output;
+use PHPStan\DependencyInjection\AutowiredService;
 
 /**
  * @api
  */
+#[AutowiredService(as: CiDetectedErrorFormatter::class)]
 final class CiDetectedErrorFormatter implements ErrorFormatter
 {
 

src/DependencyInjection/AutowiredAttributeServicesExtension.php

@@ -41,7 +41,7 @@ public function loadConfiguration(): void
 
 			$definition = $builder->addDefinition($attribute->name)
 				->setType($class->name)
-				->setAutowired();
+				->setAutowired($attribute->as);
 
 			$this->processParameters($class->name, $definition, $autowiredParameters);
 

src/DependencyInjection/AutowiredService.php

@@ -16,7 +16,11 @@
 final class AutowiredService
 {
 
-	public function __construct(public ?string $name = null)
+	/**
+	 * @param string|null $name
+	 * @param true|list<class-string>|class-string $as
+	 */
+	public function __construct(public ?string $name = null, public bool|array|string $as = true)
 	{
 	}
 

src/DependencyInjection/Nette/NetteContainer.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\DependencyInjection\Nette;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\MissingServiceException;
 use PHPStan\DependencyInjection\ParameterNotFoundException;
@@ -12,6 +13,7 @@
 /**
  * @internal
  */
+#[AutowiredService(as: NetteContainer::class)]
 final class NetteContainer implements Container
 {
 

src/Node/Printer/Printer.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Node\Printer;
 
 use PhpParser\PrettyPrinter\Standard;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\Expr\AlwaysRememberedExpr;
 use PHPStan\Node\Expr\ExistingArrayDimFetch;
 use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
@@ -22,6 +23,7 @@
 /**
  * @api
  */
+#[AutowiredService(as: Printer::class)]
 final class Printer extends Standard
 {
 

src/PhpDoc/DefaultStubFilesProvider.php

@@ -2,13 +2,16 @@
 
 namespace PHPStan\PhpDoc;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Internal\ComposerHelper;
 use function array_filter;
 use function array_values;
 use function str_contains;
 use function strtr;
 
+#[AutowiredService(as: StubFilesProvider::class)]
 final class DefaultStubFilesProvider implements StubFilesProvider
 {
 
@@ -24,7 +27,9 @@ final class DefaultStubFilesProvider implements StubFilesProvider
 	 */
 	public function __construct(
 		private Container $container,
+		#[AutowiredParameter]
 		private array $stubFiles,
+		#[AutowiredParameter]
 		private array $composerAutoloaderProjectPaths,
 	)
 	{

src/Reflection/SignatureMap/FunctionSignatureMapProvider.php

@@ -4,6 +4,8 @@
 
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionFunction;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionMethod;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\InitializerExprContext;
 use PHPStan\Reflection\InitializerExprTypeResolver;
@@ -19,6 +21,7 @@
 use function strtolower;
 use const CASE_LOWER;
 
+#[AutowiredService(as: FunctionSignatureMapProvider::class)]
 final class FunctionSignatureMapProvider implements SignatureMapProvider
 {
 
@@ -32,6 +35,7 @@ public function __construct(
 		private SignatureMapParser $parser,
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
 		private PhpVersion $phpVersion,
+		#[AutowiredParameter(ref: '%featureToggles.stricterFunctionMap%')]
 		private bool $stricterFunctionMap,
 	)
 	{

src/Reflection/SignatureMap/Php8SignatureMapProvider.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionMethod;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Php8StubsMap;
 use PHPStan\PhpDoc\Tag\ParamTag;
@@ -34,6 +35,7 @@
 use function sprintf;
 use function strtolower;
 
+#[AutowiredService(as: Php8SignatureMapProvider::class)]
 final class Php8SignatureMapProvider implements SignatureMapProvider
 {