AutowiredAttributeServicesExtension - add service tags based on implemented interfaces

Author: ondrejmirtes

conf/config.neon

@@ -1150,11 +1150,6 @@ services:
 	-
 		class: PHPStan\Type\BitwiseFlagHelper
 
-	-
-		class: PHPStan\Type\Php\AbsFunctionDynamicReturnTypeExtension
-		tags:
-			- phpstan.broker.dynamicFunctionReturnTypeExtension
-
 	-
 		class: PHPStan\Type\Php\ArgumentBasedFunctionReturnTypeExtension
 		tags:

src/DependencyInjection/AutowiredAttributeServicesExtension.php

@@ -4,6 +4,9 @@
 
 use Nette\DI\CompilerExtension;
 use olvlvl\ComposerAttributeCollector\Attributes;
+use PHPStan\Broker\BrokerFactory;
+use PHPStan\Type\DynamicFunctionReturnTypeExtension;
+use ReflectionClass;
 
 final class AutowiredAttributeServicesExtension extends CompilerExtension
 {
@@ -14,10 +17,24 @@ public function loadConfiguration(): void
 		$autowiredServiceClasses = Attributes::findTargetClasses(AutowiredService::class);
 		$builder = $this->getContainerBuilder();
 
+		$interfaceToTag = [
+			DynamicFunctionReturnTypeExtension::class => BrokerFactory::DYNAMIC_FUNCTION_RETURN_TYPE_EXTENSION_TAG,
+		];
+
 		foreach ($autowiredServiceClasses as $class) {
-			$builder->addDefinition(null)
+			$reflection = new ReflectionClass($class->name);
+
+			$definition = $builder->addDefinition(null)
 				->setType($class->name)
 				->setAutowired();
+
+			foreach ($interfaceToTag as $interface => $tag) {
+				if (!$reflection->implementsInterface($interface)) {
+					continue;
+				}
+
+				$definition->addTag($tag);
+			}
 		}
 	}
 

src/Type/Php/AbsFunctionDynamicReturnTypeExtension.php

@@ -4,11 +4,13 @@
 
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\Type;
 
+#[AutowiredService]
 final class AbsFunctionDynamicReturnTypeExtension implements DynamicFunctionReturnTypeExtension
 {