More #[AutowiredService]

Author: ondrejmirtes

conf/config.neon

@@ -252,10 +252,6 @@ services:
 		class: PHPStan\Php\PhpVersionFactory
 		factory: @PHPStan\Php\PhpVersionFactoryFactory::create
 
-	-
-		class: PHPStan\PhpDoc\TypeNodeResolverExtensionRegistryProvider
-		factory: PHPStan\PhpDoc\LazyTypeNodeResolverExtensionRegistryProvider
-
 	-
 		class: PHPStan\Analyser\ConstantResolver
 		factory: @PHPStan\Analyser\ConstantResolverFactory::create()
@@ -281,12 +277,6 @@ services:
 		class: PHPStan\Collectors\Registry
 		factory: @PHPStan\Collectors\RegistryFactory::create
 
-	-
-		class: PHPStan\DependencyInjection\Container
-		factory: PHPStan\DependencyInjection\MemoizingContainer
-		arguments:
-			originalContainer: @PHPStan\DependencyInjection\Nette\NetteContainer
-
 	-
 		class: PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider
 		factory: PHPStan\DependencyInjection\Reflection\LazyClassReflectionExtensionRegistryProvider

src/DependencyInjection/MemoizingContainer.php

@@ -4,13 +4,17 @@
 
 use function array_key_exists;
 
+#[AutowiredService(as: Container::class)]
 final class MemoizingContainer implements Container
 {
 
 	/** @var array<string, mixed> */
 	private array $servicesByType = [];
 
-	public function __construct(private Container $originalContainer)
+	public function __construct(
+		#[AutowiredParameter(ref: '@PHPStan\DependencyInjection\Nette\NetteContainer')]
+		private Container $originalContainer,
+	)
 	{
 	}
 

src/PhpDoc/LazyTypeNodeResolverExtensionRegistryProvider.php

@@ -2,8 +2,10 @@
 
 namespace PHPStan\PhpDoc;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService(as: TypeNodeResolverExtensionRegistryProvider::class)]
 final class LazyTypeNodeResolverExtensionRegistryProvider implements TypeNodeResolverExtensionRegistryProvider
 {