From fc070d0a35a0f2af98cea0f12a20d89b66736d5d Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Wed, 7 Feb 2024 21:08:38 +0300
Subject: [PATCH] Fix psalm

---
 .github/workflows/static.yml | 11 ++++++++++-
 composer.json                |  2 +-
 psalm.xml                    |  6 +++++-
 psalm80.xml                  | 19 +++++++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 psalm80.xml

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index fb7fc77..0261ae0 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -10,6 +10,7 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches: [ 'master' ]
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +29,12 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.1', '8.2', '8.3']
+  psalm80:
+    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    with:
+      psalm-config: psalm80.xml
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']
diff --git a/composer.json b/composer.json
index 4365fc3..9c1e6f3 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
         "rector/rector": "^1.0.0",
         "roave/infection-static-analysis-plugin": "^1.20",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.4",
+        "vimeo/psalm": "^4.30|^5.21",
         "yiisoft/test-support": "^3.0"
     },
     "suggest": {
diff --git a/psalm.xml b/psalm.xml
index 73ed715..b48c894 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -10,7 +10,11 @@
     <projectFiles>
         <directory name="src" />
         <ignoreFiles>
-            <directory name="vendor"/>
+            <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
+    </issueHandlers>
 </psalm>
diff --git a/psalm80.xml b/psalm80.xml
new file mode 100644
index 0000000..d091d59
--- /dev/null
+++ b/psalm80.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="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="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+    </issueHandlers>
+</psalm>