Skip to content

[CodeQuality][Performance] Reduce repetitive NodeTypeResolver->getType() on ExprBoolCaster #4279

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

[CodeQuality][Performance] Reduce repetitive NodeTypeResolver->getType() on ExprBoolCaster #4279

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
13 changes: 7 additions & 6 deletions rules/CodeQuality/NodeManipulator/ExprBoolCaster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
use PhpParser\Node\Expr\BinaryOp\NotIdentical;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Expr\Cast\Bool_;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use PHPStan\Type\UnionType;
use Rector\Core\PhpParser\Node\NodeFactory;
use Rector\NodeTypeResolver\NodeTypeResolver;
Expand All @@ -27,15 +29,15 @@ public function __construct(

public function boolCastOrNullCompareIfNeeded(Expr $expr): Expr
{
if (! $this->nodeTypeResolver->isNullableType($expr)) {
if (! $this->isBoolCastNeeded($expr)) {
$exprStaticType = $this->nodeTypeResolver->getType($expr);
if (! TypeCombinator::containsNull($exprStaticType)) {
if (! $this->isBoolCastNeeded($expr, $exprStaticType)) {
return $expr;
}

return new Bool_($expr);
}

$exprStaticType = $this->nodeTypeResolver->getType($expr);
// if we remove null type, still has to be trueable
if ($exprStaticType instanceof UnionType) {
$unionTypeWithoutNullType = $this->typeUnwrapper->removeNullTypeFromUnionType($exprStaticType);
Expand All @@ -46,20 +48,19 @@ public function boolCastOrNullCompareIfNeeded(Expr $expr): Expr
return new NotIdentical($expr, $this->nodeFactory->createNull());
}

if (! $this->isBoolCastNeeded($expr)) {
if (! $this->isBoolCastNeeded($expr, $exprStaticType)) {
return $expr;
}

return new Bool_($expr);
}

private function isBoolCastNeeded(Expr $expr): bool
private function isBoolCastNeeded(Expr $expr, Type $exprType): bool
{
if ($expr instanceof BooleanNot) {
return false;
}

$exprType = $this->nodeTypeResolver->getType($expr);
if ($exprType->isBoolean()->yes()) {
return false;
}
Expand Down