More AutowiredService

Author: ondrejmirtes

conf/config.neon

@@ -366,47 +366,11 @@ services:
 			fileExtensions: %fileExtensions%
 		autowired: false
 
-	-
-		class: PHPStan\File\FileMonitor
-		arguments:
-			analyseFileFinder: @fileFinderAnalyse
-			scanFileFinder: @fileFinderScan
-			analysedPaths: %analysedPaths%
-			analysedPathsFromConfig: %analysedPathsFromConfig%
-			scanFiles: %scanFiles%
-			scanDirectories: %scanDirectories%
-
-	-
-		class: PHPStan\Parallel\ParallelAnalyser
-		arguments:
-			internalErrorsCountLimit: %internalErrorsCountLimit%
-			processTimeout: %parallel.processTimeout%
-			decoderBufferSize: %parallel.buffer%
-
-	-
-		class: PHPStan\Parallel\Scheduler
-		arguments:
-			jobSize: %parallel.jobSize%
-			maximumNumberOfProcesses: %parallel.maximumNumberOfProcesses%
-			minimumNumberOfJobsPerProcess: %parallel.minimumNumberOfJobsPerProcess%
-		tags:
-			- phpstan.diagnoseExtension
-
 	-
 		implement: PHPStan\Reflection\FunctionReflectionFactory
 		arguments:
 			parser: @defaultAnalysisParser
 
-	-
-		class: PHPStan\Reflection\InitializerExprTypeResolver
-		arguments:
-			usePathConstantsAsConstantString: %usePathConstantsAsConstantString%
-
-	-
-		class: PHPStan\Reflection\BetterReflection\SourceLocator\FileNodesFetcher
-		arguments:
-			parser: @defaultAnalysisParser
-
 	-
 		class: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorFactory
 		arguments:

src/File/FileMonitor.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\File;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\ShouldNotHappenException;
 use function array_diff;
 use function array_key_exists;
@@ -12,6 +14,7 @@
 use function is_file;
 use function sha1_file;
 
+#[AutowiredService]
 final class FileMonitor
 {
 
@@ -28,11 +31,17 @@ final class FileMonitor
 	 * @param string[] $scanDirectories
 	 */
 	public function __construct(
+		#[AutowiredParameter(ref: '@fileFinderAnalyse')]
 		private FileFinder $analyseFileFinder,
+		#[AutowiredParameter(ref: '@fileFinderScan')]
 		private FileFinder $scanFileFinder,
+		#[AutowiredParameter]
 		private array $analysedPaths,
+		#[AutowiredParameter]
 		private array $analysedPathsFromConfig,
+		#[AutowiredParameter]
 		private array $scanFiles,
+		#[AutowiredParameter]
 		private array $scanDirectories,
 	)
 	{

src/Parallel/ParallelAnalyser.php

@@ -10,6 +10,8 @@
 use PHPStan\Analyser\Error;
 use PHPStan\Analyser\InternalError;
 use PHPStan\Dependency\RootExportedNode;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Process\ProcessHelper;
 use React\EventLoop\LoopInterface;
 use React\Promise\Deferred;
@@ -33,6 +35,7 @@
 use function str_contains;
 use const PHP_URL_PORT;
 
+#[AutowiredService]
 final class ParallelAnalyser
 {
 
@@ -43,8 +46,11 @@ final class ParallelAnalyser
 	private ProcessPool $processPool;
 
 	public function __construct(
+		#[AutowiredParameter]
 		private int $internalErrorsCountLimit,
+		#[AutowiredParameter(ref: '%parallel.processTimeout%')]
 		float $processTimeout,
+		#[AutowiredParameter(ref: '%parallel.buffer%')]
 		private int $decoderBufferSize,
 	)
 	{

src/Parallel/Scheduler.php

@@ -3,6 +3,8 @@
 namespace PHPStan\Parallel;
 
 use PHPStan\Command\Output;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Diagnose\DiagnoseExtension;
 use function array_chunk;
 use function count;
@@ -11,6 +13,7 @@
 use function min;
 use function sprintf;
 
+#[AutowiredService]
 final class Scheduler implements DiagnoseExtension
 {
 
@@ -23,8 +26,11 @@ final class Scheduler implements DiagnoseExtension
 	 * @param positive-int $minimumNumberOfJobsPerProcess
 	 */
 	public function __construct(
+		#[AutowiredParameter(ref: '%parallel.jobSize%')]
 		private int $jobSize,
+		#[AutowiredParameter(ref: '%parallel.maximumNumberOfProcesses%')]
 		private int $maximumNumberOfProcesses,
+		#[AutowiredParameter(ref: '%parallel.minimumNumberOfJobsPerProcess%')]
 		private int $minimumNumberOfJobsPerProcess,
 	)
 	{

src/Reflection/BetterReflection/SourceLocator/FileNodesFetcher.php

@@ -3,15 +3,19 @@
 namespace PHPStan\Reflection\BetterReflection\SourceLocator;
 
 use PhpParser\NodeTraverser;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\File\FileReader;
 use PHPStan\Parser\Parser;
 use PHPStan\Parser\ParserErrorsException;
 
+#[AutowiredService]
 final class FileNodesFetcher
 {
 
 	public function __construct(
 		private CachingVisitor $cachingVisitor,
+		#[AutowiredParameter(ref: '@defaultAnalysisParser')]
 		private Parser $parser,
 	)
 	{

src/Reflection/InitializerExprTypeResolver.php

@@ -20,6 +20,8 @@
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\ConstantResolver;
 use PHPStan\Analyser\OutOfClassScope;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider;
 use PHPStan\Node\Expr\TypeExpr;
 use PHPStan\Php\PhpVersion;
@@ -91,6 +93,7 @@
 use function strtolower;
 use const INF;
 
+#[AutowiredService]
 final class InitializerExprTypeResolver
 {
 
@@ -105,6 +108,7 @@ public function __construct(
 		private PhpVersion $phpVersion,
 		private OperatorTypeSpecifyingExtensionRegistryProvider $operatorTypeSpecifyingExtensionRegistryProvider,
 		private OversizedArrayBuilder $oversizedArrayBuilder,
+		#[AutowiredParameter]
 		private bool $usePathConstantsAsConstantString,
 	)
 	{