Skip to content
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

Simplify NodeGetAttributeTypeExtension #142

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Simplify NodeGetAttributeTypeExtension #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions src/ReturnTypeExtension/NodeGetAttributeTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,16 @@ public function getTypeFromMethodCall(
MethodReflection $methodReflection,
MethodCall $methodCall,
Scope $scope
): Type {
$returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
Copy link
Member

Choose a reason for hiding this comment

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

I think to keep 1 - 1 behaviour, selectFromArgs() should be used

$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants())->getReturnType();

Copy link
Contributor Author

Choose a reason for hiding this comment

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

when returning null PHPStan will use:

https://github.com/phpstan/phpstan-src/blob/e95f79b2a3fff1f749cdd6dc9eaab2d2600def1a/src/Analyser/MutatingScope.php#L5616-L5621

Copy link
Member

Choose a reason for hiding this comment

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

getReturnType() return PHPStan type afaik, it maybe missing test here, but allow return null is changing behavior here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

see https://phpstan.org/developing-extensions/dynamic-return-type-extensions

grafik

Copy link
Member

Choose a reason for hiding this comment

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

If I understand it correctly, it fallbacks to selectFromArgs() when null is returned.

LGTM 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

exactly


): ?Type {
$firstArg = $methodCall->getArgs()[0];

$argumentValue = $this->resolveArgumentValue($firstArg->value);
if ($argumentValue === null) {
return $returnType;
return null;
}

if (! isset(self::ARGUMENT_KEY_TO_RETURN_TYPE[$argumentValue])) {
return $returnType;
return null;
}

$knownReturnType = self::ARGUMENT_KEY_TO_RETURN_TYPE[$argumentValue];
Expand Down
Loading