Do not pass a fake path to analyse in ClearResultCacheCommand; check …

…paths count later when asking for files
phpstan · Aug 24, 2023 · 4e37a2d · 4e37a2d
1 parent 3befb53
commit 4e37a2d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 9 deletions.
diff --git a/src/Command/AnalyseCommand.php b/src/Command/AnalyseCommand.php
@@ -220,6 +220,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (PathNotFoundException $e) {
 			$inceptionResult->getErrorOutput()->writeLineFormatted(sprintf('<error>%s</error>', $e->getMessage()));
 			return 1;
+		} catch (InceptionNotSuccessfulException $e) {
+			return 1;
 		}
 
 		if (count($files) === 0) {

diff --git a/src/Command/ClearResultCacheCommand.php b/src/Command/ClearResultCacheCommand.php
@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$inceptionResult = CommandHelper::begin(
 				$input,
 				$output,
-				['.'],
+				[],
 				$memoryLimit,
 				$autoloadFile,
 				$this->composerAutoloaderProjectPaths,

diff --git a/src/Command/CommandHelper.php b/src/Command/CommandHelper.php
@@ -356,11 +356,6 @@ public static function begin(
 			$containerFactory->clearOldContainers($tmpDir);
 		}
 
-		if (count($paths) === 0) {
-			$errorOutput->writeLineFormatted('At least one path must be specified to analyse.');
-			throw new InceptionNotSuccessfulException();
-		}
-
 		/** @var bool|null $customRulesetUsed */
 		$customRulesetUsed = $container->getParameter('customRulesetUsed');
 		if ($customRulesetUsed === null) {
@@ -473,7 +468,11 @@ public static function begin(
 
 		$stubFilesProvider = $container->getByType(StubFilesProvider::class);
 
-		$filesCallback = static function () use ($currentWorkingDirectoryFileHelper, $stubFilesProvider, $fileFinder, $pathRoutingParser, $paths): array {
+		$filesCallback = static function () use ($currentWorkingDirectoryFileHelper, $stubFilesProvider, $fileFinder, $pathRoutingParser, $paths, $errorOutput): array {
+			if (count($paths) === 0) {
+				$errorOutput->writeLineFormatted('At least one path must be specified to analyse.');
+				throw new InceptionNotSuccessfulException();
+			}
 			$fileFinderResult = $fileFinder->findFiles($paths);
 			$files = $fileFinderResult->getFiles();
 

diff --git a/src/Command/FixerApplication.php b/src/Command/FixerApplication.php
@@ -18,6 +18,7 @@
 use PHPStan\File\FileMonitorResult;
 use PHPStan\File\FileReader;
 use PHPStan\File\FileWriter;
+use PHPStan\File\PathNotFoundException;
 use PHPStan\Internal\ComposerHelper;
 use PHPStan\Process\ProcessHelper;
 use PHPStan\Process\ProcessPromise;
@@ -417,7 +418,13 @@ private function reanalyseAfterFileChanges(
 		$projectConfigArray = $inceptionResult->getProjectConfigArray();
 
 		$resultCacheManager = $this->resultCacheManagerFactory->create();
-		[$inceptionFiles, $isOnlyFiles] = $inceptionResult->getFiles();
+
+		try {
+			[$inceptionFiles, $isOnlyFiles] = $inceptionResult->getFiles();
+		} catch (InceptionNotSuccessfulException | PathNotFoundException) {
+			throw new ShouldNotHappenException();
+		}
+
 		$resultCache = $resultCacheManager->restore($inceptionFiles, false, false, $projectConfigArray, $inceptionResult->getErrorOutput());
 		if (count($resultCache->getFilesToAnalyse()) === 0) {
 			$result = $resultCacheManager->process(

diff --git a/src/Command/FixerWorkerCommand.php b/src/Command/FixerWorkerCommand.php
@@ -15,6 +15,7 @@
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
 use PHPStan\Collectors\CollectedData;
 use PHPStan\DependencyInjection\Container;
+use PHPStan\File\PathNotFoundException;
 use PHPStan\Node\CollectedDataNode;
 use PHPStan\Rules\Registry as RuleRegistry;
 use PHPStan\ShouldNotHappenException;
@@ -116,7 +117,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$resultCacheManager = $container->getByType(ResultCacheManagerFactory::class)->create();
 		$projectConfigArray = $inceptionResult->getProjectConfigArray();
-		[$inceptionFiles, $isOnlyFiles] = $inceptionResult->getFiles();
+
+		try {
+			[$inceptionFiles, $isOnlyFiles] = $inceptionResult->getFiles();
+		} catch (PathNotFoundException | InceptionNotSuccessfulException) {
+			return 1;
+		}
+
 		$resultCache = $resultCacheManager->restore($inceptionFiles, false, false, $projectConfigArray, $inceptionResult->getErrorOutput());
 
 		$intermediateAnalyserResult = $analyserRunner->runAnalyser(

diff --git a/src/Command/InceptionResult.php b/src/Command/InceptionResult.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Command;
 
 use PHPStan\DependencyInjection\Container;
+use PHPStan\File\PathNotFoundException;
 use PHPStan\Internal\BytesHelper;
 use function sprintf;
 
@@ -31,12 +32,15 @@ public function __construct(
 	}
 
 	/**
+	 * @throws InceptionNotSuccessfulException
+	 * @throws PathNotFoundException
 	 * @return array{string[], bool}
 	 */
 	public function getFiles(): array
 	{
 		$callback = $this->filesCallback;
 
+		/** @throws InceptionNotSuccessfulException|PathNotFoundException */
 		return $callback();
 	}
 

diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php
@@ -115,6 +115,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (PathNotFoundException $e) {
 			$inceptionResult->getErrorOutput()->writeLineFormatted(sprintf('<error>%s</error>', $e->getMessage()));
 			return 1;
+		} catch (InceptionNotSuccessfulException) {
+			return 1;
 		}
 
 		$nodeScopeResolver = $container->getByType(NodeScopeResolver::class);