Skip to content
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.

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

Generic/InlineControlStructure: remove redundant condition #596

Conversation

rodrigoprimo
Copy link
Contributor

@rodrigoprimo rodrigoprimo commented Aug 15, 2024

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

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
    • This change is only breaking for integrators, not for external standards or end-users.
  • Documentation improvement

PR checklist

  • I have checked there is no other PR open for the same change.
  • I have read the Contribution Guidelines.
  • I grant the project the right to include and distribute the code under the BSD-3-Clause license (and I have the right to grant these rights).
  • I have added tests to cover my changes.
  • I have verified that the code complies with the projects coding standards.
  • [Required for new sniffs] I have added XML documentation for the sniff.

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.
Copy link
Member

@jrfnl jrfnl left a comment

Choose a reason for hiding this comment

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

Thanks @rodrigoprimo! LGTM.

@jrfnl jrfnl added this to the 3.11.0 milestone Sep 30, 2024
@jrfnl jrfnl merged commit 9168f53 into PHPCSStandards:master Sep 30, 2024
42 checks passed
@jrfnl jrfnl deleted the inline-control-structure-remove-redundant-condition branch September 30, 2024 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants