Merge remote-tracking branch 'upstream/1.1' into 1.2

nbgrp · Aug 7, 2022 · 620ab83 · 620ab83
2 parents 4ec3035 + b8dfea2
commit 620ab83
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -102,4 +102,4 @@
         'simplified_null_return' => true,
         'static_lambda' => true,
     ])
-    ;
+;
diff --git a/phpcs.xml b/phpcs.xml
@@ -158,7 +158,7 @@
                 <element value="@psalm-assert, @phan-assert" />
                 <element value="@property, @psalm-property" />
                 <element value="@see" />
-                <element value="@suppress, @psalm-suppress, @phpstan-ignore-line, @phpstan-ignore-next-line, @phan-file-suppress, @phan-suppress-next-line, @phan-suppress-current-line" />
+                <element value="@suppress, @psalm-suppress, @phpstan-ignore-line, @phpstan-ignore-next-line, @phan-file-suppress, @phan-suppress-next-line, @phan-suppress-current-line, @SuppressWarnings" />
             </property>
         </properties>
     </rule>
@@ -172,6 +172,11 @@
     </rule>
     <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration" />
     <rule ref="SlevomatCodingStandard.Commenting.UselessInheritDocComment" />
+    <rule ref="SlevomatCodingStandard.Complexity.Cognitive">
+        <properties>
+            <property name="maxComplexity" value="8" />
+        </properties>
+    </rule>
     <rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison" />
     <rule ref="SlevomatCodingStandard.ControlStructures.NewWithParentheses" />
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator" />

diff --git a/phpmd-ruleset.xml b/phpmd-ruleset.xml
@@ -11,17 +11,6 @@
     <rule ref="rulesets/cleancode.xml/DuplicatedArrayKey" />
     <rule ref="rulesets/cleancode.xml/UndefinedVariable" />
 
-    <rule ref="rulesets/codesize.xml/CyclomaticComplexity">
-        <properties>
-            <property name="reportLevel" value="7" />
-        </properties>
-    </rule>
-    <rule ref="rulesets/codesize.xml/NPathComplexity">
-        <properties>
-            <property name="minimum" value="40" />
-        </properties>
-    </rule>
-
     <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity" />
 
     <rule ref="rulesets/controversial.xml">
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,4 +102,4 @@ @@
             'simplified_null_return' => true,
             'static_lambda' => true,
         ])
-        ;
+    ;