Fix psalm (#832)

yiisoft · May 4, 2024 · c2deb4c · c2deb4c
1 parent db7394f
commit c2deb4c
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 29 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -1,23 +1,15 @@
 on:
   pull_request:
-    paths-ignore:
-      - 'docs/**'
-      - 'README.md'
-      - 'CHANGELOG.md'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'infection.json.dist'
-      - 'phpunit.xml.dist'
+    paths:
+      - 'src/**'
+      - 'config/**'
+      - 'psalm*.xml'
 
   push:
-    paths-ignore:
-      - 'docs/**'
-      - 'README.md'
-      - 'CHANGELOG.md'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'infection.json.dist'
-      - 'phpunit.xml.dist'
+    paths:
+      - 'src/**'
+      - 'config/**'
+      - 'psalm*.xml'
 
 name: static analysis
 
@@ -28,4 +20,12 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2']
+  psalm83:
+    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    with:
+      psalm-config: psalm83.xml
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.3']
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "rector/rector": "^1.0",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.20",
+        "vimeo/psalm": "^4.30|^5.24",
         "yiisoft/aliases": "^3.0",
         "yiisoft/cache-file": "^3.1",
         "yiisoft/di": "^1.0",

diff --git a/psalm.xml b/psalm.xml
@@ -3,16 +3,16 @@
   errorLevel="1"
   findUnusedBaselineEntry="true"
   findUnusedCode="false"
+  findUnusedVariablesAndParams="true"
+  findUnusedPsalmSuppress="true"
   resolveFromConfigFile="true"
   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="src" />
-      <ignoreFiles>
-        <directory name="vendor" />
-    </ignoreFiles>
+    <directory name="config" />
   </projectFiles>
   <issueHandlers>
     <MixedAssignment errorLevel="suppress" />

diff --git a/psalm83.xml b/psalm83.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<psalm
+  errorLevel="1"
+  findUnusedBaselineEntry="true"
+  findUnusedCode="false"
+  findUnusedVariablesAndParams="true"
+  findUnusedPsalmSuppress="true"
+  resolveFromConfigFile="true"
+  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="src" />
+    <directory name="config" />
+  </projectFiles>
+  <issueHandlers>
+    <MixedAssignment errorLevel="suppress" />
+    <RiskyTruthyFalsyComparison errorLevel="suppress" />
+    <MissingClassConstType errorLevel="suppress" />
+  </issueHandlers>
+</psalm>
diff --git a/src/Driver/Pdo/AbstractPdoCommand.php b/src/Driver/Pdo/AbstractPdoCommand.php
@@ -144,7 +144,6 @@ public function prepare(bool|null $forRead = null): void
             $this->bindPendingParams();
         } catch (PDOException $e) {
             $message = $e->getMessage() . "\nFailed to prepare SQL: $sql";
-            /** @psalm-var array|null $errorInfo */
             $errorInfo = $e->errorInfo ?? null;
 
             throw new Exception($message, $errorInfo, $e);

diff --git a/src/Driver/Pdo/AbstractPdoSchema.php b/src/Driver/Pdo/AbstractPdoSchema.php
@@ -21,8 +21,6 @@ abstract class AbstractPdoSchema extends AbstractSchema
      */
     protected function generateCacheKey(): array
     {
-        $cacheKey = [];
-
         if ($this->db instanceof PdoConnectionInterface) {
             $cacheKey = [$this->db->getDriver()->getDsn(), $this->db->getDriver()->getUsername()];
         } else {

diff --git a/src/Exception/ConvertException.php b/src/Exception/ConvertException.php
@@ -31,7 +31,6 @@ public function run(): Exception
     {
         $message = $this->e->getMessage() . PHP_EOL . 'The SQL being executed was: ' . $this->rawSql;
 
-        /** @var array|null $errorInfo */
         $errorInfo = $this->e instanceof PDOException ? $this->e->errorInfo : null;
 
         return match (

diff --git a/src/Expression/AbstractExpressionBuilder.php b/src/Expression/AbstractExpressionBuilder.php
@@ -99,7 +99,6 @@ private function appendParams(array &$expressionParams, array &$params): array
 
         $replacements = [];
 
-        /** @var non-empty-string $name */
         foreach ($nonUniqueParams as $name => $value) {
             $paramName = $name[0] === ':' ? substr($name, 1) : $name;
             $uniqueName = $this->getUniqueName($paramName, $params);

diff --git a/src/QueryBuilder/Condition/Builder/HashConditionBuilder.php b/src/QueryBuilder/Condition/Builder/HashConditionBuilder.php
@@ -44,7 +44,6 @@ public function build(HashConditionInterface $expression, array &$params = []):
 
         /**
          * @psalm-var array<string, array|mixed> $hash
-         * @psalm-var array|mixed $value
          */
         foreach ($hash as $column => $value) {
             if (is_iterable($value) || $value instanceof QueryInterface) {

diff --git a/src/QueryBuilder/DQLQueryBuilderInterface.php b/src/QueryBuilder/DQLQueryBuilderInterface.php
@@ -301,8 +301,6 @@ public function createConditionFromArray(array $condition): ConditionInterface;
      * @throws InvalidArgumentException
      *
      * @return object Instance of {@see ExpressionBuilderInterface} for the given expression.
-     *
-     * @psalm-suppress InvalidStringClass
      */
     public function getExpressionBuilder(ExpressionInterface $expression): object;