Merge branch refs/heads/1.12.x into 2.1.x

Author: phpstan-bot

src/File/FileMonitor.php

@@ -54,7 +54,7 @@ public function initialize(array $filePaths): void
 {
 $finderResult = $this->analyseFileFinder->findFiles($this->analysedPaths);
 $fileHashes = [];
-foreach (array_merge($finderResult->getFiles(), $filePaths, $this->getScannedFiles($finderResult->getFiles())) as $filePath) {
+foreach (array_unique(array_merge($finderResult->getFiles(), $filePaths, $this->getScannedFiles($finderResult->getFiles()))) as $filePath) {
 $fileHashes[$filePath] = $this->getFileHash($filePath);
 }
 
@@ -73,7 +73,8 @@ public function getChanges(): FileMonitorResult
 $newFiles = [];
 $changedFiles = [];
 $deletedFiles = [];
-foreach (array_merge($finderResult->getFiles(), $this->filePaths, $this->getScannedFiles($finderResult->getFiles())) as $filePath) {
+$filePaths = array_unique(array_merge($finderResult->getFiles(), $this->filePaths, $this->getScannedFiles($finderResult->getFiles())));
+foreach ($filePaths as $filePath) {
 if (!array_key_exists($filePath, $oldFileHashes)) {
 $newFiles[] = $filePath;
 $fileHashes[$filePath] = $this->getFileHash($filePath);