more autowire

Author: staabm

conf/config.neon

@@ -460,9 +460,6 @@ services:
 		arguments:
 			cacheFilePath: %resultCachePath%
 
-	-
-		class: PHPStan\Analyser\RicherScopeGetTypeHelper
-
 	-
 		class: PHPStan\Cache\Cache
 		arguments:
@@ -472,15 +469,6 @@ services:
 		class: PHPStan\Collectors\Registry
 		factory: @PHPStan\Collectors\RegistryFactory::create
 
-	-
-		class: PHPStan\Collectors\RegistryFactory
-
-	-
-		class: PHPStan\Command\AnalyseApplication
-
-	-
-		class: PHPStan\Command\AnalyserRunner
-
 	-
 		class: PHPStan\Command\FixerApplication
 		arguments:
@@ -500,12 +488,6 @@ services:
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Dependency\ExportedNodeResolver
-
-	-
-		class: PHPStan\Dependency\ExportedNodeVisitor
-
 	-
 		class: PHPStan\DependencyInjection\Container
 		factory: PHPStan\DependencyInjection\MemoizingContainer
@@ -633,12 +615,6 @@ services:
 		tags:
 			- phpstan.diagnoseExtension
 
-	-
-		class: PHPStan\Process\CpuCoreCounter
-
-	-
-		class: PHPStan\Reflection\AttributeReflectionFactory
-
 	-
 		implement: PHPStan\Reflection\FunctionReflectionFactory
 		arguments:

src/Analyser/RicherScopeGetTypeHelper.php

@@ -5,12 +5,14 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\Variable;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\TypeResult;
 use function is_string;
 
+#[AutowiredService]
 final class RicherScopeGetTypeHelper
 {
 

src/Collectors/RegistryFactory.php

@@ -2,8 +2,10 @@
 
 namespace PHPStan\Collectors;
 
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 
+#[AutowiredService]
 final class RegistryFactory
 {
 

src/Command/AnalyseApplication.php

@@ -9,6 +9,7 @@
 use PHPStan\Analyser\Ignore\IgnoredErrorHelper;
 use PHPStan\Analyser\ResultCache\ResultCacheManagerFactory;
 use PHPStan\Collectors\CollectedData;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Internal\BytesHelper;
 use PHPStan\PhpDoc\StubFilesProvider;
 use PHPStan\PhpDoc\StubValidator;
@@ -26,6 +27,7 @@
  * @phpstan-import-type CollectorData from CollectedData
  * @phpstan-import-type LinesToIgnore from FileAnalyserResult
  */
+#[AutowiredService]
 final class AnalyseApplication
 {
 

src/Command/AnalyserRunner.php

@@ -5,6 +5,7 @@
 use Closure;
 use PHPStan\Analyser\Analyser;
 use PHPStan\Analyser\AnalyserResult;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Parallel\ParallelAnalyser;
 use PHPStan\Parallel\Scheduler;
 use PHPStan\Process\CpuCoreCounter;
@@ -19,6 +20,7 @@
 use function is_file;
 use function memory_get_peak_usage;
 
+#[AutowiredService]
 final class AnalyserRunner
 {
 

src/Dependency/ExportedNodeResolver.php

@@ -23,6 +23,7 @@
 use PHPStan\Dependency\ExportedNode\ExportedPropertyHookNode;
 use PHPStan\Dependency\ExportedNode\ExportedTraitNode;
 use PHPStan\Dependency\ExportedNode\ExportedTraitUseAdaptation;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\Printer\ExprPrinter;
 use PHPStan\Node\Printer\NodeTypePrinter;
 use PHPStan\Reflection\ReflectionProvider;
@@ -32,6 +33,7 @@
 use function is_string;
 use function sprintf;
 
+#[AutowiredService]
 final class ExportedNodeResolver
 {
 

src/Dependency/ExportedNodeVisitor.php

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

src/Process/CpuCoreCounter.php

@@ -4,7 +4,9 @@
 
 use Fidry\CpuCoreCounter\CpuCoreCounter as FidryCpuCoreCounter;
 use Fidry\CpuCoreCounter\NumberOfCpuCoreNotFound;
+use PHPStan\DependencyInjection\AutowiredService;
 
+#[AutowiredService]
 final class CpuCoreCounter
 {
 

src/Reflection/AttributeReflectionFactory.php

@@ -6,12 +6,14 @@
 use PhpParser\Node\Expr;
 use PHPStan\BetterReflection\Reflection\Adapter\FakeReflectionAttribute;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionAttribute;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider;
 use PHPStan\Type\TypeCombinator;
 use function array_key_exists;
 use function count;
 use function is_int;
 
+#[AutowiredService]
 final class AttributeReflectionFactory
 {