more autowire

Author: staabm

conf/config.neon

@@ -1232,60 +1232,6 @@ services:
 		tags:
 			- phpstan.dynamicFunctionThrowTypeExtension
 
-	-
-		class: PHPStan\Type\Php\JsonThrowTypeExtension
-		tags:
-			- phpstan.dynamicFunctionThrowTypeExtension
-
-	-
-		class: PHPStan\Type\Php\ParseStrParameterOutTypeExtension
-		tags:
-			- phpstan.functionParameterOutTypeExtension
-
-	-
-		class: PHPStan\Type\Php\PregMatchTypeSpecifyingExtension
-		tags:
-			- phpstan.typeSpecifier.functionTypeSpecifyingExtension
-
-	-
-		class: PHPStan\Type\Php\PregMatchParameterOutTypeExtension
-		tags:
-			- phpstan.functionParameterOutTypeExtension
-
-	-
-		class: PHPStan\Type\Php\PregReplaceCallbackClosureTypeExtension
-		tags:
-			- phpstan.functionParameterClosureTypeExtension
-
-	-
-		class: PHPStan\Type\Php\RegexArrayShapeMatcher
-
-	-
-		class: PHPStan\Type\Regex\RegexGroupParser
-
-	-
-		class: PHPStan\Type\Regex\RegexExpressionHelper
-
-	-
-		class: PHPStan\Type\Php\ReflectionClassConstructorThrowTypeExtension
-		tags:
-			- phpstan.dynamicStaticMethodThrowTypeExtension
-
-	-
-		class: PHPStan\Type\Php\ReflectionFunctionConstructorThrowTypeExtension
-		tags:
-			- phpstan.dynamicStaticMethodThrowTypeExtension
-
-	-
-		class: PHPStan\Type\Php\ReflectionMethodConstructorThrowTypeExtension
-		tags:
-			- phpstan.dynamicStaticMethodThrowTypeExtension
-
-	-
-		class: PHPStan\Type\Php\ReflectionPropertyConstructorThrowTypeExtension
-		tags:
-			- phpstan.dynamicStaticMethodThrowTypeExtension
-
 	-
 		class: PHPStan\Type\Php\VersionCompareFunctionDynamicReturnTypeExtension
 		arguments:

src/Type/Php/JsonThrowTypeExtension.php

@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\BitwiseFlagHelper;
@@ -13,6 +14,7 @@
 use PHPStan\Type\Type;
 use function in_array;
 
+#[AutowiredService]
 final class JsonThrowTypeExtension implements DynamicFunctionThrowTypeExtension
 {
 

src/Type/Php/ParseStrParameterOutTypeExtension.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\AccessoryLowercaseStringType;
@@ -20,6 +21,7 @@
 use function in_array;
 use function strtolower;
 
+#[AutowiredService]
 final class ParseStrParameterOutTypeExtension implements FunctionParameterOutTypeExtension
 {
 

src/Type/Php/PregMatchParameterOutTypeExtension.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\TrinaryLogic;
@@ -12,6 +13,7 @@
 use function in_array;
 use function strtolower;
 
+#[AutowiredService]
 final class PregMatchParameterOutTypeExtension implements FunctionParameterOutTypeExtension
 {
 

src/Type/Php/PregMatchTypeSpecifyingExtension.php

@@ -8,12 +8,14 @@
 use PHPStan\Analyser\TypeSpecifier;
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\FunctionTypeSpecifyingExtension;
 use function in_array;
 use function strtolower;
 
+#[AutowiredService]
 final class PregMatchTypeSpecifyingExtension implements FunctionTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
 

src/Type/Php/ReflectionClassConstructorThrowTypeExtension.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\ClassStringType;
 use PHPStan\Type\DynamicStaticMethodThrowTypeExtension;
@@ -13,6 +14,7 @@
 use ReflectionClass;
 use function count;
 
+#[AutowiredService]
 final class ReflectionClassConstructorThrowTypeExtension implements DynamicStaticMethodThrowTypeExtension
 {
 

src/Type/Php/ReflectionFunctionConstructorThrowTypeExtension.php

@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\DynamicStaticMethodThrowTypeExtension;
@@ -14,6 +15,7 @@
 use ReflectionFunction;
 use function count;
 
+#[AutowiredService]
 final class ReflectionFunctionConstructorThrowTypeExtension implements DynamicStaticMethodThrowTypeExtension
 {
 

src/Type/Php/ReflectionMethodConstructorThrowTypeExtension.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\Constant\ConstantStringType;
@@ -16,6 +17,7 @@
 use ReflectionMethod;
 use function count;
 
+#[AutowiredService]
 final class ReflectionMethodConstructorThrowTypeExtension implements DynamicStaticMethodThrowTypeExtension
 {
 

src/Type/Php/ReflectionPropertyConstructorThrowTypeExtension.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\DynamicStaticMethodThrowTypeExtension;
@@ -13,6 +14,7 @@
 use ReflectionProperty;
 use function count;
 
+#[AutowiredService]
 final class ReflectionPropertyConstructorThrowTypeExtension implements DynamicStaticMethodThrowTypeExtension
 {
 

src/Type/Php/RegexArrayShapeMatcher.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Scope;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Php\PhpVersion;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
@@ -32,6 +33,7 @@
 /**
  * @api
  */
+#[AutowiredService]
 final class RegexArrayShapeMatcher
 {