Generic/InlineControlStructure: remove redundant condition#596
Merged
jrfnl merged 2 commits intoPHPCSStandards:masterfrom Sep 30, 2024
Merged
Conversation
Doing this to be able to create tests with syntax errors on separate files.
This commit removes a redundant condition that was added in fbea319 to support JS braceless do-while loops. A subsequent commit added similar code to support braceless do-while loops (plus for/while loops without body) for PHP, but it also works for JS (13c803b). There are a few syntax error cases that were handled by the code that is removed by this commit and are not handled by the code introduced in 13c803b. Without the removed code, they are now handled in a if condition right below. I added two tests with those cases to ensure the sniff continues working as expected.
11 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
As discussed in #482 (review) (see "Commit 4" and "Commit 5" sections), this PR removes a redundant condition that was added in fbea319 to support JS braceless do-while loops. A subsequent commit added a similar code to support braceless do-while loops (plus for/while loops without body) for PHP. The new code also works for JS (13c803b).
There are a few syntax error cases that were handled by the code that is removed by this commit and are not handled by the code introduced in 13c803b. Without the removed code, they are now handled in the if condition right below. I added two tests with those cases to ensure the sniff continues working as expected.
The PR also includes a separate commit to rename the JS test case file.
Related issues/external references
Originally discussed in #482 (review)
Types of changes
PR checklist