Skip to content

Commit 6c36f3d

Browse files
BafSBafS
committed
Update slevomat to v5, add rules
Added rules: UselessParentheses, UseSpacing, RequireOneNamespaceInFile, UseFromSameNamespace, UselessAlias, SpreadOperatorSpacing, DisallowContinueWithoutIntegerOperandInSwitch
1 parent 0a715f9 commit 6c36f3d

File tree

3 files changed

+52
-32
lines changed

3 files changed

+52
-32
lines changed

‎Proton/ruleset.xml‎

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<exclude-pattern>*</exclude-pattern>
1111
</rule>
1212
<rule ref="PSR12.Namespaces.CompoundNamespaceDepth"/>
13-
<rule ref="PSR12.Functions.NullableTypeDeclaration" />
13+
<rule ref="PSR12.Functions.NullableTypeDeclaration"/>
1414

1515
<rule ref="Generic.Commenting.Todo"/>
1616
<rule ref="Generic.PHP.LowerCaseKeyword"/>
@@ -20,9 +20,9 @@
2020
<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
2121
<rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
2222
<rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
23-
<rule ref="Generic.CodeAnalysis.EmptyPHPStatement" />
24-
<rule ref="Generic.Classes.DuplicateClassName" />
25-
<rule ref="Generic.WhiteSpace.IncrementDecrementSpacing" />
23+
<rule ref="Generic.CodeAnalysis.EmptyPHPStatement"/>
24+
<rule ref="Generic.Classes.DuplicateClassName"/>
25+
<rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
2626
<rule ref="Generic.VersionControl.GitMergeConflict" />
2727

2828
<!-- All PHP files MUST use the Unix LF (linefeed) line ending only. -->
@@ -64,8 +64,8 @@
6464

6565
<rule ref="Generic.Metrics.NestingLevel">
6666
<properties>
67-
<property name="nestingLevel" value="5" />
68-
<property name="absoluteNestingLevel" value="10" />
67+
<property name="nestingLevel" value="5"/>
68+
<property name="absoluteNestingLevel" value="10"/>
6969
</properties>
7070
</rule>
7171

@@ -83,49 +83,65 @@
8383
<!-- https://github.com/slevomat/coding-standard -->
8484
<config name="installed_paths" value="../../slevomat/coding-standard"/>
8585

86-
<rule ref="SlevomatCodingStandard.Classes.UselessLateStaticBinding"/>
87-
<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
86+
<rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
87+
<rule ref="SlevomatCodingStandard.PHP.ShortList"/>
88+
<rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
89+
<rule ref="SlevomatCodingStandard.PHP.UselessParentheses">
90+
<properties>
91+
<property name="ignoreComplexTernaryConditions" value="1"/>
92+
</properties>
93+
</rule>
8894
<rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements"/>
89-
<rule ref="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure"/>
95+
<rule ref="SlevomatCodingStandard.Classes.UselessLateStaticBinding"/>
96+
<rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
97+
<rule ref="SlevomatCodingStandard.Classes.EmptyLinesAroundClassBraces">
98+
<properties>
99+
<property name="linesCountAfterOpeningBrace" value="0"/>
100+
<property name="linesCountBeforeClosingBrace" value="0"/>
101+
</properties>
102+
</rule>
90103
<rule ref="SlevomatCodingStandard.Functions.UselessParameterDefaultValue"/>
91-
<rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
92-
<rule ref="SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable"/>
93104
<rule ref="SlevomatCodingStandard.Variables.UselessVariable"/>
105+
<rule ref="SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable"/>
106+
<rule ref="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure"/>
94107
<rule ref="SlevomatCodingStandard.Exceptions.DeadCatch"/>
95-
<rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
96-
<rule ref="SlevomatCodingStandard.Namespaces.NamespaceDeclaration"/>
108+
<rule ref="SlevomatCodingStandard.Namespaces.UseSpacing"/>
109+
<rule ref="SlevomatCodingStandard.Namespaces.UselessAlias"/>
97110
<rule ref="SlevomatCodingStandard.Namespaces.NamespaceSpacing"/>
111+
<rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace"/>
112+
<rule ref="SlevomatCodingStandard.Namespaces.NamespaceDeclaration"/>
113+
<rule ref="SlevomatCodingStandard.Namespaces.RequireOneNamespaceInFile"/>
114+
<rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash"/>
98115
<rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
99-
<rule ref="SlevomatCodingStandard.PHP.ShortList"/>
100-
<rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
101116
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing"/>
102117
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing"/>
103-
<rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash"/>
104-
<rule ref="SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces">
118+
<rule ref="SlevomatCodingStandard.Commenting.ForbiddenComments"/>
119+
<rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration"/>
120+
<rule ref="SlevomatCodingStandard.Operators.SpreadOperatorSpacing">
105121
<properties>
106-
<property name="linesCountAfterOpeningBrace" value="0" />
107-
<property name="linesCountBeforeClosingBrace" value="0" />
122+
<property name="spacesCountAfterOperator" value="0" />
108123
</properties>
109124
</rule>
110-
<rule ref="SlevomatCodingStandard.Commenting.ForbiddenComments"/>
111-
<rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration"/>
112-
<rule ref="SlevomatCodingStandard.ControlStructures.UselessConditionWithReturn"/>
125+
<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
126+
<rule ref="SlevomatCodingStandard.ControlStructures.UselessTernaryOperator"/>
127+
<rule ref="SlevomatCodingStandard.ControlStructures.UselessIfConditionWithReturn"/>
128+
<rule ref="SlevomatCodingStandard.ControlStructures.DisallowContinueWithoutIntegerOperandInSwitch"/>
113129

130+
<!-- <rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit">
131+
<properties>
132+
<property name="ignoreStandaloneIfInScope" value="0" />
133+
</properties>
134+
</rule> -->
114135
<!--<rule ref="SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator"/>-->
115136
<!--<rule ref="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>-->
116-
<!--<rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/>-->
117-
<!--<rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace"/>-->
118-
<!--<rule ref="SlevomatCodingStandard.Namespaces.UnusedUses"/>-->
137+
<!-- <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/> -->
138+
<!-- <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses"/> -->
119139
<!--<rule ref="SlevomatCodingStandard.Functions.UnusedParameter"/>-->
120-
<!--<rule ref="SlevomatCodingStandard.ControlStructures.DisallowContinueWithoutIntegerOperandInSwitch"/>-->
121-
140+
122141
<!--
123142
If you want to completely disable an error message in a sniff
124143
but you don't want to exclude the whole sniff, you can
125-
change the severity of the message to 0. In this case, we
126-
want the Squiz DoubleQuoteUsage sniff to be included in our
127-
standard, but we don't want the ContainsVar error message to
128-
ever be displayed.
144+
change the severity of the message to 0.
129145
-->
130146
<rule ref="Squiz.PHP.CommentedOutCode">
131147
<severity>1</severity>

‎Readme.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Proton PHP Coding Standards
22

3+
![PHP from Packagist](https://img.shields.io/packagist/php-v/protonlabs/php-coding-standard.svg?style=flat-square)
4+
![Packagist Version](https://img.shields.io/packagist/v/protonlabs/php-coding-standard.svg?style=flat-square)
5+
36
## Installation & Usage
47

58
Install the package with composer
@@ -16,6 +19,7 @@ To use it in your phpcs xml, add a rule pointing to the ruleset.xml
1619
<!-- Proton Coding Standard – https://github.com/ProtonMail/php-coding-standard -->
1720
<rule ref="vendor/protonlabs/php-coding-standard/Proton/ruleset.xml">
1821
<!-- sniffs to exclude -->
22+
<!-- <exclude name="SlevomatCodingStandard.PHP.UselessParentheses"/> -->
1923
</rule>
2024

2125
<exclude-pattern>*/vendor/*</exclude-pattern>

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"prefer-stable": true,
1111
"require": {
1212
"php": "^7.1",
13-
"slevomat/coding-standard": "^4.8",
13+
"slevomat/coding-standard": "^5.0",
1414
"squizlabs/php_codesniffer": "^3.4"
1515
},
1616
"license": "MIT"

0 commit comments

Comments
 (0)