Merge pull request #53 from luislard/fix_qa

Fix qa

Author: gmazzap

Inpsyde/Sniffs/CodeQuality/ArgumentTypeDeclarationSniff.php

@@ -113,7 +113,7 @@ private function isMixed(string $paramName, array $docBlockTypes): bool
         }
 
         $paramDocBlockTypesCount = count($paramDocBlockTypes);
-        if (!$paramDocBlockTypesCount || $paramDocBlockTypesCount > 2) {
+        if ($paramDocBlockTypesCount !== 1 && $paramDocBlockTypesCount !== 2) {
             return false;
         }
 

Inpsyde/Sniffs/CodeQuality/ElementNameMinimalLengthSniff.php

@@ -78,7 +78,7 @@ public function process(File $file, $position)
         // phpcs:enable Inpsyde.CodeQuality.ReturnTypeDeclaration
 
         $elementName = PhpcsHelpers::tokenName($file, $position);
-        $elementNameLength = (int)mb_strlen($elementName);
+        $elementNameLength = mb_strlen($elementName);
 
         if ($this->shouldBeSkipped($elementNameLength, $elementName)) {
             return;

Inpsyde/Sniffs/CodeQuality/LineLengthSniff.php

@@ -183,8 +183,12 @@ private function isLongWord(File $file, array $tokens, int $start, int $end): bo
                 ? $this->isLongHtmlAttribute($start, $end, $file, $tokens)
                 : $this->isLongSingleWord($start, $end, $file, $tokens);
 
-            if (!$isLong || $isHtml) {
-                return $isLong && $isHtml;
+            if (!$isLong) {
+                return false;
+            }
+
+            if ($isHtml) {
+                return true;
             }
 
             $start++;

Inpsyde/Sniffs/CodeQuality/NoAccessorsSniff.php

@@ -50,6 +50,7 @@ public function register()
      * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
      * phpcs:disable Inpsyde.CodeQuality.ReturnTypeDeclaration
      * phpcs:disable Inpsyde.CodeQuality.FunctionLength
+     * phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
      */
     public function process(File $file, $position)
     {

Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php

@@ -116,6 +116,8 @@ public function process(File $file, $position)
      * @param File $file
      * @param int $position
      * @return void
+     *
+     * phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh
      */
     private function maybeErrors(
         bool $hasNonVoidReturnType,
@@ -326,7 +328,7 @@ private function hasReturnNullOrMixedDocBloc(File $file, int $functionPosition):
         $returnTypes = array_map('trim', $returnTypes);
         $returnTypesCount = count($returnTypes);
         // Only if 1 or 2 types
-        if (!$returnTypesCount || ($returnTypesCount > 2)) {
+        if ($returnTypesCount !== 1 && $returnTypesCount !== 2) {
             return ['mixed' => false, 'null' => false];
         }
 

psalm.xml

@@ -5,7 +5,6 @@
     useDocblockPropertyTypes="true"
     usePhpDocMethodsWithoutMagicCall="true"
     strictBinaryOperands="true"
-    allowPhpStormGenerics="true"
     ignoreInternalFunctionFalseReturn="false"
     ignoreInternalFunctionNullReturn="false"
     hideExternalErrors="true"