[DeadCode] Add RemoveDeadIfBlocksRector #7528
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Removes ifs, elseifs, and elses with no body.
Combines them with others when appropriate.
```diff
class RemoveDeadIfBlock
{
public function run($condition)
{
- if ($value) {
- } elseif ($differentValue) {
- if ($differentValue) {
- } else {
- }
-
if ($differentValue) {
echo 'different';
- } elseif ($value) {
- } else {
}
- if ($differentValue) {
- } elseif ($value) {
+ if (!$differentValue && $value) {
echo 'value';
} else {
}
return $differentValue;
}
}
```
We avoid merging `if`` into following conditions
when the `if` itself has a comment, because we
can't tell if the comment will still be correct for
the negated condition.
At first, I tried adding logic to
RemoveDeadIfForeachForRector to remove elseifs
and elses. That worked, but as I added code it
was clunky to have so much unrelated `if` logic
in `for` and `foreach` rector. So I moved it to
a brand new rector with a simpler implementation.
I borrowed significant code from
RemoveAlwaysTrueIfConditionRector as well.
This can serve as support for smarter rectors
like "RemoveAlwaysTrueIf" and my WIP
"RemoveAlwaysFalseIf". Properly modifying `if`s
requires a lot of extra logic that complicates
the implementation of those rectors. In the
future, they can do something simpler like
removing the body statements but leaving the if
structure in place. Then this rector can perform
the restructuring of the if.
I accidentally put an && ! condition rather than an ||, causing elseifs with skippable exprs to get removed rather than being skipped. - Fix the conditional - Add a test for skippable exprs in elseif condition.
john-shaffer
force-pushed
the
add-remove-dead-if-blocks-rector
branch
from
3e2a8d0 to
13e2191
Compare
samsonasik
reviewed
Oct 24, 2025
| } | ||
|
|
||
| if (5 + 10) { | ||
| } |
Member
There was a problem hiding this comment.
Looks good 👍
Can you add also test fixture with a method call? E.g. if ($this->someCall())
It should be skipped as possible side effect.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes ifs, elseifs, and elses with no body. Combines them with others when appropriate.
class RemoveDeadIfBlock { public function run($condition) { - if ($value) { - } elseif ($differentValue) { - if ($differentValue) { - } else { - } - if ($differentValue) { echo 'different'; - } elseif ($value) { - } else { } - if ($differentValue) { - } elseif ($value) { + if (!$differentValue && $value) { echo 'value'; - } else { } return $differentValue; } }We avoid merging
ifinto following conditions when theifitself has a comment, because we can't tell if the comment will still be correct for the negated condition.At first, I tried adding logic to RemoveDeadIfForeachForRector to remove elseifs and elses. That worked, but as I added code it was clunky to have so much unrelated
iflogic in aforandforeachrector. So I moved it to a brand new rector with a simpler implementation. I borrowed significant code from RemoveAlwaysTrueIfConditionRector as well.This can serve as support for smarter rectors like "RemoveAlwaysTrueIf" and my WIP "RemoveAlwaysFalseIf". Properly modifying
ifs requires a lot of extra logic that complicates the implementation of those rectors. In the future, they can do something simpler like removing the body statements but leaving the if structure in place. Then this rector can perform the restructuring of the if.