Use more AutowiredService

Author: ondrejmirtes

conf/config.neon

@@ -235,11 +235,6 @@ services:
 		autowired:
 			- PHPStan\Node\Printer\Printer
 
-	-
-		class: PHPStan\Broker\AnonymousClassNameHelper
-		arguments:
-			relativePathHelper: @simpleRelativePathHelper
-
 	-
 		class: PHPStan\Php\PhpVersion
 		factory: @PHPStan\Php\PhpVersionFactory::create
@@ -248,17 +243,6 @@ services:
 		class: PHPStan\Php\PhpVersionFactory
 		factory: @PHPStan\Php\PhpVersionFactoryFactory::create
 
-	-
-		class: PHPStan\Php\PhpVersionFactoryFactory
-		arguments:
-			phpVersion: %phpVersion%
-			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
-
-	-
-		class: PHPStan\Php\ComposerPhpVersionFactory
-		arguments:
-			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
-
 	-
 		class: PHPStan\PhpDoc\TypeNodeResolverExtensionRegistryProvider
 		factory: PHPStan\PhpDoc\LazyTypeNodeResolverExtensionRegistryProvider
@@ -271,32 +255,6 @@ services:
 		autowired:
 			- PHPStan\PhpDoc\StubFilesProvider
 
-	-
-		class: PHPStan\Analyser\Analyser
-		arguments:
-			internalErrorsCountLimit: %internalErrorsCountLimit%
-
-	-
-		class: PHPStan\Analyser\AnalyserResultFinalizer
-		arguments:
-			reportUnmatchedIgnoredErrors: %reportUnmatchedIgnoredErrors%
-
-	-
-		class: PHPStan\Analyser\FileAnalyser
-		arguments:
-			parser: @defaultAnalysisParser
-
-	-
-		class: PHPStan\Analyser\RuleErrorTransformer
-		arguments:
-			parser: @currentPhpVersionPhpParser
-
-	-
-		class: PHPStan\Analyser\Ignore\IgnoredErrorHelper
-		arguments:
-			ignoreErrors: %ignoreErrors%
-			reportUnmatchedIgnoredErrors: %reportUnmatchedIgnoredErrors%
-
 	-
 		class: PHPStan\Analyser\LazyInternalScopeFactory
 		autowired:
@@ -338,39 +296,10 @@ services:
 			parametersNotInvalidatingCache: %parametersNotInvalidatingCache%
 			skipResultCacheIfOlderThanDays: %resultCacheSkipIfOlderThanDays%
 
-	-
-		class: PHPStan\Analyser\ResultCache\ResultCacheClearer
-		arguments:
-			cacheFilePath: %resultCachePath%
-
-	-
-		class: PHPStan\Cache\Cache
-		arguments:
-			storage: @cacheStorage
-
 	-
 		class: PHPStan\Collectors\Registry
 		factory: @PHPStan\Collectors\RegistryFactory::create
 
-	-
-		class: PHPStan\Command\FixerApplication
-		arguments:
-			analysedPaths: %analysedPaths%
-			currentWorkingDirectory: %currentWorkingDirectory%
-			proTmpDir: %pro.tmpDir%
-			dnsServers: %pro.dnsServers%
-			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
-			allConfigFiles: %allConfigFiles%
-			cliAutoloadFile: %cliAutoloadFile%
-			bootstrapFiles: %bootstrapFiles%
-			editorUrl: %editorUrl%
-			usedLevel: %usedLevel%
-
-	-
-		class: PHPStan\Dependency\ExportedNodeFetcher
-		arguments:
-			parser: @defaultAnalysisParser
-
 	-
 		class: PHPStan\DependencyInjection\Container
 		factory: PHPStan\DependencyInjection\MemoizingContainer
@@ -382,21 +311,6 @@ services:
 		autowired:
 			- PHPStan\DependencyInjection\Nette\NetteContainer
 
-	-
-		class: PHPStan\DependencyInjection\DerivativeContainerFactory
-		arguments:
-			currentWorkingDirectory: %currentWorkingDirectory%
-			tempDirectory: %tempDir%
-			additionalConfigFiles: %additionalConfigFiles%
-			analysedPaths: %analysedPaths%
-			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
-			analysedPathsFromConfig: %analysedPathsFromConfig%
-			usedLevel: %usedLevel%
-			generateBaselineFile: %generateBaselineFile%
-			cliAutoloadFile: %cliAutoloadFile%
-			singleReflectionFile: %singleReflectionFile%
-			singleReflectionInsteadOfFile: %singleReflectionInsteadOfFile%
-
 	-
 		class: PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider
 		factory: PHPStan\DependencyInjection\Reflection\LazyClassReflectionExtensionRegistryProvider
@@ -425,16 +339,6 @@ services:
 		class: PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider
 		factory: PHPStan\DependencyInjection\Type\LazyParameterClosureTypeExtensionProvider
 
-	-
-		class: PHPStan\File\FileHelper
-		arguments:
-			workingDirectory: %currentWorkingDirectory%
-
-	-
-		class: PHPStan\File\FileExcluderFactory
-		arguments:
-			excludePaths: %excludePaths%
-
 	-
 		implement: PHPStan\File\FileExcluderRawFactory
 
@@ -968,28 +872,3 @@ services:
 		class: PHPStan\Command\ErrorFormatter\CiDetectedErrorFormatter
 		autowired:
 			- PHPStan\Command\ErrorFormatter\CiDetectedErrorFormatter
-
-	errorFormatter.checkstyle:
-		class: PHPStan\Command\ErrorFormatter\CheckstyleErrorFormatter
-		arguments:
-			relativePathHelper: @simpleRelativePathHelper
-
-	errorFormatter.junit:
-		class: PHPStan\Command\ErrorFormatter\JunitErrorFormatter
-		arguments:
-			relativePathHelper: @simpleRelativePathHelper
-
-	errorFormatter.gitlab:
-		class: PHPStan\Command\ErrorFormatter\GitlabErrorFormatter
-		arguments:
-			relativePathHelper: @simpleRelativePathHelper
-
-	errorFormatter.github:
-		class: PHPStan\Command\ErrorFormatter\GithubErrorFormatter
-		arguments:
-			relativePathHelper: @simpleRelativePathHelper
-
-	errorFormatter.teamcity:
-		class: PHPStan\Command\ErrorFormatter\TeamcityErrorFormatter
-		arguments:
-			relativePathHelper: @simpleRelativePathHelper

src/Analyser/Analyser.php

@@ -5,6 +5,8 @@
 use Closure;
 use PHPStan\Collectors\CollectedData;
 use PHPStan\Collectors\Registry as CollectorRegistry;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Rules\Registry as RuleRegistry;
 use Throwable;
 use function array_fill_keys;
@@ -15,6 +17,7 @@
 /**
  * @phpstan-import-type CollectorData from CollectedData
  */
+#[AutowiredService]
 final class Analyser
 {
 
@@ -23,6 +26,7 @@ public function __construct(
 		private RuleRegistry $ruleRegistry,
 		private CollectorRegistry $collectorRegistry,
 		private NodeScopeResolver $nodeScopeResolver,
+		#[AutowiredParameter]
 		private int $internalErrorsCountLimit,
 	)
 	{

src/Analyser/AnalyserResultFinalizer.php

@@ -6,6 +6,8 @@
 use PHPStan\BetterReflection\NodeCompiler\Exception\UnableToCompileNode;
 use PHPStan\BetterReflection\Reflection\Exception\CircularReference;
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\CollectedDataNode;
 use PHPStan\Rules\Registry as RuleRegistry;
 use Throwable;
@@ -14,6 +16,7 @@
 use function get_class;
 use function sprintf;
 
+#[AutowiredService]
 final class AnalyserResultFinalizer
 {
 
@@ -23,6 +26,7 @@ public function __construct(
 		private RuleErrorTransformer $ruleErrorTransformer,
 		private ScopeFactory $scopeFactory,
 		private LocalIgnoresProcessor $localIgnoresProcessor,
+		#[AutowiredParameter]
 		private bool $reportUnmatchedIgnoredErrors,
 	)
 	{

src/Analyser/FileAnalyser.php

@@ -10,6 +10,8 @@
 use PHPStan\Collectors\CollectedData;
 use PHPStan\Collectors\Registry as CollectorRegistry;
 use PHPStan\Dependency\DependencyResolver;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\FileNode;
 use PHPStan\Node\InClassNode;
 use PHPStan\Node\InTraitNode;
@@ -41,6 +43,7 @@
 /**
  * @phpstan-import-type CollectorData from CollectedData
  */
+#[AutowiredService]
 final class FileAnalyser
 {
 
@@ -53,6 +56,7 @@ final class FileAnalyser
 	public function __construct(
 		private ScopeFactory $scopeFactory,
 		private NodeScopeResolver $nodeScopeResolver,
+		#[AutowiredParameter(ref: '@defaultAnalysisParser')]
 		private Parser $parser,
 		private DependencyResolver $dependencyResolver,
 		private IgnoreErrorExtensionProvider $ignoreErrorExtensionProvider,

src/Analyser/Ignore/IgnoredErrorHelper.php

@@ -4,6 +4,8 @@
 
 use Nette\Utils\Json;
 use Nette\Utils\JsonException;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\File\FileHelper;
 use PHPStan\ShouldNotHappenException;
 use function array_key_exists;
@@ -12,6 +14,7 @@
 use function is_file;
 use function sprintf;
 
+#[AutowiredService]
 final class IgnoredErrorHelper
 {
 
@@ -20,7 +23,9 @@ final class IgnoredErrorHelper
 	 */
 	public function __construct(
 		private FileHelper $fileHelper,
+		#[AutowiredParameter]
 		private array $ignoreErrors,
+		#[AutowiredParameter]
 		private bool $reportUnmatchedIgnoredErrors,
 	)
 	{

src/Analyser/ResultCache/ResultCacheClearer.php

@@ -2,14 +2,20 @@
 
 namespace PHPStan\Analyser\ResultCache;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use function dirname;
 use function is_file;
 use function unlink;
 
+#[AutowiredService]
 final class ResultCacheClearer
 {
 
-	public function __construct(private string $cacheFilePath)
+	public function __construct(
+		#[AutowiredParameter(ref: '%resultCachePath%')]
+		private string $cacheFilePath,
+	)
 	{
 	}
 

src/Analyser/RuleErrorTransformer.php

@@ -8,6 +8,8 @@
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\CloningVisitor;
 use PhpParser\Parser;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\File\FileReader;
 use PHPStan\Fixable\PhpPrinter;
 use PHPStan\Fixable\PhpPrinterIndentationDetectorVisitor;
@@ -29,12 +31,14 @@
 use function sha1;
 use function str_repeat;
 
+#[AutowiredService]
 final class RuleErrorTransformer
 {
 
 	private Differ $differ;
 
 	public function __construct(
+		#[AutowiredParameter(ref: '@currentPhpVersionPhpParser')]
 		private Parser $parser,
 	)
 	{

src/Broker/AnonymousClassNameHelper.php

@@ -3,18 +3,22 @@
 namespace PHPStan\Broker;
 
 use PhpParser\Node;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\File\FileHelper;
 use PHPStan\File\RelativePathHelper;
 use PHPStan\Parser\AnonymousClassVisitor;
 use PHPStan\ShouldNotHappenException;
 use function md5;
 use function sprintf;
 
+#[AutowiredService]
 final class AnonymousClassNameHelper
 {
 
 	public function __construct(
 		private FileHelper $fileHelper,
+		#[AutowiredParameter(ref: '@simpleRelativePathHelper')]
 		private RelativePathHelper $relativePathHelper,
 	)
 	{

src/Cache/Cache.php

@@ -2,10 +2,17 @@
 
 namespace PHPStan\Cache;
 
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
+
+#[AutowiredService]
 final class Cache
 {
 
-	public function __construct(private CacheStorage $storage)
+	public function __construct(
+		#[AutowiredParameter(ref: '@cacheStorage')]
+		private CacheStorage $storage,
+	)
 	{
 	}
 

src/Command/ErrorFormatter/CheckstyleErrorFormatter.php

@@ -5,17 +5,23 @@
 use PHPStan\Analyser\Error;
 use PHPStan\Command\AnalysisResult;
 use PHPStan\Command\Output;
+use PHPStan\DependencyInjection\AutowiredParameter;
+use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\File\RelativePathHelper;
 use function count;
 use function htmlspecialchars;
 use function sprintf;
 use const ENT_COMPAT;
 use const ENT_XML1;
 
+#[AutowiredService(name: 'errorFormatter.checkstyle')]
 final class CheckstyleErrorFormatter implements ErrorFormatter
 {
 
-	public function __construct(private RelativePathHelper $relativePathHelper)
+	public function __construct(
+		#[AutowiredParameter(ref: '@simpleRelativePathHelper')]
+		private RelativePathHelper $relativePathHelper,
+	)
 	{
 	}