Skip to content

Commit

Permalink
Merge branch 'fix/#33-bump-phpcs-dependency-to-revert-regressions' in…
Browse files Browse the repository at this point in the history
…to 3.x

Close #33
  • Loading branch information
Ocramius committed Mar 3, 2018
2 parents 2f3a075 + 289c79b commit b2b6d2b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"require": {
"php": "^7.1",
"squizlabs/php_codesniffer": "^3.2",
"squizlabs/php_codesniffer": "^3.2.3",
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.2",
"slevomat/coding-standard": "^4.4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Forbid empty statements -->
<rule ref="Generic.CodeAnalysis.EmptyStatement">
<!-- But allow empty catch -->
<exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH"/>
<exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedCatch"/>
</rule>
<!-- Forbid final methods in final classes -->
<rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
Expand Down

0 comments on commit b2b6d2b

Please sign in to comment.