phpstan · ondrejmirtes · Mar 18, 2025 · Mar 13, 2025 · Mar 18, 2025
diff --git a/src/Analyser/Analyser.php b/src/Analyser/Analyser.php
@@ -3,7 +3,8 @@
 namespace PHPStan\Analyser;
 
 use Closure;
-use PHPStan\Collectors\CollectedData;
+use PhpParser\Node;
+use PHPStan\Collectors\Collector;
 use PHPStan\Collectors\Registry as CollectorRegistry;
 use PHPStan\Rules\Registry as RuleRegistry;
 use Throwable;
@@ -59,7 +60,7 @@ public function analyse(
 		$linesToIgnore = [];
 		$unmatchedLineIgnores = [];
 
-		/** @var list<CollectedData> $collectedData */
+		/** @var array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>> $collectedData */
 		$collectedData = [];
 
 		$internalErrorsCount = 0;

diff --git a/src/Analyser/AnalyserResult.php b/src/Analyser/AnalyserResult.php
@@ -2,7 +2,8 @@
 
 namespace PHPStan\Analyser;
 
-use PHPStan\Collectors\CollectedData;
+use PhpParser\Node;
+use PHPStan\Collectors\Collector;
 use PHPStan\Dependency\RootExportedNode;
 use function usort;
 
@@ -22,7 +23,7 @@ final class AnalyserResult
 	 * @param list<Error> $locallyIgnoredErrors
 	 * @param array<string, LinesToIgnore> $linesToIgnore
 	 * @param array<string, LinesToIgnore> $unmatchedLineIgnores
-	 * @param list<CollectedData> $collectedData
+	 * @param array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>> $collectedData
 	 * @param list<InternalError> $internalErrors
 	 * @param array<string, array<string>>|null $dependencies
 	 * @param array<string, array<RootExportedNode>> $exportedNodes
@@ -125,7 +126,7 @@ public function getInternalErrors(): array
 	}
 
 	/**
-	 * @return list<CollectedData>
+	 * @return array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>>
 	 */
 	public function getCollectedData(): array
 	{

diff --git a/src/Analyser/FileAnalyser.php b/src/Analyser/FileAnalyser.php
@@ -7,7 +7,7 @@
 use PHPStan\BetterReflection\NodeCompiler\Exception\UnableToCompileNode;
 use PHPStan\BetterReflection\Reflection\Exception\CircularReference;
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
-use PHPStan\Collectors\CollectedData;
+use PHPStan\Collectors\Collector;
 use PHPStan\Collectors\Registry as CollectorRegistry;
 use PHPStan\Dependency\DependencyResolver;
 use PHPStan\Node\FileNode;
@@ -76,7 +76,7 @@ public function analyseFile(
 		/** @var list<Error> $locallyIgnoredErrors */
 		$locallyIgnoredErrors = [];
 
-		/** @var list<CollectedData> $fileCollectedData */
+		/** @var array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>> $fileCollectedData */
 		$fileCollectedData = [];
 
 		$fileDependencies = [];
@@ -195,11 +195,7 @@ public function analyseFile(
 							continue;
 						}
 
-						$fileCollectedData[] = new CollectedData(
-							$collectedData,
-							$scope->getFile(),
-							get_class($collector),
-						);
+						$fileCollectedData[$scope->getFile()][get_class($collector)][] = $collectedData;
 					}
 
 					try {

diff --git a/src/Analyser/FileAnalyserResult.php b/src/Analyser/FileAnalyserResult.php
@@ -2,7 +2,8 @@
 
 namespace PHPStan\Analyser;
 
-use PHPStan\Collectors\CollectedData;
+use PhpParser\Node;
+use PHPStan\Collectors\Collector;
 use PHPStan\Dependency\RootExportedNode;
 
 /**
@@ -16,7 +17,7 @@ final class FileAnalyserResult
 	 * @param list<Error> $filteredPhpErrors
 	 * @param list<Error> $allPhpErrors
 	 * @param list<Error> $locallyIgnoredErrors
-	 * @param list<CollectedData> $collectedData
+	 * @param array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>> $collectedData
 	 * @param list<string> $dependencies
 	 * @param list<RootExportedNode> $exportedNodes
 	 * @param LinesToIgnore $linesToIgnore
@@ -69,7 +70,7 @@ public function getLocallyIgnoredErrors(): array
 	}
 
 	/**
-	 * @return list<CollectedData>
+	 * @return array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>>
 	 */
 	public function getCollectedData(): array
 	{

diff --git a/src/Analyser/ResultCache/ResultCache.php b/src/Analyser/ResultCache/ResultCache.php
@@ -2,9 +2,10 @@
 
 namespace PHPStan\Analyser\ResultCache;
 
+use PhpParser\Node;
 use PHPStan\Analyser\Error;
 use PHPStan\Analyser\FileAnalyserResult;
-use PHPStan\Collectors\CollectedData;
+use PHPStan\Collectors\Collector;
 use PHPStan\Dependency\RootExportedNode;
 
 /**
@@ -20,7 +21,7 @@ final class ResultCache
 	 * @param array<string, list<Error>> $locallyIgnoredErrors
 	 * @param array<string, LinesToIgnore> $linesToIgnore
 	 * @param array<string, LinesToIgnore> $unmatchedLineIgnores
-	 * @param array<string, array<CollectedData>> $collectedData
+	 * @param array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>> $collectedData
 	 * @param array<string, array<string>> $dependencies
 	 * @param array<string, array<RootExportedNode>> $exportedNodes
 	 * @param array<string, array{string, bool, string}> $projectExtensionFiles
@@ -101,7 +102,7 @@ public function getUnmatchedLineIgnores(): array
 	}
 
 	/**
-	 * @return array<string, array<CollectedData>>
+	 * @return array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>>
 	 */
 	public function getCollectedData(): array
 	{

diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php
@@ -3,10 +3,12 @@
 namespace PHPStan\Analyser\ResultCache;
 
 use Nette\Neon\Neon;
+use PhpParser\Node;
 use PHPStan\Analyser\AnalyserResult;
 use PHPStan\Analyser\Error;
 use PHPStan\Analyser\FileAnalyserResult;
 use PHPStan\Collectors\CollectedData;
+use PHPStan\Collectors\Collector;
 use PHPStan\Command\Output;
 use PHPStan\Dependency\ExportedNodeFetcher;
 use PHPStan\Dependency\RootExportedNode;
@@ -406,10 +408,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 			$freshLocallyIgnoredErrorsByFile[$error->getFilePath()][] = $error;
 		}
 
-		$freshCollectedDataByFile = [];
-		foreach ($analyserResult->getCollectedData() as $collectedData) {
-			$freshCollectedDataByFile[$collectedData->getFilePath()][] = $collectedData;
-		}
+		$freshCollectedDataByFile = $analyserResult->getCollectedData();
 
 		$meta = $resultCache->getMeta();
 		$projectConfigArray = $meta['projectConfig'];
@@ -524,13 +523,6 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 			}
 		}
 
-		$flatCollectedData = [];
-		foreach ($collectedDataByFile as $fileCollectedData) {
-			foreach ($fileCollectedData as $collectedData) {
-				$flatCollectedData[] = $collectedData;
-			}
-		}
-
 		return new ResultCacheProcessResult(new AnalyserResult(
 			$flatErrors,
 			$analyserResult->getFilteredPhpErrors(),
@@ -539,7 +531,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 			$linesToIgnore,
 			$unmatchedLineIgnores,
 			$internalErrors,
-			$flatCollectedData,
+			$collectedDataByFile,
 			$dependencies,
 			$exportedNodes,
 			$analyserResult->hasReachedInternalErrorsCountLimit(),
@@ -584,8 +576,8 @@ private function mergeLocallyIgnoredErrors(ResultCache $resultCache, array $fres
 	}
 
 	/**
-	 * @param array<string, array<CollectedData>> $freshCollectedDataByFile
-	 * @return array<string, array<CollectedData>>
+	 * @param array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>> $freshCollectedDataByFile
+	 * @return array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>>
 	 */
 	private function mergeCollectedData(ResultCache $resultCache, array $freshCollectedDataByFile): array
 	{
@@ -704,7 +696,7 @@ private function mergeUnmatchedLineIgnores(ResultCache $resultCache, array $fres
 	 * @param array<string, list<Error>> $locallyIgnoredErrors
 	 * @param array<string, LinesToIgnore> $linesToIgnore
 	 * @param array<string, LinesToIgnore> $unmatchedLineIgnores
-	 * @param array<string, array<CollectedData>> $collectedData
+	 * @param array<string, array<string, list<CollectedData>>> $collectedData
 	 * @param array<string, array<string>> $dependencies
 	 * @param array<string, array<RootExportedNode>> $exportedNodes
 	 * @param array<string, array{string, bool, string}> $projectExtensionFiles
@@ -760,6 +752,10 @@ private function save(
 		ksort($collectedData);
 		ksort($invertedDependencies);
 
+		foreach ($collectedData as & $collectedDataPerFile) {
+			ksort($collectedDataPerFile);
+		}
+
 		foreach ($invertedDependencies as $file => $fileData) {
 			$dependentFiles = $fileData['dependentFiles'];
 			sort($dependentFiles);

diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php
@@ -2,10 +2,13 @@
 
 namespace PHPStan\Command;
 
+use PhpParser\Node;
 use PHPStan\Analyser\AnalyserResult;
 use PHPStan\Analyser\AnalyserResultFinalizer;
 use PHPStan\Analyser\Ignore\IgnoredErrorHelper;
 use PHPStan\Analyser\ResultCache\ResultCacheManagerFactory;
+use PHPStan\Collectors\CollectedData;
+use PHPStan\Collectors\Collector;
 use PHPStan\Internal\BytesHelper;
 use PHPStan\PhpDoc\StubFilesProvider;
 use PHPStan\PhpDoc\StubValidator;
@@ -150,7 +153,7 @@ public function analyse(
 			$notFileSpecificErrors,
 			$internalErrors,
 			[],
-			$collectedData,
+			$this->mapCollectedData($collectedData),
 			$defaultLevelUsed,
 			$projectConfigFile,
 			$savedResultCache,
@@ -160,6 +163,22 @@ public function analyse(
 		);
 	}
 
+	/**
+	 * @param array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>> $collectedData
+	 *
+	 * @return list<CollectedData>
+	 */
+	private function mapCollectedData(array $collectedData): array
+	{
+		$result = [];
+		foreach ($collectedData as $file => $dataPerCollector) {
+			foreach ($dataPerCollector as $collectorType => $rawData) {
+				$result[] = new CollectedData($rawData, $file, $collectorType);
+			}
+		}
+		return $result;
+	}
+
 	/**
 	 * @param string[] $files
 	 * @param string[] $allAnalysedFiles

diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php
@@ -226,8 +226,12 @@ private function runWorker(
 					foreach ($fileAnalyserResult->getLocallyIgnoredErrors() as $locallyIgnoredError) {
 						$locallyIgnoredErrors[] = $locallyIgnoredError;
 					}
-					foreach ($fileAnalyserResult->getCollectedData() as $data) {
-						$collectedData[] = $data;
+					foreach ($fileAnalyserResult->getCollectedData() as $collectedFile => $dataPerCollector) {
+						foreach ($dataPerCollector as $collectorType => $collectorData) {
+							foreach ($collectorData as $data) {
+								$collectedData[$collectedFile][$collectorType][] = $data;
+							}
+						}
 					}
 				} catch (Throwable $t) {
 					$internalErrorsCount++;

diff --git a/src/Node/CollectedDataNode.php b/src/Node/CollectedDataNode.php
@@ -4,9 +4,7 @@
 
 use PhpParser\Node;
 use PhpParser\NodeAbstract;
-use PHPStan\Collectors\CollectedData;
 use PHPStan\Collectors\Collector;
-use function array_key_exists;
 
 /**
  * @api
@@ -15,7 +13,7 @@ final class CollectedDataNode extends NodeAbstract implements VirtualNode
 {
 
 	/**
-	 * @param CollectedData[] $collectedData
+	 * @param array<string, array<class-string<Collector<Node, mixed>>, list<mixed>>> $collectedData
 	 */
 	public function __construct(private array $collectedData, private bool $onlyFiles)
 	{
@@ -31,17 +29,14 @@ public function __construct(private array $collectedData, private bool $onlyFile
 	public function get(string $collectorType): array
 	{
 		$result = [];
-		foreach ($this->collectedData as $collectedData) {
-			if ($collectedData->getCollectorType() !== $collectorType) {
+		foreach ($this->collectedData as $filePath => $collectedDataPerCollector) {
+			if (!isset($collectedDataPerCollector[$collectorType])) {
 				continue;
 			}
 
-			$filePath = $collectedData->getFilePath();
-			if (!array_key_exists($filePath, $result)) {
-				$result[$filePath] = [];
+			foreach ($collectedDataPerCollector[$collectorType] as $rawData) {
+				$result[$filePath][] = $rawData;
 			}
-
-			$result[$filePath][] = $collectedData->getData();
 		}
 
 		return $result;

diff --git a/src/Parallel/ParallelAnalyser.php b/src/Parallel/ParallelAnalyser.php
@@ -9,7 +9,6 @@
 use PHPStan\Analyser\AnalyserResult;
 use PHPStan\Analyser\Error;
 use PHPStan\Analyser\InternalError;
-use PHPStan\Collectors\CollectedData;
 use PHPStan\Dependency\RootExportedNode;
 use PHPStan\Process\ProcessHelper;
 use React\EventLoop\LoopInterface;
@@ -211,8 +210,12 @@ public function analyse(
 					$locallyIgnoredErrors[] = $locallyIgnoredFileError;
 				}
 
-				foreach ($json['collectedData'] as $jsonData) {
-					$collectedData[] = CollectedData::decode($jsonData);
+				foreach ($json['collectedData'] as $file => $jsonDataByCollector) {
+					foreach ($jsonDataByCollector as $collectorType => $listOfCollectedData) {
+						foreach ($listOfCollectedData as $rawCollectedData) {
+							$collectedData[$file][$collectorType][] = $rawCollectedData;
+						}
+					}
 				}
 
 				/**