Skip to content

Fix recursion condition in alias resolution #65

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
allestuetsmerweh merged 3 commits into from
Aug 18, 2026
Merged

Fix recursion condition in alias resolution #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d3b455
Fix recursion condition in alias resolution
allestuetsmerweh Aug 18, 2026
333a632
Update error message for recursion level in tests
allestuetsmerweh Aug 18, 2026
fece778
Update test assertion message for InfiniteLoop alias
allestuetsmerweh Aug 18, 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
4 changes: 2 additions & 2 deletions server/lib/PhpStan/PhpStanUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public function resolveType(Node $node, string $class_name, ?array $generic_args
// Resolve ImportAlias
$namespace = null;
for ($i = 0; isset($alias['namespace']); $i++) {
if ($i > $this->max_recursion) {
throw new \Exception("Maximum recusion level ({$this->max_recursion}) reached: Failed importing {$alias['name']} from {$alias['namespace']}");
if ($i >= $this->max_recursion) {
throw new \Exception("Maximum recusion level ({$this->max_recursion}) reached while resolving alias {$alias['name']} from {$alias['namespace']}");
}
$namespace = $alias['namespace'];
$alias = $this->resolveImportAlias($alias);
Expand Down
2 changes: 1 addition & 1 deletion server/tests/UnitTests/PhpStan/PhpStanUtilsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public function testResolveTypeInfiniteLoop(): void {
FakeLoop2::class => true,
], $utils->testOnlyGetAliasCacheKeys());
$this->assertSame(
'Maximum recusion level (100) reached: Failed importing InfiniteLoop from PhpTypeScriptApi\Tests\UnitTests\PhpStan\FakeLoop1',
'Maximum recusion level (100) reached while resolving alias InfiniteLoop from PhpTypeScriptApi\Tests\UnitTests\PhpStan\FakeLoop2',
$th->getMessage(),
);
}
Expand Down
Loading