Added missing interface/tag combos to AutowiredAttributeServicesExtension

Author: ondrejmirtes

conf/config.neon

@@ -311,11 +311,6 @@ services:
 		tags:
 			- phpstan.parser.richParserNodeVisitor
 
-	-
-		class: PHPStan\Parser\LastConditionVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
 	-
 		class: PHPStan\Parser\TypeTraverserInstanceofVisitor
 		tags:
@@ -488,6 +483,9 @@ services:
 		arguments:
 			parser: @defaultAnalysisParser
 
+	-
+		class: PHPStan\Dependency\ExportedNodeVisitor
+
 	-
 		class: PHPStan\DependencyInjection\Container
 		factory: PHPStan\DependencyInjection\MemoizingContainer
@@ -631,6 +629,9 @@ services:
 	-
 		class: PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension
 
+	-
+		class: PHPStan\Reflection\BetterReflection\SourceLocator\CachingVisitor
+
 	-
 		class: PHPStan\Reflection\BetterReflection\SourceLocator\FileNodesFetcher
 		arguments:

src/Dependency/ExportedNodeVisitor.php

@@ -5,10 +5,8 @@
 use PhpParser\Node;
 use PhpParser\NodeVisitor;
 use PhpParser\NodeVisitorAbstract;
-use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\ShouldNotHappenException;
 
-#[AutowiredService]
 final class ExportedNodeVisitor extends NodeVisitorAbstract
 {
 

src/DependencyInjection/AutowiredAttributeServicesExtension.php

@@ -4,12 +4,17 @@
 
 use Nette\DI\CompilerExtension;
 use olvlvl\ComposerAttributeCollector\Attributes;
+use PhpParser\NodeVisitor;
 use PHPStan\Analyser\ResultCache\ResultCacheMetaExtension;
 use PHPStan\Analyser\TypeSpecifierFactory;
 use PHPStan\Broker\BrokerFactory;
+use PHPStan\Collectors\Collector;
+use PHPStan\Collectors\RegistryFactory as CollectorRegistryFactory;
 use PHPStan\DependencyInjection\Type\LazyDynamicThrowTypeExtensionProvider;
 use PHPStan\DependencyInjection\Type\LazyParameterClosureTypeExtensionProvider;
 use PHPStan\DependencyInjection\Type\LazyParameterOutTypeExtensionProvider;
+use PHPStan\Diagnose\DiagnoseExtension;
+use PHPStan\Parser\RichParser;
 use PHPStan\PhpDoc\StubFilesExtension;
 use PHPStan\PhpDoc\TypeNodeResolverExtension;
 use PHPStan\Reflection\AllowedSubTypesClassReflectionExtension;
@@ -101,7 +106,9 @@ public function loadConfiguration(): void
 			RestrictedFunctionUsageExtension::class => RestrictedFunctionUsageExtension::FUNCTION_EXTENSION_TAG,
 			RestrictedPropertyUsageExtension::class => RestrictedPropertyUsageExtension::PROPERTY_EXTENSION_TAG,
 			RestrictedClassConstantUsageExtension::class => RestrictedClassConstantUsageExtension::CLASS_CONSTANT_EXTENSION_TAG,
-
+			NodeVisitor::class => RichParser::VISITOR_SERVICE_TAG,
+			Collector::class => CollectorRegistryFactory::COLLECTOR_TAG,
+			DiagnoseExtension::class => DiagnoseExtension::EXTENSION_TAG,
 		];
 
 		foreach ($autowiredServiceClasses as $class) {

src/Parser/LastConditionVisitor.php

@@ -4,8 +4,10 @@
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
 use function count;
 
+#[AutowiredService]
 final class LastConditionVisitor extends NodeVisitorAbstract
 {
 

src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php

@@ -9,11 +9,9 @@
 use PHPStan\BetterReflection\Reflection\Exception\InvalidConstantNode;
 use PHPStan\BetterReflection\SourceLocator\Located\LocatedSource;
 use PHPStan\BetterReflection\Util\ConstantNodeChecker;
-use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ConstantNameHelper;
 use function strtolower;
 
-#[AutowiredService]
 final class CachingVisitor extends NodeVisitorAbstract
 {