ResultCacheClearer

Author: ondrejmirtes

conf/config.neon

@@ -404,6 +404,12 @@ services:
 			usedLevel: %usedLevel%
 			cliAutoloadFile: %cliAutoloadFile%
 
+	-
+		class: PHPStan\Analyser\ResultCache\ResultCacheClearer
+		arguments:
+			cacheFilePath: %tmpDir%/resultCache.php
+			tempResultCachePath: %tempResultCachePath%
+
 	-
 		class: PHPStan\Cache\Cache
 		arguments:

src/Analyser/ResultCache/ResultCacheClearer.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser\ResultCache;
+
+use Symfony\Component\Finder\Finder;
+
+class ResultCacheClearer
+{
+
+	private string $cacheFilePath;
+
+	private string $tempResultCachePath;
+
+	public function __construct(string $cacheFilePath, string $tempResultCachePath)
+	{
+		$this->cacheFilePath = $cacheFilePath;
+		$this->tempResultCachePath = $tempResultCachePath;
+	}
+
+	public function clear(): string
+	{
+		$dir = dirname($this->cacheFilePath);
+		if (!is_file($this->cacheFilePath)) {
+			return $dir;
+		}
+
+		@unlink($this->cacheFilePath);
+
+		return $dir;
+	}
+
+	public function clearTemporaryCaches(): void
+	{
+		$finder = new Finder();
+		foreach ($finder->files()->name('*.php')->in($this->tempResultCachePath) as $tmpResultCacheFile) {
+			@unlink($tmpResultCacheFile->getPathname());
+		}
+	}
+
+}

src/Analyser/ResultCache/ResultCacheManager.php

@@ -9,7 +9,6 @@
 use PHPStan\Dependency\ExportedNodeFetcher;
 use PHPStan\File\FileReader;
 use PHPStan\File\FileWriter;
-use Symfony\Component\Finder\Finder;
 use function array_fill_keys;
 use function array_key_exists;
 
@@ -577,24 +576,4 @@ private function getStubFiles(): array
 		return $stubFiles;
 	}
 
-	public function clear(): string
-	{
-		$dir = dirname($this->cacheFilePath);
-		if (!is_file($this->cacheFilePath)) {
-			return $dir;
-		}
-
-		@unlink($this->cacheFilePath);
-
-		return $dir;
-	}
-
-	public function clearTemporaryCaches(): void
-	{
-		$finder = new Finder();
-		foreach ($finder->files()->name('*.php')->in($this->tempResultCachePath) as $tmpResultCacheFile) {
-			@unlink($tmpResultCacheFile->getPathname());
-		}
-	}
-
 }

src/Command/ClearResultCacheCommand.php

@@ -2,7 +2,7 @@
 
 namespace PHPStan\Command;
 
-use PHPStan\Analyser\ResultCache\ResultCacheManagerFactory;
+use PHPStan\Analyser\ResultCache\ResultCacheClearer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -70,9 +70,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$container = $inceptionResult->getContainer();
 
-		/** @var ResultCacheManagerFactory $resultCacheManagerFactory */
-		$resultCacheManagerFactory = $container->getByType(ResultCacheManagerFactory::class);
-		$path = $resultCacheManagerFactory->create([])->clear();
+		/** @var ResultCacheClearer $resultCacheClearer */
+		$resultCacheClearer = $container->getByType(ResultCacheClearer::class);
+		$path = $resultCacheClearer->clear();
 
 		$output->writeln('<info>Result cache cleared from directory:</info>');
 		$output->writeln($path);

tests/PHPStan/Command/AnalyseApplicationIntegrationTest.php

@@ -2,7 +2,7 @@
 
 namespace PHPStan\Command;
 
-use PHPStan\Analyser\ResultCache\ResultCacheManagerFactory;
+use PHPStan\Analyser\ResultCache\ResultCacheClearer;
 use PHPStan\Command\ErrorFormatter\TableErrorFormatter;
 use PHPStan\Command\Symfony\SymfonyOutput;
 use PHPStan\File\FuzzyRelativePathHelper;
@@ -41,7 +41,7 @@ private function runPath(string $path, int $expectedStatusCode): string
 		if (PHP_VERSION_ID >= 80000 && DIRECTORY_SEPARATOR === '\\') {
 			$this->markTestSkipped('Skipped because of https://github.com/symfony/symfony/issues/37508');
 		}
-		self::getContainer()->getByType(ResultCacheManagerFactory::class)->create([])->clear();
+		self::getContainer()->getByType(ResultCacheClearer::class)->clear();
 		$analyserApplication = self::getContainer()->getByType(AnalyseApplication::class);
 		$resource = fopen('php://memory', 'w', false);
 		if ($resource === false) {