Fix QA

Author: gmazzap

.github/workflows/php-qa.yml

@@ -35,6 +35,9 @@ jobs:
             - name: Check syntax error in sources
               run: find ./src/ ./tests/src/ ./tests/cases/ -type f -name '*.php' -print0 | xargs -0 -L 1 -P 4 -- php -l
 
+            - name: Remove Psalm before tests, to prevent installation conflicts
+              run: composer.phar remove vimeo/psalm --no-update
+
             - name: Install dependencies
               uses: "ramsey/composer-install@v1"
               with:

.psalm/autoloader.php

@@ -3,6 +3,7 @@
 $vendor = dirname(__DIR__) . '/vendor';
 $phpcsSrc = "{$vendor}/squizlabs/php_codesniffer/src";
 
+require_once dirname(__DIR__) . '/Inpsyde/PhpcsHelpers.php';
 require_once "{$phpcsSrc}/Sniffs/Sniff.php";
 require_once "{$phpcsSrc}/Files/File.php";
 require_once "{$phpcsSrc}/Fixer.php";

Inpsyde/PhpcsHelpers.php

@@ -653,7 +653,7 @@ public static function findNamespace(File $file, int $position): array
      */
     public static function minPhpTestVersion(): string
     {
-        $testVersion = trim((string)(Config::getConfigData('testVersion') ?: ''));
+        $testVersion = trim(Config::getConfigData('testVersion') ?: '');
         if (!$testVersion) {
             return '';
         }

Inpsyde/Sniffs/CodeQuality/FunctionLengthSniff.php

@@ -81,7 +81,7 @@ public function process(File $file, $position)
             'Your function is too long. Currently using %d lines%s, max is %d.',
             $length,
             $suffix,
-            (int)$this->maxLength
+            $this->maxLength
         );
 
         $file->addError($error, $position, 'TooLong');

Inpsyde/Sniffs/CodeQuality/LineLengthSniff.php

@@ -265,7 +265,7 @@ private function isLongSingleWord(
             return false;
         }
 
-        $word = (string)reset($words);
+        $word = reset($words);
         $firstNonWhitePos = $file->findNext(T_WHITESPACE, $position, $lineEnd, true);
         $firstNonWhite = ($firstNonWhitePos === false) ? null : $tokens[$firstNonWhitePos];
         $tolerance = is_array($firstNonWhite) ? ((int)($firstNonWhite['column'] ?? 1) + 3) : 4;

Inpsyde/Sniffs/CodeQuality/Psr4Sniff.php

@@ -166,7 +166,7 @@ private function checkPsr4Folders(
         foreach ($folders as $folder) {
             $folder = trim(str_replace('\\', '/', $folder), './');
             $folderSplit = explode("/{$folder}/", $filePath);
-            if (!$folderSplit || count($folderSplit) < 2) {
+            if (count($folderSplit) < 2) {
                 continue;
             }
 

Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php

@@ -308,7 +308,7 @@ private function returnTypeInfo(File $file, int $functionPosition): array
     /**
      * @param File $file
      * @param int $functionPosition
-     * @return array{mixed:bool, null:bool}
+     * @return array{'mixed': bool, 'null': bool}
      */
     private function hasReturnNullOrMixedDocBloc(File $file, int $functionPosition): array
     {
@@ -317,12 +317,12 @@ private function hasReturnNullOrMixedDocBloc(File $file, int $functionPosition):
             return ['mixed' => false, 'null' => false];
         }
 
-        $returnContentParts = preg_split('~\s+~', (string)reset($return), PREG_SPLIT_NO_EMPTY);
+        $returnContentParts = preg_split('~\s+~', reset($return), PREG_SPLIT_NO_EMPTY);
         if (!$returnContentParts) {
             return ['mixed' => false, 'null' => false];
         }
 
-        $returnTypes = array_map('strtolower', explode('|', (string)reset($returnContentParts)));
+        $returnTypes = array_map('strtolower', explode('|', reset($returnContentParts)));
         $returnTypes = array_map('trim', $returnTypes);
         $returnTypesCount = count($returnTypes);
         // Only if 1 or 2 types

Inpsyde/Sniffs/CodeQuality/VariablesNameSniff.php

@@ -199,7 +199,6 @@ private function allIgnored(): array
             $this->ignoredNames = [];
         }
 
-        /** @var array $ignored */
         $ignored = $this->ignoredNames;
 
         /** @var array<string> $normalized */

composer.json

@@ -38,7 +38,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "6.5.* || 9.4.*",
-        "vimeo/psalm": "^3"
+        "vimeo/psalm": "@stable"
     },
     "autoload-dev": {
         "psr-4": {
@@ -54,8 +54,16 @@
         }
     },
     "scripts" : {
-        "phpcompat": [
-            "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs -p . --standard=PHPCompatibility --ignore=*/vendor/*,*tests/fixtures/* --extensions=php --basepath=./ --runtime-set testVersion 7.0-"
+        "cs": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs",
+        "phpcompat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs -p . --standard=PHPCompatibility --ignore=*/vendor/*,*tests/fixtures/* --extensions=php --basepath=./ --runtime-set testVersion 7.0-",
+        "tests": "@php ./vendor/phpunit/phpunit/phpunit",
+        "tests:no-cov": "@php ./vendor/phpunit/phpunit/phpunit --no-coverage",
+        "psalm": "@php ./vendor/vimeo/psalm/psalm --no-cache",
+        "qa": [
+            "@cs",
+            "@phpcompat",
+            "@tests:no-cov",
+            "@psalm"
         ]
     }
 }

psalm.xml

@@ -2,29 +2,21 @@
 <psalm
     autoloader="./.psalm/autoloader.php"
     totallyTyped="true"
-    useDocblockTypes="true"
     useDocblockPropertyTypes="true"
     usePhpDocMethodsWithoutMagicCall="true"
     strictBinaryOperands="true"
-    requireVoidReturnType="true"
-    useAssertForType="true"
-    rememberPropertyAssignmentsAfterCall="true"
     allowPhpStormGenerics="true"
     allowCoercionFromStringToClassConst="true"
-    allowStringToStandInForClass="false"
-    memoizeMethodCallResults="false"
-    hoistConstants="false"
-    addParamDefaultToDocblockType="false"
-    checkForThrowsInGlobalScope="false"
     ignoreInternalFunctionFalseReturn="false"
     ignoreInternalFunctionNullReturn="false"
     hideExternalErrors="true"
-    allowFileIncludes="true"
     allowNamedArgumentCalls="false"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="Inpsyde/Sniffs"/>
-        <file name="Inpsyde/PhpcsHelpers.php"/>
+        <directory name="Inpsyde"/>
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>