Add new rules from v7 of Slevomat rules

Author: arxeiss

CHANGELOG.md

@@ -1,7 +1,28 @@
 # Changelog
 
+## v0.8.x
+
+### v0.8.0
+
+> Requires Slevomat coding standards 7.0 or higher
+
+**Added rules:**
+ - SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator
+ - SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch
+ - SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration
+
+**Added strict rules:**
+ - SlevomatCodingStandard.TypeHints.UnionTypeHintFormat
+
+**Renamed rules:**
+ - SlevomatCodingStandard.Functions.TrailingCommaInCall into SlevomatCodingStandard.Functions.**Require**TrailingCommaInCall
+
 ## v0.7.x
 
+### v0.7.1
+
+Added support for PHP 8
+
 ### v0.7.0
 
 > Requires Slevomat coding standards 6.4 or higher

Rules/Parts/phpcs-slevomat.xml

@@ -54,13 +54,16 @@
         </properties>
     </rule>
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/> <!-- Use null coalesce ?? instead of ternary when possible -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator"/> <!-- Requires using ?-> operator -->
     <rule ref="SlevomatCodingStandard.Exceptions.DeadCatch"/> <!-- Check unreachable catch blocks -->
     <rule ref="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly"/> <!-- \Exception should be \Throwable -->
+    <rule ref="SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch"/> <!-- Require non-capturing catch when the variable with exception is not used. -->
     <rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration"/> <!-- Spacing around PHP 7.4 arrow functions -->
     <rule ref="SlevomatCodingStandard.Functions.DisallowEmptyFunction"/> <!-- Empty function must have a comment why is empty -->
     <rule ref="SlevomatCodingStandard.Functions.RequireMultiLineCall"/> <!-- Can fix when max line length of function call is exceeded -->
     <rule ref="SlevomatCodingStandard.Functions.StaticClosure"/> <!-- Use static closure if not using $this -->
-    <rule ref="SlevomatCodingStandard.Functions.TrailingCommaInCall"/> <!-- PHP 7.3+ add trailing comma in multiline function call -->
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/> <!-- PHP 7.3+ add trailing comma in multiline function call -->
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration"/> <!-- PHP 8.0+ add trailing comma in multiline function declaration -->
     <rule ref="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure"/> <!-- Check unused variable in use() for closure -->
     <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/> <!-- Namespace use sort alphabetically -->
     <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse"/> <!-- Group use namespaces declaration is disallowed -->

Rules/phpcs-strict.xml

@@ -59,7 +59,8 @@
     <rule ref="SlevomatCodingStandard.Operators.DisallowIncrementAndDecrementOperators"/> <!-- Disable use of $i++ must use $i += 1 etc.. -->
     <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"> <!-- File must have declare strict types with correct spacing -->
         <properties>
-            <property name="newlinesCountBetweenOpenTagAndDeclare" value="2"/>
+            <property name="linesCountBeforeDeclare" value="1"/>
+            <property name="linesCountAfterDeclare" value="1"/>
             <property name="spacesCountAroundEqualsSign" value="0"/>
         </properties>
     </rule>
@@ -80,6 +81,13 @@
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.UselessAnnotation">
         <severity>0</severity>
     </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat"> <!-- Checks format of union type hints -->
+        <properties>
+            <property name="withSpaces" value="false"/>
+            <property name="shortNullable" value="true"/>
+            <property name="nullPosition" value="last"/>
+        </properties>
+    </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint"/> <!-- Disable comments for constants -->
 
 </ruleset>

SniffsList.md

@@ -116,18 +116,21 @@
  - SlevomatCodingStandard.ControlStructures.RequireMultiLineCondition
  - SlevomatCodingStandard.ControlStructures.RequireMultiLineTernaryOperator
  - SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator
+ - SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator
  - SlevomatCodingStandard.ControlStructures.RequireShortTernaryOperator
  - SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition
  - SlevomatCodingStandard.ControlStructures.UselessIfConditionWithReturn
  - SlevomatCodingStandard.ControlStructures.UselessTernaryOperator
  - SlevomatCodingStandard.Exceptions.DeadCatch
  - SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly
+ - SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch
  - SlevomatCodingStandard.Functions.ArrowFunctionDeclaration
  - SlevomatCodingStandard.Functions.DisallowEmptyFunction
  - SlevomatCodingStandard.Functions.RequireMultiLineCall
  - SlevomatCodingStandard.Functions.RequireSingleLineCall
+ - SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration
  - SlevomatCodingStandard.Functions.StaticClosure
- - SlevomatCodingStandard.Functions.TrailingCommaInCall
+ - SlevomatCodingStandard.Functions.RequireTrailingCommaInCall
  - SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure
  - SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses
  - SlevomatCodingStandard.Namespaces.DisallowGroupUse
@@ -164,6 +167,7 @@
  - SlevomatCodingStandard.TypeHints.PropertyTypeHint
  - SlevomatCodingStandard.TypeHints.PropertyTypeHintSpacing
  - SlevomatCodingStandard.TypeHints.ReturnTypeHint
+ - SlevomatCodingStandard.TypeHints.UnionTypeHintFormat
  - SlevomatCodingStandard.TypeHints.UselessConstantTypeHint
  - SlevomatCodingStandard.Variables.DisallowSuperGlobalVariable
  - SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable

composer.json

@@ -12,6 +12,6 @@
     ],
     "require": {
     	"php": "^7.1 || ^8.0",
-        "slevomat/coding-standard": "^6.4.0"
+        "slevomat/coding-standard": "^7.0"
     }
 }

phpcs.example.xml

@@ -4,6 +4,8 @@
     <!-- Check folders -->
     <file>./app</file>
 
+    <config name="php_version" value="80000"/> <!-- Set target version, for 7.4 set to 70400 etc. -->
+
     <arg name="basepath" value="."/> <!-- Strip file basepath from report -->
     <arg name="colors"/> <!-- Show colors -->
     <arg value="p"/> <!-- Display progress in report -->
@@ -16,12 +18,23 @@
         <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedGlobalFunctions.NonFullyQualified"/>
 
         <!-- trailing comma in function call is supported in PHP 7.3 and above, exclude if needed -->
-        <exclude name="SlevomatCodingStandard.Functions.TrailingCommaInCall"/>
+        <exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
     </rule>
 
     <!-- Add set of strict rules if needed -->
     <!--
         <rule ref="./vendor/arxeiss/coding-standards/Rules/phpcs-strict.xml">
         </rule>
     -->
+
+    <!-- Bring back Useless Annotation errors, which are normally ignored -->
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.UselessAnnotation">
+        <severity>5</severity>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.UselessAnnotation">
+        <severity>5</severity>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.UselessAnnotation">
+        <severity>5</severity>
+    </rule>
 </ruleset>