Skip to content

FileAnalyser: Move repetitive work out of hot loop #4758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ondrejmirtes merged 3 commits into from
Jan 15, 2026
+3 −2
Merged

FileAnalyser: Move repetitive work out of hot loop #4758

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46bcfe6
FileAnalyser: Move repetative work out of hot loop
staabm Jan 14, 2026
30039af
Update FileAnalyser.php
staabm Jan 14, 2026
6f0f7d3
Update FileAnalyser.php
staabm Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Analyser/FileAnalyser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ public function analyseFile(
$this->collectErrors($analysedFiles);
$parserNodes = $this->parser->parseFile($file);
$linesToIgnore = $unmatchedLineIgnores = [$file => $this->getLinesToIgnoreFromTokens($parserNodes)];
$ignoreErrorExtensions = $this->ignoreErrorExtensionProvider->getExtensions();
$temporaryFileErrors = [];
$nodeCallback = function (Node $node, $scope, int $callbackInvocationNumber) use (&$fileErrors, &$fileCollectedData, &$fileDependencies, &$usedTraitFileDependencies, &$exportedNodes, $file, $ruleRegistry, $collectorRegistry, $outerNodeCallback, $analysedFiles, &$linesToIgnore, &$unmatchedLineIgnores, &$temporaryFileErrors, $parserNodes): void {
$nodeCallback = function (Node $node, $scope, int $callbackInvocationNumber) use (&$fileErrors, &$fileCollectedData, &$fileDependencies, &$usedTraitFileDependencies, &$exportedNodes, $file, $ruleRegistry, $collectorRegistry, $outerNodeCallback, $analysedFiles, &$linesToIgnore, &$unmatchedLineIgnores, &$temporaryFileErrors, $parserNodes, $ignoreErrorExtensions): void {
/** @var Scope&NodeCallbackInvoker $scope */
if ($node instanceof Node\Stmt\Trait_) {
foreach (array_keys($linesToIgnore[$file] ?? []) as $lineToIgnore) {
Expand Down Expand Up @@ -171,7 +172,7 @@ public function analyseFile(
$error = $this->ruleErrorTransformer->transform($ruleError, $scope, $parserNodes, $node);

if ($error->canBeIgnored()) {
foreach ($this->ignoreErrorExtensionProvider->getExtensions() as $ignoreErrorExtension) {
Copy link
Contributor Author

@staabm staabm Jan 14, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this method was invoked once for every error found

Copy link
Member

@ondrejmirtes ondrejmirtes Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could make sense to move it completely out of the callback and just use its variable? Maybe measure the memory difference.

Copy link
Contributor Author

@staabm staabm Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot see a measurable improvement, even though this loop callback is invoked 800.000 times

foreach ($ignoreErrorExtensions as $ignoreErrorExtension) {
if ($ignoreErrorExtension->shouldIgnore($error, $node, $scope)) {
continue 2;
}
Expand Down
Loading