Skip to content

Commit bd6fc4e

Browse files
ondrejmirtesondrejmirtes
committed
Result cache traits optimization - analyse only files using trait when trait implementation changes
Specifically, files dependending on classes using the trait will not be reanalysed in this situation.
1 parent e5db864 commit bd6fc4e

15 files changed

+314
-39
lines changed

‎src/Analyser/Analyser.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public function analyse(
6565
$internalErrorsCount = 0;
6666
$reachedInternalErrorsCountLimit = false;
6767
$dependencies = [];
68+
$usedTraitDependencies = [];
6869
$exportedNodes = [];
6970
foreach ($files as $file) {
7071
if ($preFileCallback !== null) {
@@ -88,6 +89,7 @@ public function analyse(
8889
$unmatchedLineIgnores[$file] = $fileAnalyserResult->getUnmatchedLineIgnores();
8990
$collectedData = array_merge($collectedData, $fileAnalyserResult->getCollectedData());
9091
$dependencies[$file] = $fileAnalyserResult->getDependencies();
92+
$usedTraitDependencies[$file] = $fileAnalyserResult->getUsedTraitDependencies();
9193

9294
$fileExportedNodes = $fileAnalyserResult->getExportedNodes();
9395
if (count($fileExportedNodes) > 0) {
@@ -127,6 +129,7 @@ public function analyse(
127129
[],
128130
$collectedData,
129131
$internalErrorsCount === 0 ? $dependencies : null,
132+
$internalErrorsCount === 0 ? $usedTraitDependencies : null,
130133
$exportedNodes,
131134
$reachedInternalErrorsCountLimit,
132135
memory_get_peak_usage(true),

‎src/Analyser/AnalyserResult.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ final class AnalyserResult
2525
* @param list<CollectedData> $collectedData
2626
* @param list<InternalError> $internalErrors
2727
* @param array<string, array<string>>|null $dependencies
28+
* @param array<string, array<string>>|null $usedTraitDependencies
2829
* @param array<string, array<RootExportedNode>> $exportedNodes
2930
*/
3031
public function __construct(
@@ -37,6 +38,7 @@ public function __construct(
3738
private array $internalErrors,
3839
private array $collectedData,
3940
private ?array $dependencies,
41+
private ?array $usedTraitDependencies,
4042
private array $exportedNodes,
4143
private bool $reachedInternalErrorsCountLimit,
4244
private int $peakMemoryUsageBytes,
@@ -140,6 +142,14 @@ public function getDependencies(): ?array
140142
return $this->dependencies;
141143
}
142144

145+
/**
146+
* @return array<string, array<string>>|null
147+
*/
148+
public function getUsedTraitDependencies(): ?array
149+
{
150+
return $this->usedTraitDependencies;
151+
}
152+
143153
/**
144154
* @return array<string, array<RootExportedNode>>
145155
*/

‎src/Analyser/AnalyserResultFinalizer.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ public function finalize(AnalyserResult $analyserResult, bool $onlyFiles, bool $
129129
$internalErrors,
130130
$analyserResult->getCollectedData(),
131131
$analyserResult->getDependencies(),
132+
$analyserResult->getUsedTraitDependencies(),
132133
$analyserResult->getExportedNodes(),
133134
$analyserResult->hasReachedInternalErrorsCountLimit(),
134135
$analyserResult->getPeakMemoryUsageBytes(),
@@ -147,6 +148,7 @@ private function mergeFilteredPhpErrors(AnalyserResult $analyserResult): Analyse
147148
$analyserResult->getInternalErrors(),
148149
$analyserResult->getCollectedData(),
149150
$analyserResult->getDependencies(),
151+
$analyserResult->getUsedTraitDependencies(),
150152
$analyserResult->getExportedNodes(),
151153
$analyserResult->hasReachedInternalErrorsCountLimit(),
152154
$analyserResult->getPeakMemoryUsageBytes(),
@@ -210,6 +212,7 @@ private function addUnmatchedIgnoredErrors(
210212
$analyserResult->getInternalErrors(),
211213
$analyserResult->getCollectedData(),
212214
$analyserResult->getDependencies(),
215+
$analyserResult->getUsedTraitDependencies(),
213216
$analyserResult->getExportedNodes(),
214217
$analyserResult->hasReachedInternalErrorsCountLimit(),
215218
$analyserResult->getPeakMemoryUsageBytes(),

‎src/Analyser/FileAnalyser.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use PHPStan\Collectors\Registry as CollectorRegistry;
1212
use PHPStan\Dependency\DependencyResolver;
1313
use PHPStan\Node\FileNode;
14+
use PHPStan\Node\InClassNode;
1415
use PHPStan\Node\InTraitNode;
1516
use PHPStan\Parser\Parser;
1617
use PHPStan\Parser\ParserErrorsException;
@@ -78,6 +79,7 @@ public function analyseFile(
7879
$fileCollectedData = [];
7980

8081
$fileDependencies = [];
82+
$usedTraitFileDependencies = [];
8183
$exportedNodes = [];
8284
$linesToIgnore = [];
8385
$unmatchedLineIgnores = [];
@@ -87,7 +89,7 @@ public function analyseFile(
8789
$parserNodes = $this->parser->parseFile($file);
8890
$linesToIgnore = $unmatchedLineIgnores = [$file => $this->getLinesToIgnoreFromTokens($parserNodes)];
8991
$temporaryFileErrors = [];
90-
$nodeCallback = function (Node $node, Scope $scope) use (&$fileErrors, &$fileCollectedData, &$fileDependencies, &$exportedNodes, $file, $ruleRegistry, $collectorRegistry, $outerNodeCallback, $analysedFiles, &$linesToIgnore, &$unmatchedLineIgnores, &$temporaryFileErrors): void {
92+
$nodeCallback = function (Node $node, Scope $scope) use (&$fileErrors, &$fileCollectedData, &$fileDependencies, &$usedTraitFileDependencies, &$exportedNodes, $file, $ruleRegistry, $collectorRegistry, $outerNodeCallback, $analysedFiles, &$linesToIgnore, &$unmatchedLineIgnores, &$temporaryFileErrors): void {
9193
if ($node instanceof Node\Stmt\Trait_) {
9294
foreach (array_keys($linesToIgnore[$file] ?? []) as $lineToIgnore) {
9395
if ($lineToIgnore < $node->getStartLine() || $lineToIgnore > $node->getEndLine()) {
@@ -205,6 +207,15 @@ public function analyseFile(
205207
} catch (UnableToCompileNode) {
206208
// pass
207209
}
210+
211+
if (!$node instanceof InClassNode) {
212+
return;
213+
}
214+
215+
$usedTraitDependencies = $this->dependencyResolver->resolveUsedTraitDependencies($node);
216+
foreach ($usedTraitDependencies->getFileDependencies($scope->getFile(), $analysedFiles) as $dependentFile) {
217+
$usedTraitFileDependencies[] = $dependentFile;
218+
}
208219
};
209220

210221
$scope = $this->scopeFactory->create(ScopeContext::create($file));
@@ -287,6 +298,7 @@ public function analyseFile(
287298
$locallyIgnoredErrors,
288299
$fileCollectedData,
289300
array_values(array_unique($fileDependencies)),
301+
array_values(array_unique($usedTraitFileDependencies)),
290302
$exportedNodes,
291303
$linesToIgnore,
292304
$unmatchedLineIgnores,

‎src/Analyser/FileAnalyserResult.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ final class FileAnalyserResult
1818
* @param list<Error> $locallyIgnoredErrors
1919
* @param list<CollectedData> $collectedData
2020
* @param list<string> $dependencies
21+
* @param list<string> $usedTraitDependencies
2122
* @param list<RootExportedNode> $exportedNodes
2223
* @param LinesToIgnore $linesToIgnore
2324
* @param LinesToIgnore $unmatchedLineIgnores
@@ -29,6 +30,7 @@ public function __construct(
2930
private array $locallyIgnoredErrors,
3031
private array $collectedData,
3132
private array $dependencies,
33+
private array $usedTraitDependencies,
3234
private array $exportedNodes,
3335
private array $linesToIgnore,
3436
private array $unmatchedLineIgnores,
@@ -84,6 +86,14 @@ public function getDependencies(): array
8486
return $this->dependencies;
8587
}
8688

89+
/**
90+
* @return list<string>
91+
*/
92+
public function getUsedTraitDependencies(): array
93+
{
94+
return $this->usedTraitDependencies;
95+
}
96+
8797
/**
8898
* @return list<RootExportedNode>
8999
*/

‎src/Analyser/ResultCache/ResultCache.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ final class ResultCache
2222
* @param array<string, LinesToIgnore> $unmatchedLineIgnores
2323
* @param array<string, array<CollectedData>> $collectedData
2424
* @param array<string, array<string>> $dependencies
25+
* @param array<string, array<string>> $usedTraitDependencies
2526
* @param array<string, array<RootExportedNode>> $exportedNodes
2627
* @param array<string, array{string, bool, string}> $projectExtensionFiles
2728
* @param array<string, string> $currentFileHashes
@@ -37,6 +38,7 @@ public function __construct(
3738
private array $unmatchedLineIgnores,
3839
private array $collectedData,
3940
private array $dependencies,
41+
private array $usedTraitDependencies,
4042
private array $exportedNodes,
4143
private array $projectExtensionFiles,
4244
private array $currentFileHashes,
@@ -118,6 +120,14 @@ public function getDependencies(): array
118120
return $this->dependencies;
119121
}
120122

123+
/**
124+
* @return array<string, array<string>>
125+
*/
126+
public function getUsedTraitDependencies(): array
127+
{
128+
return $this->usedTraitDependencies;
129+
}
130+
121131
/**
122132
* @return array<string, array<RootExportedNode>>
123133
*/

0 commit comments

Comments
 (0)