Skip to content

EnforceNativeReturnTypehintRule: minor cleanup #153

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
merged 1 commit into from
Sep 7, 2023
Merged

EnforceNativeReturnTypehintRule: minor cleanup #153

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
26 changes: 1 addition & 25 deletions src/Rule/EnforceNativeReturnTypehintRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@
namespace ShipMonk\PHPStan\Rule;

use Generator;
use LogicException;
use PhpParser\Node;
use PhpParser\Node\Stmt\Throw_;
use PHPStan\Analyser\Scope;
use PHPStan\Node\ClosureReturnStatementsNode;
use PHPStan\Node\FunctionReturnStatementsNode;
use PHPStan\Node\MethodReturnStatementsNode;
use PHPStan\Node\ReturnStatementsNode;
use PHPStan\Php\PhpVersion;
use PHPStan\Rules\Rule;
Expand Down Expand Up @@ -74,7 +70,7 @@ public function processNode(Node $node, Scope $scope): array
return [];
}

if ($this->hasNativeReturnTypehint($node)) {
if ($node->hasNativeReturnTypehint()) {
return [];
}

Expand Down Expand Up @@ -202,26 +198,6 @@ private function getTypeOfReturnStatements(ReturnStatementsNode $node): Type
return TypeCombinator::union(...$types);
}

/**
* To be removed once we bump phpstan version to 1.9.5+ (https://github.com/phpstan/phpstan-src/pull/2141)
*/
private function hasNativeReturnTypehint(ReturnStatementsNode $node): bool
{
if ($node instanceof MethodReturnStatementsNode) { // @phpstan-ignore-line ignore bc warning
return $node->hasNativeReturnTypehint();
}

if ($node instanceof FunctionReturnStatementsNode) { // @phpstan-ignore-line ignore bc warning
return $node->hasNativeReturnTypehint();
}

if ($node instanceof ClosureReturnStatementsNode) { // @phpstan-ignore-line ignore bc warning
return $node->getClosureExpr()->returnType !== null;
}

throw new LogicException('Unexpected subtype');
}

private function getPhpDocReturnType(Node $node, Scope $scope): ?Type
{
$docComment = $node->getDocComment();
Expand Down