Merge pull request #109 from Majkl578/slevomat-cs-5.0

Upgrade to Slevomat CS 5.0

Author: lcobucci

composer.json

@@ -28,7 +28,7 @@
     "require": {
         "php": "^7.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-        "slevomat/coding-standard": "^4.8.6",
+        "slevomat/coding-standard": "^5.0",
         "squizlabs/php_codesniffer": "^3.4.0"
     },
     "config": {

lib/Doctrine/ruleset.xml

@@ -106,6 +106,13 @@
             <property name="fixable" value="true"/>
         </properties>
     </rule>
+    <!-- Forbid empty lines around type declarations -->
+    <rule ref="SlevomatCodingStandard.Classes.EmptyLinesAroundClassBraces">
+        <properties>
+            <property name="linesCountAfterOpeningBrace" value="0"/>
+            <property name="linesCountBeforeClosingBrace" value="0"/>
+        </properties>
+    </rule>
     <!-- Require usage of ::class instead of __CLASS__, get_class(), get_class($this), get_called_class() and get_parent_class() -->
     <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
     <!-- Forbid uses of multiple traits separated by comma -->
@@ -193,8 +200,6 @@
     <rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
     <!-- Forbid fancy yoda conditions -->
     <rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison"/>
-    <!-- Forbid weak comparisons -->
-    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
     <!-- Require usage of early exit -->
     <rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
     <!-- Require language constructs without parentheses -->
@@ -204,7 +209,9 @@
     <!-- Require usage of null coalesce operator when possible -->
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
     <!-- Forbid usage of conditions when a simple return can be used -->
-    <rule ref="SlevomatCodingStandard.ControlStructures.UselessConditionWithReturn"/>
+    <rule ref="SlevomatCodingStandard.ControlStructures.UselessIfConditionWithReturn"/>
+    <!-- Forbid usage of boolean-only ternary operator usage (e.g. $foo ? true : false) -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.UselessTernaryOperator"/>
     <!-- Forbid useless unreachable catch blocks -->
     <rule ref="SlevomatCodingStandard.Exceptions.DeadCatch"/>
     <!-- Require using Throwable instead of Exception -->
@@ -214,7 +221,11 @@
     <!-- Forbid unused variables passed to closures via `use` -->
     <rule ref="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure"/>
     <!-- Require use statements to be alphabetically sorted -->
-    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
+        <properties>
+            <property name="psr12Compatible" value="false"/>
+        </properties>
+    </rule>
     <!-- Forbid fancy group uses -->
     <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse"/>
     <!-- Forbid multiple use statements on same line -->
@@ -255,6 +266,8 @@
     </rule>
     <!-- Forbid useless alias for classes, constants and functions -->
     <rule ref="SlevomatCodingStandard.Namespaces.UselessAlias"/>
+    <!-- Forbid weak comparisons -->
+    <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
     <!-- Require the usage of assignment operators, eg `+=`, `.=` when possible -->
     <rule ref="SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator"/>
     <!-- forbid argument unpacking for functions specialized by PHP VM -->
@@ -312,13 +325,6 @@
     </rule>
     <!-- Forbid useless @var for constants -->
     <rule ref="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint"/>
-    <!-- Forbid empty lines around type declarations -->
-    <rule ref="SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces">
-        <properties>
-            <property name="linesCountAfterOpeningBrace" value="0"/>
-            <property name="linesCountBeforeClosingBrace" value="0"/>
-        </properties>
-    </rule>
     <!-- Forbid duplicated variables assignments -->
     <rule ref="SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable"/>
     <!-- Forbid useless variables -->

tests/expected_report.txt

@@ -33,7 +33,7 @@ tests/input/UselessConditions.php                     20      0
 ----------------------------------------------------------------------
 A TOTAL OF 238 ERRORS AND 0 WARNINGS WERE FOUND IN 27 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 207 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 202 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

tests/fixed/UselessConditions.php

@@ -44,12 +44,20 @@ public function unecessaryIfMethodForEarlyReturn() : bool
 
     public function uselessIfConditionWithParameter(bool $bool) : bool
     {
-        return ! $bool;
+        if ($bool) {
+            return false;
+        }
+
+        return true;
     }
 
     public function uselessIfConditionWithBoolMethod() : bool
     {
-        return ! $this->isTrue();
+        if ($this->isTrue()) {
+            return false;
+        }
+
+        return true;
     }
 
     public function uselessIfConditionWithComplexIf() : bool
@@ -70,7 +78,7 @@ public function uselessIfConditionWithComplexCondition() : bool
     public function uselessIfConditionWithTernary() : bool
     {
         if ($this->isTrue()) {
-            return $this->isTrulyTrue();
+            return $this->isTrulyTrue() ? true : false;
         }
 
         return false;
@@ -103,12 +111,12 @@ public function uselessTernary() : bool
 
     public function uselessTernaryWithParameter(bool $condition) : bool
     {
-        return $condition;
+        return $condition ? true : false;
     }
 
     public function uselessTernaryWithMethod() : bool
     {
-        return $this->isFalse();
+        return $this->isFalse() ? true : false;
     }
 
     /**