#[NonAutowiredService] attribute

Author: ondrejmirtes

conf/services.neon

@@ -42,6 +42,13 @@ services:
 		autowired:
 			- PHPStan\BetterReflection\SourceLocator\SourceStubber\ReflectionSourceStubber
 
+	originalBetterReflectionReflector:
+		class: PHPStan\BetterReflection\Reflector\DefaultReflector
+		arguments:
+			sourceLocator: @betterReflectionSourceLocator
+		autowired: false
+
+
 	# not registered using attributes because we don't want to apply service tags automatically
 	-
 		class: PHPStan\Dependency\ExportedNodeVisitor
@@ -235,32 +242,3 @@ services:
 	nodeScopeResolverReflector:
 		factory: @betterReflectionReflector
 		autowired: false
-
-	# could be registered using attributes
-
-	simpleRelativePathHelper:
-		factory: PHPStan\File\SimpleRelativePathHelper
-		arguments:
-			currentWorkingDirectory: %currentWorkingDirectory%
-		autowired: false
-
-	parentDirectoryRelativePathHelper:
-		factory: PHPStan\File\ParentDirectoryRelativePathHelper
-		arguments:
-			parentDirectory: %currentWorkingDirectory%
-		autowired: false
-
-	# Reflection providers
-
-	betterReflectionProvider:
-		class: PHPStan\Reflection\BetterReflection\BetterReflectionProvider
-		arguments:
-			reflector: @betterReflectionReflector
-			universalObjectCratesClasses: %universalObjectCratesClasses%
-		autowired: false
-
-	originalBetterReflectionReflector:
-		class: PHPStan\BetterReflection\Reflector\DefaultReflector
-		arguments:
-			sourceLocator: @betterReflectionSourceLocator
-		autowired: false

src/DependencyInjection/AutowiredAttributeServicesExtension.php

@@ -64,6 +64,21 @@ public function loadConfiguration(): void
 			}
 		}
 
+		foreach (Attributes::findTargetClasses(NonAutowiredService::class) as $class) {
+			$attribute = $class->attribute;
+
+			$definition = $builder->addDefinition($attribute->name)
+				->setType($class->name)
+				->setAutowired(false);
+
+			if ($attribute->factory !== null) {
+				[$ref, $method] = explode('::', $attribute->factory);
+				$definition->setFactory(new Statement([new Reference(substr($ref, 1)), $method]));
+			}
+
+			$this->processParameters($class->name, $definition, $autowiredParameters);
+		}
+
 		foreach (Attributes::findTargetClasses(GenerateFactory::class) as $class) {
 			$attribute = $class->attribute;
 			$definition = $builder->addFactoryDefinition(null)

src/DependencyInjection/NonAutowiredService.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+use Attribute;
+
+/**
+ * Registers a non-autowired named service in the DI container.
+
+ * Works thanks to https://github.com/ondrejmirtes/composer-attribute-collector
+ * and AutowiredAttributeServicesExtension.
+ */
+#[Attribute(flags: Attribute::TARGET_CLASS)]
+final class NonAutowiredService
+{
+
+	public function __construct(
+		public string $name,
+		public ?string $factory = null,
+	)
+	{
+	}
+
+}

src/File/ParentDirectoryRelativePathHelper.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\File;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\NonAutowiredService;
 use PHPStan\ShouldNotHappenException;
 use function array_fill;
 use function array_merge;
@@ -14,10 +16,14 @@
 use function substr;
 use function trim;
 
+#[NonAutowiredService(name: 'parentDirectoryRelativePathHelper')]
 final class ParentDirectoryRelativePathHelper implements RelativePathHelper
 {
 
-	public function __construct(private string $parentDirectory)
+	public function __construct(
+		#[AutowiredParameter(ref: '%currentWorkingDirectory%')]
+		private string $parentDirectory,
+	)
 	{
 	}
 

src/File/SimpleRelativePathHelper.php

@@ -2,15 +2,21 @@
 
 namespace PHPStan\File;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\NonAutowiredService;
 use function str_replace;
 use function str_starts_with;
 use function strlen;
 use function substr;
 
+#[NonAutowiredService(name: 'simpleRelativePathHelper')]
 final class SimpleRelativePathHelper implements RelativePathHelper
 {
 
-	public function __construct(private string $currentWorkingDirectory)
+	public function __construct(
+		#[AutowiredParameter(ref: '%currentWorkingDirectory%')]
+		private string $currentWorkingDirectory,
+	)
 	{
 	}
 

src/Reflection/BetterReflection/BetterReflectionProvider.php

@@ -20,6 +20,8 @@
 use PHPStan\Broker\ClassNotFoundException;
 use PHPStan\Broker\ConstantNotFoundException;
 use PHPStan\Broker\FunctionNotFoundException;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\NonAutowiredService;
 use PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider;
 use PHPStan\File\FileHelper;
 use PHPStan\File\FileReader;
@@ -61,6 +63,7 @@
 use function strtolower;
 use const PHP_VERSION_ID;
 
+#[NonAutowiredService(name: 'betterReflectionProvider')]
 final class BetterReflectionProvider implements ReflectionProvider
 {
 
@@ -83,6 +86,7 @@ public function __construct(
 		private ReflectionProvider\ReflectionProviderProvider $reflectionProviderProvider,
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
 		private ClassReflectionExtensionRegistryProvider $classReflectionExtensionRegistryProvider,
+		#[AutowiredParameter(ref: '@betterReflectionReflector')]
 		private Reflector $reflector,
 		private FileTypeMapper $fileTypeMapper,
 		private PhpDocInheritanceResolver $phpDocInheritanceResolver,
@@ -97,6 +101,7 @@ public function __construct(
 		private PhpStormStubsSourceStubber $phpstormStubsSourceStubber,
 		private SignatureMapProvider $signatureMapProvider,
 		private AttributeReflectionFactory $attributeReflectionFactory,
+		#[AutowiredParameter(ref: '%universalObjectCratesClasses%')]
 		private array $universalObjectCratesClasses,
 	)
 	{