Save the result cache after the rules on CollectedDataNode ran

ResultCacheManager::process() now returns the save as a callback, and both callers call it after
AnalyserResultFinalizer::finalize(). Nothing else changes: the same data is saved.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

Author: SanderMuller

src/Analyser/ResultCache/ResultCacheManager.php

@@ -1356,20 +1356,22 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 		};
 
 		if ($resultCache->isFullAnalysis()) {
-			$saved = false;
-			if ($save !== false) {
+			return new ResultCacheProcessResult($analyserResult, function () use ($save, $output, $analyserResult, $projectConfigArray, $doSave, $freshErrorsByFile, $freshLocallyIgnoredErrorsByFile, $freshCollectedDataByFile): bool {
+				if ($save === false) {
+					if ($output->isVeryVerbose()) {
+						$output->writeLineFormatted('Result cache was not saved because it was not requested.');
+					}
+
+					return false;
+				}
+
 				$projectExtensionFiles = [];
 				if ($analyserResult->getDependencies() !== null) {
 					$projectExtensionFiles = $this->getProjectExtensionFiles($projectConfigArray, $analyserResult->getDependencies());
 				}
-				$saved = $doSave($freshErrorsByFile, $freshLocallyIgnoredErrorsByFile, $analyserResult->getLinesToIgnore(), $analyserResult->getUnmatchedLineIgnores(), $freshCollectedDataByFile, $analyserResult->getDependencies(), $analyserResult->getUsedTraitDependencies(), $analyserResult->getValueDependencies(), $analyserResult->getPackageDependencies(), $this->addNonAnalysedExportedNodes($analyserResult->getExportedNodes(), $analyserResult->getDependencies(), $analyserResult->getUsedTraitDependencies(), CachedExportedNodes::createEmpty()), CachedExportedNodes::createEmpty(), $projectExtensionFiles);
-			} else {
-				if ($output->isVeryVerbose()) {
-					$output->writeLineFormatted('Result cache was not saved because it was not requested.');
-				}
-			}
 
-			return new ResultCacheProcessResult($analyserResult, $saved);
+				return $doSave($freshErrorsByFile, $freshLocallyIgnoredErrorsByFile, $analyserResult->getLinesToIgnore(), $analyserResult->getUnmatchedLineIgnores(), $freshCollectedDataByFile, $analyserResult->getDependencies(), $analyserResult->getUsedTraitDependencies(), $analyserResult->getValueDependencies(), $analyserResult->getPackageDependencies(), $this->addNonAnalysedExportedNodes($analyserResult->getExportedNodes(), $analyserResult->getDependencies(), $analyserResult->getUsedTraitDependencies(), CachedExportedNodes::createEmpty()), CachedExportedNodes::createEmpty(), $projectExtensionFiles);
+			});
 		}
 
 		$errorsByFile = $this->mergeErrors($resultCache, $freshErrorsByFile);
@@ -1385,8 +1387,11 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 		$linesToIgnore = $this->mergeLinesToIgnore($resultCache, $analyserResult->getLinesToIgnore());
 		$unmatchedLineIgnores = $this->mergeUnmatchedLineIgnores($resultCache, $analyserResult->getUnmatchedLineIgnores());
 
-		$saved = false;
-		if ($save !== false) {
+		$saveCallback = function () use ($save, $resultCache, $projectConfigArray, $doSave, $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $usedTraitDependencies, $valueDependencies, $packageDependencies, $exportedNodes, $cachedExportedNodes): bool {
+			if ($save === false) {
+				return false;
+			}
+
 			$projectExtensionFiles = [];
 			foreach ($resultCache->getProjectExtensionFiles() as $file => [$hash, $isAnalysed, $className]) {
 				if ($isAnalysed) {
@@ -1407,8 +1412,8 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 					$projectExtensionFiles[$file] = [$hash, true, $className];
 				}
 			}
-			$saved = $doSave($errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $usedTraitDependencies, $valueDependencies, $packageDependencies, $exportedNodes, $cachedExportedNodes, $projectExtensionFiles);
-		}
+			return $doSave($errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $usedTraitDependencies, $valueDependencies, $packageDependencies, $exportedNodes, $cachedExportedNodes, $projectExtensionFiles);
+		};
 
 		$flatErrors = [];
 		foreach ($errorsByFile as $fileErrors) {
@@ -1442,7 +1447,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 			peakMemoryUsageBytes: $analyserResult->getPeakMemoryUsageBytes(),
 			processedFiles: $analyserResult->getProcessedFiles(),
 			workerCount: $analyserResult->getWorkerCount(),
-		), $saved);
+		), $saveCallback);
 	}
 
 	/**

src/Analyser/ResultCache/ResultCacheProcessResult.php

@@ -2,12 +2,16 @@
 
 namespace PHPStan\Analyser\ResultCache;
 
+use Closure;
 use PHPStan\Analyser\AnalyserResult;
 
 final class ResultCacheProcessResult
 {
 
-	public function __construct(private AnalyserResult $analyserResult, private bool $saved)
+	/**
+	 * @param Closure(): bool $saveCallback
+	 */
+	public function __construct(private AnalyserResult $analyserResult, private Closure $saveCallback)
 	{
 	}
 
@@ -16,9 +20,15 @@ public function getAnalyserResult(): AnalyserResult
 		return $this->analyserResult;
 	}
 
-	public function isSaved(): bool
+	/**
+	 * Writes the result cache, and says whether it was written.
+	 *
+	 * It is separate from ResultCacheManager::process() so that the caller can run the rules on
+	 * CollectedDataNode on the merged result first.
+	 */
+	public function save(): bool
 	{
-		return $this->saved;
+		return ($this->saveCallback)();
 	}
 
 }

src/Command/AnalyseApplication.php

@@ -140,6 +140,7 @@ public function analyse(
 				$onlyFiles,
 				$debug,
 			)->getAnalyserResult();
+			$savedResultCache = $resultCacheResult->save();
 			$internalErrors = $analyserResult->getInternalErrors();
 			$errors = array_merge(
 				$analyserResult->getErrors(),
@@ -154,7 +155,6 @@ public function analyse(
 			$fileSpecificErrors = $ignoredErrorHelperProcessedResult->getNotIgnoredErrors();
 			$notFileSpecificErrors = $ignoredErrorHelperProcessedResult->getOtherIgnoreMessages();
 			$collectedData = $analyserResult->getCollectedData();
-			$savedResultCache = $resultCacheResult->isSaved();
 		}
 
 		return new AnalysisResult(

src/Command/FixerWorkerRunner.php

@@ -190,14 +190,15 @@ function (array $errors, array $locallyIgnoredErrors, array $analysedFiles) use
 					]);
 				},
 			)->then(function (AnalyserResult $intermediateAnalyserResult) use ($resultCacheManager, $resultCache, $errorOutput, $isOnlyFiles, $ignoredErrorHelperResult, $inceptionFiles, $out): void {
-				$analyserResult = $resultCacheManager->process(
+				$resultCacheResult = $resultCacheManager->process(
 					$intermediateAnalyserResult,
 					$resultCache,
 					$errorOutput,
 					false,
 					true,
-				)->getAnalyserResult();
-				$finalizerResult = $this->analyserResultFinalizer->finalize($analyserResult, $isOnlyFiles, false);
+				);
+				$finalizerResult = $this->analyserResultFinalizer->finalize($resultCacheResult->getAnalyserResult(), $isOnlyFiles, false);
+				$resultCacheResult->save();
 
 				$internalErrors = [];
 				foreach ($finalizerResult->getAnalyserResult()->getInternalErrors() as $internalError) {