Skip to content
/ rector-src Public

add support for boolean vs constant boolean type in UseIdenticalOverEqualWithSameTypeRector #7408

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
TomasVotruba merged 2 commits into from
Oct 3, 2025
Merged

add support for boolean vs constant boolean type in UseIdenticalOverEqualWithSameTypeRector #7408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9598ed8
add support for boolean vs constant boolean type
TomasVotruba Oct 3, 2025
4cf5c57
fixup! add support for boolean vs constant boolean type
TomasVotruba Oct 3, 2025
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
45 changes: 45 additions & 0 deletions ...ality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/Fixture/identical_bool.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

namespace Rector\Tests\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector\Fixture;

final class IdenticalBool
{
public function equal()
{
if ($this->getValue() == true) {
return 'yes';
}

return 'no';
}

private function getValue(): bool
{
return true;
}
}

?>
-----
<?php

namespace Rector\Tests\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector\Fixture;

final class IdenticalBool
{
public function equal()
{
if ($this->getValue() === true) {
return 'yes';
}

return 'no';
}

private function getValue(): bool
{
return true;
}
}

?>
45 changes: 45 additions & 0 deletions ...ity/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/Fixture/identical_string.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

namespace Rector\Tests\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector\Fixture;

final class IdenticalString
{
public function equal()
{
if ($this->getValue() == 'hi') {
return 'yes';
}

return 'no';
}

private function getValue(): string
{
return 'hello';
}
}

?>
-----
<?php

namespace Rector\Tests\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector\Fixture;

final class IdenticalString
{
public function equal()
{
if ($this->getValue() === 'hi') {
Copy link
Member

@samsonasik samsonasik Oct 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

this cause regression on numeric string "1", see https://3v4l.org/JEeP5

I will create PR to skip numeric string.

Copy link
Member

@samsonasik samsonasik Oct 3, 2025

Choose a reason for hiding this comment

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

I created PR:

to skip compare to numeric string.

Copy link
Member

@samsonasik samsonasik Oct 4, 2025

Choose a reason for hiding this comment

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

I found another regression that it cause invalid result on integer 0 vs false, see https://3v4l.org/Pp8Vr

Copy link
Member

@samsonasik samsonasik Oct 4, 2025

Choose a reason for hiding this comment

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

I created PR:

to skip compare to integer.

Copy link
Member

@samsonasik samsonasik Oct 4, 2025

Choose a reason for hiding this comment

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

I found another regression that it cause invalid result on float vs bool, see https://3v4l.org/I3GQS

Copy link
Member

@samsonasik samsonasik Oct 4, 2025

Choose a reason for hiding this comment

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

I created PR:

to skip compare to float.

Copy link
Member

@samsonasik samsonasik Oct 4, 2025

Choose a reason for hiding this comment

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

I found a better approach by using TypeComparator so the type are both normalized on equal check.

return 'yes';
}

return 'no';
}

private function getValue(): string
{
return 'hello';
}
}

?>
5 changes: 4 additions & 1 deletion rules/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use PhpParser\Node\Expr\BinaryOp\Identical;
use PhpParser\Node\Expr\BinaryOp\NotEqual;
use PhpParser\Node\Expr\BinaryOp\NotIdentical;
use PHPStan\Type\BooleanType;
use PHPStan\Type\MixedType;
use Rector\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
Expand Down Expand Up @@ -86,7 +87,9 @@ public function refactor(Node $node): ?Node
}

// different types
if (! $leftStaticType->equals($rightStaticType)) {
if (! $leftStaticType->equals(
$rightStaticType
) && (! $leftStaticType instanceof BooleanType && ! $rightStaticType instanceof BooleanType)) {
return null;
}

Expand Down