AutowiredService - support for "factory"

Author: ondrejmirtes

conf/config.neon

@@ -244,18 +244,6 @@ services:
 	-
 		class: PHPStan\Rules\Properties\UninitializedPropertyRule
 
-	-
-		class: PHPStan\Php\PhpVersion
-		factory: @PHPStan\Php\PhpVersionFactory::create
-
-	-
-		class: PHPStan\Php\PhpVersionFactory
-		factory: @PHPStan\Php\PhpVersionFactoryFactory::create
-
-	-
-		class: PHPStan\Analyser\ConstantResolver
-		factory: @PHPStan\Analyser\ConstantResolverFactory::create()
-
 	-
 		implement: PHPStan\Analyser\ResultCache\ResultCacheManagerFactory
 		arguments:
@@ -273,10 +261,6 @@ services:
 			parametersNotInvalidatingCache: %parametersNotInvalidatingCache%
 			skipResultCacheIfOlderThanDays: %resultCacheSkipIfOlderThanDays%
 
-	-
-		class: PHPStan\Collectors\Registry
-		factory: @PHPStan\Collectors\RegistryFactory::create
-
 	-
 		implement: PHPStan\File\FileExcluderRawFactory
 
@@ -296,14 +280,6 @@ services:
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Reflection\SignatureMap\SignatureMapProvider
-		factory: @PHPStan\Reflection\SignatureMap\SignatureMapProviderFactory::create()
-
-	typeSpecifier:
-		class: PHPStan\Analyser\TypeSpecifier
-		factory: @typeSpecifierFactory::create
-
 	simpleRelativePathHelper:
 		class: PHPStan\File\RelativePathHelper
 		factory: PHPStan\File\SimpleRelativePathHelper

src/Analyser/ConstantResolver.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Analyser;
 
 use PhpParser\Node\Name;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\ComposerPhpVersionFactory;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\NamespaceAnswerer;
@@ -31,6 +32,7 @@
 use const NAN;
 use const PHP_INT_SIZE;
 
+#[AutowiredService(factory: '@PHPStan\Analyser\ConstantResolverFactory::create')]
 final class ConstantResolver
 {
 

src/Analyser/TypeSpecifier.php

@@ -19,6 +19,7 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Name;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\Expr\AlwaysRememberedExpr;
 use PHPStan\Node\IssetExpr;
 use PHPStan\Node\Printer\ExprPrinter;
@@ -86,6 +87,7 @@
 use function substr;
 use const COUNT_NORMAL;
 
+#[AutowiredService(name: 'typeSpecifier', factory: '@typeSpecifierFactory::create')]
 final class TypeSpecifier
 {
 

src/Collectors/Registry.php

@@ -3,9 +3,11 @@
 namespace PHPStan\Collectors;
 
 use PhpParser\Node;
+use PHPStan\DependencyInjection\AutowiredService;
 use function class_implements;
 use function class_parents;
 
+#[AutowiredService(factory: '@PHPStan\Collectors\RegistryFactory::create')]
 final class Registry
 {
 

src/DependencyInjection/AutowiredAttributeServicesExtension.php

@@ -5,6 +5,7 @@
 use Nette\DI\CompilerExtension;
 use Nette\DI\Definitions\Reference;
 use Nette\DI\Definitions\ServiceDefinition;
+use Nette\DI\Definitions\Statement;
 use Nette\DI\Helpers;
 use Nette\Schema\Expect;
 use Nette\Schema\Schema;
@@ -15,6 +16,7 @@
 use PHPStan\Rules\LazyRegistry;
 use ReflectionClass;
 use stdClass;
+use function explode;
 use function strtolower;
 use function substr;
 
@@ -43,6 +45,11 @@ public function loadConfiguration(): void
 				->setType($class->name)
 				->setAutowired($attribute->as);
 
+			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 (ValidateServiceTagsExtension::INTERFACE_TAG_MAPPING as $interface => $tag) {

src/DependencyInjection/AutowiredService.php

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

src/Php/PhpVersion.php

@@ -2,11 +2,13 @@
 
 namespace PHPStan\Php;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use function floor;
 
 /**
  * @api
  */
+#[AutowiredService(factory: '@PHPStan\Php\PhpVersionFactory::create')]
 final class PhpVersion
 {
 

src/Php/PhpVersionFactory.php

@@ -2,11 +2,13 @@
 
 namespace PHPStan\Php;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use function explode;
 use function max;
 use function min;
 use const PHP_VERSION_ID;
 
+#[AutowiredService(factory: '@PHPStan\Php\PhpVersionFactoryFactory::create')]
 final class PhpVersionFactory
 {
 

src/Reflection/SignatureMap/SignatureMapProvider.php

@@ -3,9 +3,11 @@
 namespace PHPStan\Reflection\SignatureMap;
 
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionMethod;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Type\Type;
 use ReflectionFunctionAbstract;
 
+#[AutowiredService(factory: '@PHPStan\Reflection\SignatureMap\SignatureMapProviderFactory::create')]
 interface SignatureMapProvider
 {