Universal/DisallowFinalClass: various tweaks #163
Merged
Conversation
This file contains 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
When a class is declared as `abstract`, it would attempt to record both for the `abstract`, as well as the `not abstract, not final` metric. As a metric can only be recorded once per token, this didn't actually cause any issues, but it still made the code confusing. Fixed now.
As things were, the sniff would bow out if the opening brace for the class could not be found (yet) and would also not record the `final` metric in that case, even though for similar code using `abstract`, the metric _would_ be recorded. This commit ensures the `final` metric will now be recorded either way.
As things were, the sniff would bow out if the opening brace for the class could not be found (yet). This commit changes the sniff to act in more cases, i.e. it does require for a (non-empty) token after the `class` keyword, but once that token is found, the sniff will act. Includes minor changes to how the message text is build up to prevent weird code snippets being show in the message. Includes additional test.
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.
Universal/DisallowFinalClass: minor code tweak
When a class is declared as
abstract, it would attempt to record both for theabstract, as well as thenot abstract, not finalmetric.As a metric can only be recorded once per token, this didn't actually cause any issues, but it still made the code confusing. Fixed now.
Universal/DisallowFinalClass: make tests more descriptive
Universal/DisallowFinalClass: always record the metric
As things were, the sniff would bow out if the opening brace for the class could not be found (yet) and would also not record the
finalmetric in that case, even though for similar code usingabstract, the metric would be recorded.This commit ensures the
finalmetric will now be recorded either way.Universal/DisallowFinalClass: act on more cases
As things were, the sniff would bow out if the opening brace for the class could not be found (yet).
This commit changes the sniff to act in more cases, i.e. it does require for a (non-empty) token after the
classkeyword, but once that token is found, the sniff will act.Includes minor changes to how the message text is build up to prevent weird code snippets being show in the message.
Includes additional test.