Map all BrokerFactory tags in AutowiredAttributeServicesExtension

Author: staabm

conf/config.neon

@@ -403,11 +403,6 @@ services:
 	-
 		class: PHPStan\PhpDoc\StubValidator
 
-	-
-		class: PHPStan\PhpDoc\SocketSelectStubFilesExtension
-		tags:
-			- phpstan.stubFilesExtension
-
 	-
 		class: PHPStan\PhpDoc\DefaultStubFilesProvider
 		arguments:
@@ -753,11 +748,6 @@ services:
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 
-	-
-		class: PHPStan\Reflection\BetterReflection\Type\AdapterReflectionEnumDynamicReturnTypeExtension
-		tags:
-			- phpstan.broker.dynamicMethodReturnTypeExtension
-
 	-
 		class: PHPStan\Reflection\ConstructorsHelper
 		arguments:
@@ -793,11 +783,6 @@ services:
 	-
 		class: PHPStan\Reflection\Php\Soap\SoapClientMethodsClassReflectionExtension
 
-	-
-		class: PHPStan\Reflection\Php\EnumAllowedSubTypesClassReflectionExtension
-		tags:
-			- phpstan.broker.allowedSubTypesClassReflectionExtension
-
 	-
 		class: PHPStan\Reflection\Php\UniversalObjectCratesClassReflectionExtension
 		tags:
@@ -1071,10 +1056,6 @@ services:
 		arguments:
 			reportMagicProperties: %reportMagicProperties%
 			checkDynamicProperties: %checkDynamicProperties%
-	-
-		class: PHPStan\Type\Php\BcMathNumberOperatorTypeSpecifyingExtension
-		tags:
-			- phpstan.broker.operatorTypeSpecifyingExtension
 
 	-
 		class: PHPStan\Rules\Properties\UninitializedPropertyRule
@@ -1256,11 +1237,6 @@ services:
 		tags:
 			- phpstan.dynamicFunctionThrowTypeExtension
 
-	-
-		class: PHPStan\Type\Php\OpenSslEncryptParameterOutTypeExtension
-		tags:
-			- phpstan.functionParameterOutTypeExtension
-
 	-
 		class: PHPStan\Type\Php\ParseStrParameterOutTypeExtension
 		tags:
@@ -1315,11 +1291,6 @@ services:
 		tags:
 			- phpstan.typeSpecifier.functionTypeSpecifyingExtension
 
-	-
-		class: PHPStan\Type\Php\SimpleXMLElementClassPropertyReflectionExtension
-		tags:
-			- phpstan.broker.propertiesClassReflectionExtension
-
 	-
 		class: PHPStan\Type\Php\SimpleXMLElementConstructorThrowTypeExtension
 		tags:

src/DependencyInjection/AutowiredAttributeServicesExtension.php

@@ -4,10 +4,50 @@
 
 use Nette\DI\CompilerExtension;
 use olvlvl\ComposerAttributeCollector\Attributes;
+use PHPStan\Analyser\ResultCache\ResultCacheMetaExtension;
+use PHPStan\Analyser\TypeSpecifierFactory;
 use PHPStan\Broker\BrokerFactory;
+use PHPStan\DependencyInjection\Type\LazyDynamicThrowTypeExtensionProvider;
+use PHPStan\DependencyInjection\Type\LazyParameterClosureTypeExtensionProvider;
+use PHPStan\DependencyInjection\Type\LazyParameterOutTypeExtensionProvider;
+use PHPStan\PhpDoc\StubFilesExtension;
+use PHPStan\PhpDoc\TypeNodeResolverExtension;
+use PHPStan\Reflection\AllowedSubTypesClassReflectionExtension;
+use PHPStan\Reflection\Deprecation\ClassConstantDeprecationExtension;
+use PHPStan\Reflection\Deprecation\ClassDeprecationExtension;
+use PHPStan\Reflection\Deprecation\EnumCaseDeprecationExtension;
+use PHPStan\Reflection\Deprecation\FunctionDeprecationExtension;
+use PHPStan\Reflection\Deprecation\MethodDeprecationExtension;
+use PHPStan\Reflection\Deprecation\PropertyDeprecationExtension;
+use PHPStan\Reflection\MethodsClassReflectionExtension;
+use PHPStan\Reflection\PropertiesClassReflectionExtension;
+use PHPStan\Rules\Constants\AlwaysUsedClassConstantsExtensionProvider;
 use PHPStan\Rules\LazyRegistry;
+use PHPStan\Rules\Properties\ReadWritePropertiesExtension;
+use PHPStan\Rules\Properties\ReadWritePropertiesExtensionProvider;
+use PHPStan\Rules\RestrictedUsage\RestrictedClassConstantUsageExtension;
+use PHPStan\Rules\RestrictedUsage\RestrictedClassNameUsageExtension;
+use PHPStan\Rules\RestrictedUsage\RestrictedFunctionUsageExtension;
+use PHPStan\Rules\RestrictedUsage\RestrictedMethodUsageExtension;
+use PHPStan\Rules\RestrictedUsage\RestrictedPropertyUsageExtension;
 use PHPStan\Rules\Rule;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
+use PHPStan\Type\DynamicFunctionThrowTypeExtension;
+use PHPStan\Type\DynamicMethodReturnTypeExtension;
+use PHPStan\Type\DynamicMethodThrowTypeExtension;
+use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
+use PHPStan\Type\DynamicStaticMethodThrowTypeExtension;
+use PHPStan\Type\ExpressionTypeResolverExtension;
+use PHPStan\Type\FunctionParameterClosureTypeExtension;
+use PHPStan\Type\FunctionParameterOutTypeExtension;
+use PHPStan\Type\FunctionTypeSpecifyingExtension;
+use PHPStan\Type\MethodParameterClosureTypeExtension;
+use PHPStan\Type\MethodParameterOutTypeExtension;
+use PHPStan\Type\MethodTypeSpecifyingExtension;
+use PHPStan\Type\OperatorTypeSpecifyingExtension;
+use PHPStan\Type\StaticMethodParameterClosureTypeExtension;
+use PHPStan\Type\StaticMethodParameterOutTypeExtension;
+use PHPStan\Type\StaticMethodTypeSpecifyingExtension;
 use ReflectionClass;
 
 final class AutowiredAttributeServicesExtension extends CompilerExtension
@@ -20,8 +60,44 @@ public function loadConfiguration(): void
 		$builder = $this->getContainerBuilder();
 
 		$interfaceToTag = [
+			PropertiesClassReflectionExtension::class => BrokerFactory::PROPERTIES_CLASS_REFLECTION_EXTENSION_TAG,
+			MethodsClassReflectionExtension::class => BrokerFactory::METHODS_CLASS_REFLECTION_EXTENSION_TAG,
+			AllowedSubTypesClassReflectionExtension::class => BrokerFactory::ALLOWED_SUB_TYPES_CLASS_REFLECTION_EXTENSION_TAG,
+			DynamicMethodReturnTypeExtension::class => BrokerFactory::DYNAMIC_METHOD_RETURN_TYPE_EXTENSION_TAG,
+			DynamicStaticMethodReturnTypeExtension::class => BrokerFactory::DYNAMIC_STATIC_METHOD_RETURN_TYPE_EXTENSION_TAG,
 			DynamicFunctionReturnTypeExtension::class => BrokerFactory::DYNAMIC_FUNCTION_RETURN_TYPE_EXTENSION_TAG,
+			OperatorTypeSpecifyingExtension::class => BrokerFactory::OPERATOR_TYPE_SPECIFYING_EXTENSION_TAG,
+			ExpressionTypeResolverExtension::class => BrokerFactory::EXPRESSION_TYPE_RESOLVER_EXTENSION_TAG,
+			TypeNodeResolverExtension::class => TypeNodeResolverExtension::EXTENSION_TAG,
 			Rule::class => LazyRegistry::RULE_TAG,
+			StubFilesExtension::class => StubFilesExtension::EXTENSION_TAG,
+			AlwaysUsedClassConstantsExtensionProvider::class => AlwaysUsedClassConstantsExtensionProvider::EXTENSION_TAG,
+			ReadWritePropertiesExtension::class => ReadWritePropertiesExtensionProvider::EXTENSION_TAG,
+			FunctionTypeSpecifyingExtension::class => TypeSpecifierFactory::FUNCTION_TYPE_SPECIFYING_EXTENSION_TAG,
+			MethodTypeSpecifyingExtension::class => TypeSpecifierFactory::METHOD_TYPE_SPECIFYING_EXTENSION_TAG,
+			StaticMethodTypeSpecifyingExtension::class => TypeSpecifierFactory::STATIC_METHOD_TYPE_SPECIFYING_EXTENSION_TAG,
+			DynamicFunctionThrowTypeExtension::class => LazyDynamicThrowTypeExtensionProvider::FUNCTION_TAG,
+			DynamicMethodThrowTypeExtension::class => LazyDynamicThrowTypeExtensionProvider::METHOD_TAG,
+			DynamicStaticMethodThrowTypeExtension::class => LazyDynamicThrowTypeExtensionProvider::STATIC_METHOD_TAG,
+			FunctionParameterClosureTypeExtension::class => LazyParameterClosureTypeExtensionProvider::FUNCTION_TAG,
+			MethodParameterClosureTypeExtension::class => LazyParameterClosureTypeExtensionProvider::METHOD_TAG,
+			StaticMethodParameterClosureTypeExtension::class => LazyParameterClosureTypeExtensionProvider::STATIC_METHOD_TAG,
+			FunctionParameterOutTypeExtension::class => LazyParameterOutTypeExtensionProvider::FUNCTION_TAG,
+			MethodParameterOutTypeExtension::class => LazyParameterOutTypeExtensionProvider::METHOD_TAG,
+			StaticMethodParameterOutTypeExtension::class => LazyParameterOutTypeExtensionProvider::STATIC_METHOD_TAG,
+			ResultCacheMetaExtension::class => ResultCacheMetaExtension::EXTENSION_TAG,
+			ClassConstantDeprecationExtension::class => ClassConstantDeprecationExtension::CLASS_CONSTANT_EXTENSION_TAG,
+			ClassDeprecationExtension::class => ClassDeprecationExtension::CLASS_EXTENSION_TAG,
+			EnumCaseDeprecationExtension::class => EnumCaseDeprecationExtension::ENUM_CASE_EXTENSION_TAG,
+			FunctionDeprecationExtension::class => FunctionDeprecationExtension::FUNCTION_EXTENSION_TAG,
+			MethodDeprecationExtension::class => MethodDeprecationExtension::METHOD_EXTENSION_TAG,
+			PropertyDeprecationExtension::class => PropertyDeprecationExtension::PROPERTY_EXTENSION_TAG,
+			RestrictedMethodUsageExtension::class => RestrictedMethodUsageExtension::METHOD_EXTENSION_TAG,
+			RestrictedClassNameUsageExtension::class => RestrictedClassNameUsageExtension::CLASS_NAME_EXTENSION_TAG,
+			RestrictedFunctionUsageExtension::class => RestrictedFunctionUsageExtension::FUNCTION_EXTENSION_TAG,
+			RestrictedPropertyUsageExtension::class => RestrictedPropertyUsageExtension::PROPERTY_EXTENSION_TAG,
+			RestrictedClassConstantUsageExtension::class => RestrictedClassConstantUsageExtension::CLASS_CONSTANT_EXTENSION_TAG,
+
 		];
 
 		foreach ($autowiredServiceClasses as $class) {

src/PhpDoc/SocketSelectStubFilesExtension.php

@@ -2,8 +2,10 @@
 
 namespace PHPStan\PhpDoc;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 
+#[AutowiredService]
 final class SocketSelectStubFilesExtension implements StubFilesExtension
 {
 

src/Reflection/BetterReflection/Type/AdapterReflectionEnumDynamicReturnTypeExtension.php

@@ -8,6 +8,7 @@
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionClassConstant;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionEnum;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionNamedType;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
@@ -22,6 +23,7 @@
 use PHPStan\Type\UnionType;
 use function in_array;
 
+#[AutowiredService]
 final class AdapterReflectionEnumDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 

src/Reflection/Php/EnumAllowedSubTypesClassReflectionExtension.php

@@ -2,11 +2,13 @@
 
 namespace PHPStan\Reflection\Php;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\AllowedSubTypesClassReflectionExtension;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\Enum\EnumCaseObjectType;
 use function array_keys;
 
+#[AutowiredService]
 final class EnumAllowedSubTypesClassReflectionExtension implements AllowedSubTypesClassReflectionExtension
 {
 

src/Type/Php/AssertThrowTypeExtension.php

@@ -4,13 +4,15 @@
 
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Type\DynamicFunctionThrowTypeExtension;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Throwable;
 use function count;
 
+#[AutowiredService]
 final class AssertThrowTypeExtension implements DynamicFunctionThrowTypeExtension
 {
 

src/Type/Php/BackedEnumFromMethodDynamicReturnTypeExtension.php

@@ -5,6 +5,7 @@
 use BackedEnum;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
 use PHPStan\Type\Enum\EnumCaseObjectType;
@@ -14,6 +15,7 @@
 use function count;
 use function in_array;
 
+#[AutowiredService]
 final class BackedEnumFromMethodDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension
 {
 

src/Type/Php/BcMathNumberOperatorTypeSpecifyingExtension.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Php;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\NeverType;
@@ -10,6 +11,7 @@
 use PHPStan\Type\Type;
 use function in_array;
 
+#[AutowiredService]
 final class BcMathNumberOperatorTypeSpecifyingExtension implements OperatorTypeSpecifyingExtension
 {
 

src/Type/Php/OpenSslEncryptParameterOutTypeExtension.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
@@ -17,6 +18,7 @@
 use function strtolower;
 use function substr;
 
+#[AutowiredService]
 final class OpenSslEncryptParameterOutTypeExtension implements FunctionParameterOutTypeExtension
 {
 

src/Type/Php/PregReplaceCallbackClosureTypeExtension.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\Native\NativeParameterReflection;
 use PHPStan\Reflection\ParameterReflection;
@@ -13,6 +14,7 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 
+#[AutowiredService]
 final class PregReplaceCallbackClosureTypeExtension implements FunctionParameterClosureTypeExtension
 {