PHPStan Pro - refresh errors when scanned file is changed

Author: ondrejmirtes

conf/config.neon

@@ -732,7 +732,12 @@ services:
 	-
 		class: PHPStan\File\FileMonitor
 		arguments:
-			fileFinder: @fileFinderAnalyse
+			analyseFileFinder: @fileFinderAnalyse
+			scanFileFinder: @fileFinderScan
+			analysedPaths: %analysedPaths%
+			analysedPathsFromConfig: %analysedPathsFromConfig%
+			scanFiles: %scanFiles%
+			scanDirectories: %scanDirectories%
 
 	-
 		class: PHPStan\Parser\DeclarePositionVisitor

src/Command/FixerApplication.php

@@ -147,7 +147,6 @@ public function run(
 			});
 
 			$this->fileMonitor->initialize(array_merge(
-				$this->analysedPaths,
 				$this->getComposerLocks(),
 				$this->getComposerInstalled(),
 				$this->getExecutedFiles(),

src/File/FileMonitor.php

@@ -3,9 +3,14 @@
 namespace PHPStan\File;
 
 use PHPStan\ShouldNotHappenException;
+use function array_diff;
 use function array_key_exists;
 use function array_keys;
+use function array_merge;
+use function array_unique;
 use function count;
+use function is_dir;
+use function is_file;
 use function sha1_file;
 
 final class FileMonitor
@@ -15,39 +20,52 @@ final class FileMonitor
 	private ?array $fileHashes = null;
 
 	/** @var array<string>|null */
-	private ?array $paths = null;
+	private ?array $filePaths = null;
 
-	public function __construct(private FileFinder $fileFinder)
+	/**
+	 * @param string[] $analysedPaths
+	 * @param string[] $analysedPathsFromConfig
+	 * @param string[] $scanFiles
+	 * @param string[] $scanDirectories
+	 */
+	public function __construct(
+		private FileFinder $analyseFileFinder,
+		private FileFinder $scanFileFinder,
+		private array $analysedPaths,
+		private array $analysedPathsFromConfig,
+		private array $scanFiles,
+		private array $scanDirectories,
+	)
 	{
 	}
 
 	/**
-	 * @param array<string> $paths
+	 * @param array<string> $filePaths
 	 */
-	public function initialize(array $paths): void
+	public function initialize(array $filePaths): void
 	{
-		$finderResult = $this->fileFinder->findFiles($paths);
+		$finderResult = $this->analyseFileFinder->findFiles($this->analysedPaths);
 		$fileHashes = [];
-		foreach ($finderResult->getFiles() as $filePath) {
+		foreach (array_merge($finderResult->getFiles(), $filePaths, $this->getScannedFiles($finderResult->getFiles())) as $filePath) {
 			$fileHashes[$filePath] = $this->getFileHash($filePath);
 		}
 
 		$this->fileHashes = $fileHashes;
-		$this->paths = $paths;
+		$this->filePaths = $filePaths;
 	}
 
 	public function getChanges(): FileMonitorResult
 	{
-		if ($this->fileHashes === null || $this->paths === null) {
+		if ($this->fileHashes === null || $this->filePaths === null) {
 			throw new ShouldNotHappenException();
 		}
-		$finderResult = $this->fileFinder->findFiles($this->paths);
+		$finderResult = $this->analyseFileFinder->findFiles($this->analysedPaths);
 		$oldFileHashes = $this->fileHashes;
 		$fileHashes = [];
 		$newFiles = [];
 		$changedFiles = [];
 		$deletedFiles = [];
-		foreach ($finderResult->getFiles() as $filePath) {
+		foreach (array_merge($finderResult->getFiles(), $this->filePaths, $this->getScannedFiles($finderResult->getFiles())) as $filePath) {
 			if (!array_key_exists($filePath, $oldFileHashes)) {
 				$newFiles[] = $filePath;
 				$fileHashes[$filePath] = $this->getFileHash($filePath);
@@ -90,4 +108,32 @@ private function getFileHash(string $filePath): string
 		return $hash;
 	}
 
+	/**
+	 * @param string[] $allAnalysedFiles
+	 * @return array<string>
+	 */
+	private function getScannedFiles(array $allAnalysedFiles): array
+	{
+		$scannedFiles = $this->scanFiles;
+		$analysedDirectories = [];
+		foreach (array_merge($this->analysedPaths, $this->analysedPathsFromConfig) as $analysedPath) {
+			if (is_file($analysedPath)) {
+				continue;
+			}
+
+			if (!is_dir($analysedPath)) {
+				continue;
+			}
+
+			$analysedDirectories[] = $analysedPath;
+		}
+
+		$directories = array_unique(array_merge($analysedDirectories, $this->scanDirectories));
+		foreach ($this->scanFileFinder->findFiles($directories)->getFiles() as $file) {
+			$scannedFiles[] = $file;
+		}
+
+		return array_diff($scannedFiles, $allAnalysedFiles);
+	}
+
 }