Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Walk ancestors for stub method PHPDoc on built-in classes without their own stub entries #5695

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 6 commits into from
May 18, 2026
Merged

Walk ancestors for stub method PHPDoc on built-in classes without their own stub entries #5695

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f09d18f
Walk ancestors for stub method PHPDoc on built-in classes without the…
phpstan-bot May 18, 2026
eb432f0
Put cheaper isBuiltin() check before isKnownClass() lookup
phpstan-bot May 18, 2026
04c5ee1
Skip ancestor stubs with template types for non-stub built-in classes
phpstan-bot May 18, 2026
86e71f6
Skip generic ancestor interfaces instead of inspecting PHPDoc for tem…
phpstan-bot May 18, 2026
f703d02
Add NSRT regression test for built-in classes with generic ancestors
phpstan-bot May 18, 2026
3cda671
Apply suggestion from @ondrejmirtes
ondrejmirtes May 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
Prev Previous commit
Next Next commit
Skip ancestor stubs with template types for non-stub built-in classes 
The isBuiltin() guard allowed all built-in classes to walk ancestors for
stub PHPDocs. This caused classes like SplFileObject to pick up
Iterator::key()'s @return TKey which resolves to mixed, overriding
more specific signature map types (e.g. int).

Now the ancestor walk skips stubs whose param/return types contain
template types when the declaring class is not in the stub system.
This preserves the DateTimeInterface::diff() fix (concrete types)
while avoiding regressions for Iterator/ArrayAccess/CachingIterator.

Co-Authored-By: Claude Opus 4.6 <[email protected]>
  • Loading branch information
@phpstan-bot @claude
phpstan-bot and claude committed May 18, 2026
commit 04c5ee133c8fb800ab925efa005fd43329e76063
22 changes: 21 additions & 1 deletion src/Reflection/Php/PhpClassReflectionExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use PHPStan\Type\TypehintHelper;
use PHPStan\Type\TypeUtils;
use PHPStan\Type\UnionType;
use function array_key_exists;
use function array_keys;
Expand Down Expand Up @@ -1317,7 +1318,8 @@ private function findMethodPhpDocIncludingAncestors(
if ($resolved !== null) {
return [$resolved, $declaringClass];
}
if (!$declaringClass->isBuiltin() && !$this->stubPhpDocProvider->isKnownClass($declaringClassName)) {
$isKnownClass = $this->stubPhpDocProvider->isKnownClass($declaringClassName);
if (!$isKnownClass && !$declaringClass->isBuiltin()) {
return null;
}

Expand All @@ -1335,10 +1337,28 @@ private function findMethodPhpDocIncludingAncestors(
continue;
}

if (!$isKnownClass && $this->stubPhpDocContainsTemplateTypes($resolved)) {
continue;
}

return [$resolved, $ancestor];
}

return null;
}

private function stubPhpDocContainsTemplateTypes(ResolvedPhpDocBlock $phpDoc): bool
{
$returnTag = $phpDoc->getReturnTag();
if ($returnTag !== null && TypeUtils::containsTemplateType($returnTag->getType())) {
return true;
}
foreach ($phpDoc->getParamTags() as $paramTag) {
if (TypeUtils::containsTemplateType($paramTag->getType())) {
return true;
}
}
return false;
}

}
Loading