Skip to content

Commit

Permalink
Merge branch 'master' into phpcbf-function-all-fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeselander committed May 21, 2020
2 parents 3130612 + 96472e9 commit c11298b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- Updated VIPCS to 2.0.0 #151
- Updated DealerDirect to 0.6 #151
- Fix FunctionCallSignature inconsistency in phpcbf #200
- Allow for multiple variable assignments #201

### Removed:
- Remove `<file>` and `<basepath>` from ruleset #187
Expand Down
5 changes: 5 additions & 0 deletions HM/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,9 @@
<exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" />
</rule>

<!-- Allow multiple variable assignments, but only outside of conditionals -->
<rule ref="Squiz.PHP.DisallowMultipleAssignments">
<exclude name="Squiz.PHP.DisallowMultipleAssignments.Found" />
</rule>

</ruleset>

0 comments on commit c11298b

Please sign in to comment.