Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

ondrejmirtes · ondrejmirtes · commit c5a9b8dd04ed · 2025-05-18T14:20:34.000+02:00
diff --git a/src/Analyser/ResultCache/ResultCache.php b/src/Analyser/ResultCache/ResultCache.php
@@ -25,6 +25,7 @@ final class ResultCache
 	 * @param array<string, array<string>> $dependencies
 	 * @param array<string, array<RootExportedNode>> $exportedNodes
 	 * @param array<string, array{string, bool, string}> $projectExtensionFiles
+	 * @param array<string, string> $currentFileHashes
 	 */
 	public function __construct(
 		private array $filesToAnalyse,
@@ -39,6 +40,7 @@ public function __construct(
 		private array $dependencies,
 		private array $exportedNodes,
 		private array $projectExtensionFiles,
+		private array $currentFileHashes,
 	)
 	{
 	}
@@ -133,4 +135,12 @@ public function getProjectExtensionFiles(): array
 		return $this->projectExtensionFiles;
 	}
 
+	/**
+	 * @return array<string, string>
+	 */
+	public function getCurrentFileHashes(): array
+	{
+		return $this->currentFileHashes;
+	}
+
 }
diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php
@@ -98,25 +98,29 @@ public function __construct(
 	public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?array $projectConfigArray, Output $output): ResultCache
 	{
 		$startTime = microtime(true);
+		$currentFileHashes = [];
+		foreach ($allAnalysedFiles as $analysedFile) {
+			$currentFileHashes[$analysedFile] = $this->getFileHash($analysedFile);
+		}
 		if ($debug) {
 			if ($output->isVeryVerbose()) {
 				$output->writeLineFormatted('Result cache not used because of debug mode.');
 			}
-			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);
+			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);
 		}
 		if ($onlyFiles) {
 			if ($output->isVeryVerbose()) {
 				$output->writeLineFormatted('Result cache not used because only files were passed as analysed paths.');
 			}
-			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);
+			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);
 		}
 
 		$cacheFilePath = $this->cacheFilePath;
 		if (!is_file($cacheFilePath)) {
 			if ($output->isVeryVerbose()) {
 				$output->writeLineFormatted('Result cache not used because the cache file does not exist.');
 			}
-			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);
+			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);
 		}
 
 		try {
@@ -128,7 +132,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 
 			@unlink($cacheFilePath);
 
-			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);
+			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);
 		}
 
 		if (!is_array($data)) {
@@ -137,7 +141,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 				$output->writeLineFormatted('Result cache not used because the cache file is corrupted.');
 			}
 
-			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);
+			return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);
 		}
 
 		$meta = $this->getMeta($allAnalysedFiles, $projectConfigArray);
@@ -146,7 +150,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 				$diffs = $this->getMetaKeyDifferences($data['meta'], $meta);
 				$output->writeLineFormatted('Result cache not used because the metadata do not match: ' . implode(', ', $diffs));
 			}
-			return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []);
+			return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], [], $currentFileHashes);
 		}
 
 		$daysOldForSkip = $this->skipResultCacheIfOlderThanDays;
@@ -155,7 +159,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 				$output->writeLineFormatted(sprintf("Result cache not used because it's more than %d days since last full analysis.", $daysOldForSkip));
 			}
 			// run full analysis if the result cache is older than X days
-			return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []);
+			return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], [], $currentFileHashes);
 		}
 
 		/**
@@ -170,7 +174,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 				if ($output->isVeryVerbose()) {
 					$output->writeLineFormatted(sprintf('Result cache not used because extension file %s was not found.', $extensionFile));
 				}
-				return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []);
+				return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], [], $currentFileHashes);
 			}
 
 			if ($this->getFileHash($extensionFile) === $fileHash) {
@@ -181,7 +185,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 				$output->writeLineFormatted(sprintf('Result cache not used because extension file %s hash does not match.', $extensionFile));
 			}
 
-			return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []);
+			return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], [], $currentFileHashes);
 		}
 
 		$invertedDependencies = $data['dependencies'];
@@ -242,7 +246,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 			$cachedFileHash = $analysedFileData['fileHash'];
 			$dependentFiles = $analysedFileData['dependentFiles'];
 			$invertedDependenciesToReturn[$analysedFile] = $dependentFiles;
-			$currentFileHash = $this->getFileHash($analysedFile);
+			$currentFileHash = $currentFileHashes[$analysedFile];
 
 			if ($cachedFileHash === $currentFileHash) {
 				continue;
@@ -309,7 +313,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 			));
 		}
 
-		return new ResultCache($filesToAnalyse, false, $data['lastFullAnalysisTime'], $meta, $filteredErrors, $filteredLocallyIgnoredErrors, $filteredLinesToIgnore, $filteredUnmatchedLineIgnores, $filteredCollectedData, $invertedDependenciesToReturn, $filteredExportedNodes, $data['projectExtensionFiles']);
+		return new ResultCache($filesToAnalyse, false, $data['lastFullAnalysisTime'], $meta, $filteredErrors, $filteredLocallyIgnoredErrors, $filteredLinesToIgnore, $filteredUnmatchedLineIgnores, $filteredCollectedData, $invertedDependenciesToReturn, $filteredExportedNodes, $data['projectExtensionFiles'], $currentFileHashes);
 	}
 
 	/**
@@ -450,7 +454,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 				}
 			}
 
-			$this->save($resultCache->getLastFullAnalysisTime(), $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $exportedNodes, $projectExtensionFiles, $meta);
+			$this->save($resultCache->getLastFullAnalysisTime(), $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $exportedNodes, $projectExtensionFiles, $resultCache->getCurrentFileHashes(), $meta);
 
 			if ($output->isVeryVerbose()) {
 				$output->writeLineFormatted('Result cache is saved.');
@@ -700,6 +704,7 @@ private function mergeUnmatchedLineIgnores(ResultCache $resultCache, array $fres
 	 * @param array<string, array<string>> $dependencies
 	 * @param array<string, array<RootExportedNode>> $exportedNodes
 	 * @param array<string, array{string, bool, string}> $projectExtensionFiles
+	 * @param array<string, string> $currentFileHashes
 	 * @param mixed[] $meta
 	 */
 	private function save(
@@ -712,6 +717,7 @@ private function save(
 		array $dependencies,
 		array $exportedNodes,
 		array $projectExtensionFiles,
+		array $currentFileHashes,
 		array $meta,
 	): void
 	{
@@ -721,7 +727,7 @@ private function save(
 			foreach ($fileDependencies as $fileDep) {
 				if (!array_key_exists($fileDep, $invertedDependencies)) {
 					$invertedDependencies[$fileDep] = [
-						'fileHash' => $this->getFileHash($fileDep),
+						'fileHash' => $currentFileHashes[$fileDep] ?? $this->getFileHash($fileDep),
 						'dependentFiles' => [],
 					];
 					unset($filesNoOneIsDependingOn[$fileDep]);
@@ -740,7 +746,7 @@ private function save(
 			}
 
 			$invertedDependencies[$file] = [
-				'fileHash' => $this->getFileHash($file),
+				'fileHash' => $currentFileHashes[$file] ?? $this->getFileHash($file),
 				'dependentFiles' => [],
 			];
 		}

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ final class ResultCache`
`25`	`25`	`* @param array<string, array<string>> $dependencies`
`26`	`26`	`* @param array<string, array<RootExportedNode>> $exportedNodes`
`27`	`27`	`* @param array<string, array{string, bool, string}> $projectExtensionFiles`
	`28`	`+ * @param array<string, string> $currentFileHashes`
`28`	`29`	`*/`
`29`	`30`	`public function __construct(`
`30`	`31`	`private array $filesToAnalyse,`
`@@ -39,6 +40,7 @@ public function __construct(`
`39`	`40`	`private array $dependencies,`
`40`	`41`	`private array $exportedNodes,`
`41`	`42`	`private array $projectExtensionFiles,`
	`43`	`+ private array $currentFileHashes,`
`42`	`44`	`)`
`43`	`45`	`{`
`44`	`46`	`}`
`@@ -133,4 +135,12 @@ public function getProjectExtensionFiles(): array`
`133`	`135`	`return $this->projectExtensionFiles;`
`134`	`136`	`}`
`135`	`137`
	`138`	`+ /**`
	`139`	`+ * @return array<string, string>`
	`140`	`+ */`
	`141`	`+ public function getCurrentFileHashes(): array`
	`142`	`+ {`
	`143`	`+ return $this->currentFileHashes;`
	`144`	`+ }`
	`145`	`+`
`136`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,25 +98,29 @@ public function __construct(`
`98`	`98`	`public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?array $projectConfigArray, Output $output): ResultCache`
`99`	`99`	`{`
`100`	`100`	`$startTime = microtime(true);`
	`101`	`+ $currentFileHashes = [];`
	`102`	`+ foreach ($allAnalysedFiles as $analysedFile) {`
	`103`	`+ $currentFileHashes[$analysedFile] = $this->getFileHash($analysedFile);`
	`104`	`+ }`
`101`	`105`	`if ($debug) {`
`102`	`106`	`if ($output->isVeryVerbose()) {`
`103`	`107`	`$output->writeLineFormatted('Result cache not used because of debug mode.');`
`104`	`108`	`}`
`105`		`- return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);`
	`109`	`+ return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);`
`106`	`110`	`}`
`107`	`111`	`if ($onlyFiles) {`
`108`	`112`	`if ($output->isVeryVerbose()) {`
`109`	`113`	`$output->writeLineFormatted('Result cache not used because only files were passed as analysed paths.');`
`110`	`114`	`}`
`111`		`- return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);`
	`115`	`+ return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);`
`112`	`116`	`}`
`113`	`117`
`114`	`118`	`$cacheFilePath = $this->cacheFilePath;`
`115`	`119`	`if (!is_file($cacheFilePath)) {`
`116`	`120`	`if ($output->isVeryVerbose()) {`
`117`	`121`	`$output->writeLineFormatted('Result cache not used because the cache file does not exist.');`
`118`	`122`	`}`
`119`		`- return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);`
	`123`	`+ return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);`
`120`	`124`	`}`
`121`	`125`
`122`	`126`	`try {`
`@@ -128,7 +132,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?`
`128`	`132`
`129`	`133`	`@unlink($cacheFilePath);`
`130`	`134`
`131`		`- return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);`
	`135`	`+ return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);`
`132`	`136`	`}`
`133`	`137`
`134`	`138`	`if (!is_array($data)) {`
`@@ -137,7 +141,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?`
`137`	`141`	`$output->writeLineFormatted('Result cache not used because the cache file is corrupted.');`
`138`	`142`	`}`
`139`	`143`
`140`		`- return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []);`
	`144`	`+ return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], [], $currentFileHashes);`
`141`	`145`	`}`
`142`	`146`
`143`	`147`	`$meta = $this->getMeta($allAnalysedFiles, $projectConfigArray);`
`@@ -146,7 +150,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?`
`146`	`150`	`$diffs = $this->getMetaKeyDifferences($data['meta'], $meta);`
`147`	`151`	`$output->writeLineFormatted('Result cache not used because the metadata do not match: ' . implode(', ', $diffs));`
`148`	`152`	`}`
`149`		`- return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []);`
	`153`	`+ return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], [], $currentFileHashes);`
`150`	`154`	`}`
`151`	`155`
`152`	`156`	`$daysOldForSkip = $this->skipResultCacheIfOlderThanDays;`
`@@ -155,7 +159,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?`
`155`	`159`	`$output->writeLineFormatted(sprintf("Result cache not used because it's more than %d days since last full analysis.", $daysOldForSkip));`
`156`	`160`	`}`
`157`	`161`	`// run full analysis if the result cache is older than X days`
`158`		`- return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []);`
	`162`	`+ return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], [], $currentFileHashes);`
`159`	`163`	`}`
`160`	`164`
`161`	`165`	`/**`
`@@ -170,7 +174,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?`
`170`	`174`	`if ($output->isVeryVerbose()) {`
`171`	`175`	`$output->writeLineFormatted(sprintf('Result cache not used because extension file %s was not found.', $extensionFile));`
`172`	`176`	`}`
`173`		`- return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []);`
	`177`	`+ return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], [], $currentFileHashes);`
`174`	`178`	`}`
`175`	`179`
`176`	`180`	`if ($this->getFileHash($extensionFile) === $fileHash) {`
`@@ -181,7 +185,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?`
`181`	`185`	`$output->writeLineFormatted(sprintf('Result cache not used because extension file %s hash does not match.', $extensionFile));`
`182`	`186`	`}`
`183`	`187`
`184`		`- return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []);`
	`188`	`+ return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], [], $currentFileHashes);`
`185`	`189`	`}`
`186`	`190`
`187`	`191`	`$invertedDependencies = $data['dependencies'];`
`@@ -242,7 +246,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?`
`242`	`246`	`$cachedFileHash = $analysedFileData['fileHash'];`
`243`	`247`	`$dependentFiles = $analysedFileData['dependentFiles'];`
`244`	`248`	`$invertedDependenciesToReturn[$analysedFile] = $dependentFiles;`
`245`		`- $currentFileHash = $this->getFileHash($analysedFile);`
	`249`	`+ $currentFileHash = $currentFileHashes[$analysedFile];`
`246`	`250`
`247`	`251`	`if ($cachedFileHash === $currentFileHash) {`
`248`	`252`	`continue;`
`@@ -309,7 +313,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?`
`309`	`313`	`));`
`310`	`314`	`}`
`311`	`315`
`312`		`- return new ResultCache($filesToAnalyse, false, $data['lastFullAnalysisTime'], $meta, $filteredErrors, $filteredLocallyIgnoredErrors, $filteredLinesToIgnore, $filteredUnmatchedLineIgnores, $filteredCollectedData, $invertedDependenciesToReturn, $filteredExportedNodes, $data['projectExtensionFiles']);`
	`316`	`+ return new ResultCache($filesToAnalyse, false, $data['lastFullAnalysisTime'], $meta, $filteredErrors, $filteredLocallyIgnoredErrors, $filteredLinesToIgnore, $filteredUnmatchedLineIgnores, $filteredCollectedData, $invertedDependenciesToReturn, $filteredExportedNodes, $data['projectExtensionFiles'], $currentFileHashes);`
`313`	`317`	`}`
`314`	`318`
`315`	`319`	`/**`
`@@ -450,7 +454,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache`
`450`	`454`	`}`
`451`	`455`	`}`
`452`	`456`
`453`		`- $this->save($resultCache->getLastFullAnalysisTime(), $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $exportedNodes, $projectExtensionFiles, $meta);`
	`457`	`+ $this->save($resultCache->getLastFullAnalysisTime(), $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $exportedNodes, $projectExtensionFiles, $resultCache->getCurrentFileHashes(), $meta);`
`454`	`458`
`455`	`459`	`if ($output->isVeryVerbose()) {`
`456`	`460`	`$output->writeLineFormatted('Result cache is saved.');`
`@@ -700,6 +704,7 @@ private function mergeUnmatchedLineIgnores(ResultCache $resultCache, array $fres`
`700`	`704`	`* @param array<string, array<string>> $dependencies`
`701`	`705`	`* @param array<string, array<RootExportedNode>> $exportedNodes`
`702`	`706`	`* @param array<string, array{string, bool, string}> $projectExtensionFiles`
	`707`	`+ * @param array<string, string> $currentFileHashes`
`703`	`708`	`* @param mixed[] $meta`
`704`	`709`	`*/`
`705`	`710`	`private function save(`
`@@ -712,6 +717,7 @@ private function save(`
`712`	`717`	`array $dependencies,`
`713`	`718`	`array $exportedNodes,`
`714`	`719`	`array $projectExtensionFiles,`
	`720`	`+ array $currentFileHashes,`
`715`	`721`	`array $meta,`
`716`	`722`	`): void`
`717`	`723`	`{`
`@@ -721,7 +727,7 @@ private function save(`
`721`	`727`	`foreach ($fileDependencies as $fileDep) {`
`722`	`728`	`if (!array_key_exists($fileDep, $invertedDependencies)) {`
`723`	`729`	`$invertedDependencies[$fileDep] = [`
`724`		`- 'fileHash' => $this->getFileHash($fileDep),`
	`730`	`+ 'fileHash' => $currentFileHashes[$fileDep] ?? $this->getFileHash($fileDep),`
`725`	`731`	`'dependentFiles' => [],`
`726`	`732`	`];`
`727`	`733`	`unset($filesNoOneIsDependingOn[$fileDep]);`
`@@ -740,7 +746,7 @@ private function save(`
`740`	`746`	`}`
`741`	`747`
`742`	`748`	`$invertedDependencies[$file] = [`
`743`		`- 'fileHash' => $this->getFileHash($file),`
	`749`	`+ 'fileHash' => $currentFileHashes[$file] ?? $this->getFileHash($file),`
`744`	`750`	`'dependentFiles' => [],`
`745`	`751`	`];`
`746`	`752`	`}`