Fixed issue with files being analysed multiple times when result cache is used

ondrejmirtes · ondrejmirtes · commit 349bd9ed737d · 2020-03-02T16:54:54.000+01:00
diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php
@@ -119,7 +119,7 @@ public function restore(array $allAnalysedFiles, bool $debug): ResultCache
 			}
 		}
 
-		return new ResultCache($filesToAnalyse, false, $data['lastFullAnalysisTime'], $data['errors'], $invertedDependenciesToReturn);
+		return new ResultCache(array_unique($filesToAnalyse), false, $data['lastFullAnalysisTime'], $data['errors'], $invertedDependenciesToReturn);
 	}
 
 	public function process(AnalyserResult $analyserResult, ResultCache $resultCache): AnalyserResult
diff --git a/tests/e2e/ResultCacheEndToEndTest.php b/tests/e2e/ResultCacheEndToEndTest.php
@@ -31,6 +31,7 @@ public function testResultCache(): void
 		$lexerCode = str_replace('@param string $code', '', $lexerCode);
 		$lexerCode = str_replace('public function startLexing($code', 'public function startLexing(\\PhpParser\\Node\\Expr\\MethodCall $code', $lexerCode);
 		file_put_contents($lexerPath, $lexerCode);
+		touch(__DIR__ . '/PHP-Parser/lib/PhpParser/ErrorHandler.php');
 
 		$result = $this->runPhpstan(1);
 		$this->assertSame(2, $result['totals']['file_errors']);

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function restore(array $allAnalysedFiles, bool $debug): ResultCache`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- return new ResultCache($filesToAnalyse, false, $data['lastFullAnalysisTime'], $data['errors'], $invertedDependenciesToReturn);`
	`122`	`+ return new ResultCache(array_unique($filesToAnalyse), false, $data['lastFullAnalysisTime'], $data['errors'], $invertedDependenciesToReturn);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`public function process(AnalyserResult $analyserResult, ResultCache $resultCache): AnalyserResult`