- Add PSR1, PS2, PSR12
- Adjust DeclareStrictTypes spacings
- Remove phpdoc rules (please keep your docs perfect anyway ;))
<rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace"/>
<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
<properties>
- <property name="newlinesCountBetweenOpenTagAndDeclare" value="1"/>
- <property name="newlinesCountAfterDeclare" value="1"/>
+ <property name="newlinesCountBetweenOpenTagAndDeclare" value="2"/>
+ <property name="newlinesCountAfterDeclare" value="2"/>
<property name="spacesCountAroundEqualsSign" value="1"/>
</properties>
</rule>
@@ -94,16 +94,13 @@
<rule ref="PEAR.NamingConventions.ValidClassName"/>
<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent"/>
<rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
- <rule ref="PSR1.Classes.ClassDeclaration"/>
- <rule ref="PSR1.Files.SideEffects"/>
- <rule ref="PSR2.ControlStructures.ControlStructureSpacing"/>
- <rule ref="PSR2.ControlStructures.ElseIfDeclaration"/>
- <rule ref="PSR2.Files.EndFileNewline"/>
- <rule ref="PSR2.Methods.MethodDeclaration"/>
- <rule ref="PSR2.Namespaces.NamespaceDeclaration"/>
- <rule ref="PSR2.Namespaces.UseDeclaration"/>
<rule ref="Squiz.Strings.DoubleQuoteUsage" />
- <rule ref="Squiz.PHP.DisallowMultipleAssignments"/>
+ <rule ref="Squiz.Strings.ConcatenationSpacing">
+ <properties>
+ <property name="spacing" value="1"/>
+ <property name="ignoreNewlines" value="true"/>
+ </properties>
+ </rule>
<rule ref="Squiz.PHP.DisallowSizeFunctionsInLoops"/>
<rule ref="Squiz.PHP.DiscouragedFunctions">
<properties>
@@ -141,6 +138,12 @@
<rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman.BraceOnSameLine">
<severity>0</severity>
</rule>
- <rule ref="PSR12.Keywords.ShortFormTypeKeywords"/>
- <rule ref="PSR12.Classes.ClassInstantiation"/>
+ <rule ref="PSR1"/>
+ <rule ref="PSR2">
+ <exclude name="PSR2.Classes.ClassDeclaration.CloseBraceAfterBody"/>
+ </rule>
+ <rule ref="PSR12">
+ <exclude name="PSR12.Files.DeclareStatement.SpaceFoundAfterDirective"/>
+ <exclude name="PSR12.Files.DeclareStatement.SpaceFoundBeforeDirectiveValue"/>
+ </rule>
</ruleset>