Cyclomatic complexity updates and fixes #3495
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
added 3 commits
December 3, 2021 15:49
…le loop This is a bugfix for Issue squizlabs#3468, which identified that the count was being incremented twice when calculating the score because the sniff was checking for both the T_DO and the terminating T_WHILE tokens, incrementing CYC by two (once for each token) in the do/while loop, rather than just by one (as it should). Code in the unit test .inc file has ben modified to reflect this change, and the test php file has also been modified to reflect the change in error line numbers.
…into CyclomaticComplexity calculation This is for Issue squizlabs#3469, which identified that these operators were not being included in the count, when they should have been (treated as an if/else condition). Unit tests provided.
This is for Issue squizlabs#3472, which identified that match() was not being included in the count, when it should have been (similar to a switch statement). There is no need to add one for the T_MATCH_DEFAULT token, because this is always followed by a T_MATCH_ARROW token, and to do so would be to double-count that entry. Unit tests provided.
This was referenced Dec 3, 2021
Closed
gsherwood
added a commit
that referenced
this pull request
Dec 6, 2021
gsherwood
added a commit
that referenced
this pull request
Dec 6, 2021
|
Thanks a lot for these fixes, and thanks for merging those three PRs and sorting out the test file changes. This will be released in version 3.6.2. |
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.
Resolve 3 issues with the Cyclometric Complexity sniff
do/while loops are double-counted in the Generic.Metrics.CyclomaticComplexity sniff
Ternary Operator and Null Coalescing Operator are not counted in the Generic.Metrics.CyclomaticComplexity sniff
PHP 8 match() expression is not counted in the Generic.Metrics.CyclomaticComplexity sniff
This PR replaces PR #3470, PR #3471 and PR #3473