Skip to content

Commit 1299e4e

Browse files
committed
Fix conflicting rules
1 parent 0dbe7cb commit 1299e4e

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## v0.14.x
44

5+
### v0.14.1
6+
**Removed rules:**
7+
- PSR12.Files.FileHeader - conflicts with SlevomatCodingStandard.Namespaces.UseSpacing
8+
59
### v0.14.0
610
**Added rules:**
711
- SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator

Rules/Parts/phpcs-psr.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</rule>
1010
<rule ref="PSR12">
1111
<exclude name="PSR12.Traits.UseDeclaration.MultipleImport"/> <!-- Single use can import multiple traits -->
12-
<exclude name="PSR12.Files.FileHeader.SpacingAfterBlock"/> <!-- Handled more detailed by Slevomat rules -->
12+
<exclude name="PSR12.Files.FileHeader"/> <!-- Handled more detailed by Slevomat rules -->
1313
<exclude name="PSR12.Files.ImportStatement.LeadingSlash"/> <!-- Handled by Slevomat with fixer -->
1414
<exclude name="PSR12.Keywords.ShortFormTypeKeywords.LongFound"/> <!-- Handled more detailed with Slevomat -->
1515
</rule>

SniffsList.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# All used sniffs
22

3-
### Generic (43 sniffs)
3+
### Generic (42 sniffs)
44
- Generic.Arrays.ArrayIndent
55
- Generic.Arrays.DisallowLongArraySyntax
66
- Generic.Classes.DuplicateClassName
@@ -56,14 +56,13 @@
5656
- PSR1.Files.SideEffects
5757
- PSR1.Methods.CamelCapsMethodName
5858

59-
### PSR12 (16 sniffs)
59+
### PSR12 (15 sniffs)
6060
- PSR12.Classes.AnonClassDeclaration
6161
- PSR12.Classes.ClassInstantiation
6262
- PSR12.Classes.ClosingBrace
6363
- PSR12.ControlStructures.BooleanOperatorPlacement
6464
- PSR12.ControlStructures.ControlStructureSpacing
6565
- PSR12.Files.DeclareStatement
66-
- PSR12.Files.FileHeader
6766
- PSR12.Files.ImportStatement
6867
- PSR12.Files.OpenTag
6968
- PSR12.Functions.NullableTypeDeclaration
@@ -88,7 +87,7 @@
8887
- PSR2.Namespaces.NamespaceDeclaration
8988
- PSR2.Namespaces.UseDeclaration
9089

91-
### SlevomatCodingStandard (79 sniffs)
90+
### SlevomatCodingStandard (104 sniffs)
9291
- SlevomatCodingStandard.Arrays.DisallowImplicitArrayCreation
9392
- SlevomatCodingStandard.Arrays.MultiLineArrayEndBracketPlacement
9493
- SlevomatCodingStandard.Arrays.SingleLineArrayWhitespace

0 commit comments

Comments
 (0)