From a25918ef1ed1ad6e1a1161d9d112c0897f5cea34 Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Wed, 17 Jul 2024 16:08:28 +0300
Subject: [PATCH 1/4] improve ci

---
 .github/workflows/build.yml      | 7 +++++--
 .github/workflows/dependency.yml | 4 +++-
 .github/workflows/static.yml     | 7 +++++--
 README.md                        | 2 +-
 composer.json                    | 2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5fe7a87..f492ef0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,7 @@
 on:
-  - pull_request
-  - push
+  pull_request:
+  push:
+    branches: [ 'master' ]
 
 name: build
 
@@ -21,6 +22,8 @@ jobs:
         php:
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
 
         mysql:
           - "8.0"
diff --git a/.github/workflows/dependency.yml b/.github/workflows/dependency.yml
index 08c1529..c9554fe 100644
--- a/.github/workflows/dependency.yml
+++ b/.github/workflows/dependency.yml
@@ -1,5 +1,7 @@
 on:
-  - push
+  pull_request:
+  push:
+    branches: [ 'master' ]
 
 name: dependency checker
 
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index e45d8a3..cf730b7 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -1,6 +1,7 @@
 on:
-  - pull_request
-  - push
+  pull_request:
+  push:
+    branches: [ 'master' ]
 
 name: static analysis
 
@@ -18,6 +19,8 @@ jobs:
         php:
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
 
     steps:
       - name: Checkout
diff --git a/README.md b/README.md
index a65a3eb..dd58ca9 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ So for a test you could load only needed tables or rows. As a result it dramatic
 The package could be installed with [composer](https://getcomposer.org/download/):
 
 ```shell
-composer require vjik/codeception-db-populator --dev --prefer-dist
+composer require vjik/codeception-db-populator --dev
 ```
 ## General usage
 
diff --git a/composer.json b/composer.json
index b2fc922..8a60031 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "codeception/module-db": "^3.0"
     },
     "require-dev": {
-        "vimeo/psalm": "^4.16",
+        "vimeo/psalm": "^4.30|^5.25",
         "vlucas/phpdotenv": "^5.4"
     },
     "autoload": {

From d2537f74b5a130c342f2cc1f748d297f66e43323 Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Wed, 17 Jul 2024 16:12:12 +0300
Subject: [PATCH 2/4] fix psalm

---
 .github/workflows/static.yml |  7 ++++++-
 psalm-8.0.xml                | 17 +++++++++++++++++
 psalm.xml                    |  5 +++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 psalm-8.0.xml

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index cf730b7..226442f 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -51,4 +51,9 @@ jobs:
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Static analysis
-        run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle --php-version=${{ matrix.php }} | cs2pr --graceful-warnings --colorize
+        if: matrix.php == '8.0'
+        run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle --php-version=${{ matrix.php }} --config=psalm-8.0.xml | cs2pr --graceful-warnings --colorize
+
+      - name: Static analysis
+        if: matrix.php != '8.0'
+        run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle --php-version=${{ matrix.php }} --config=psalm.xml | cs2pr --graceful-warnings --colorize
diff --git a/psalm-8.0.xml b/psalm-8.0.xml
new file mode 100644
index 0000000..c77c295
--- /dev/null
+++ b/psalm-8.0.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
+    autoloader="vendor/codeception/codeception/autoload.php"
+    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>
+</psalm>
diff --git a/psalm.xml b/psalm.xml
index 50d717f..cf20ddc 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     autoloader="vendor/codeception/codeception/autoload.php"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
@@ -12,4 +14,7 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
+    </issueHandlers>
 </psalm>

From d75167d676a4e06ad21ee8b57385c96e7a62aeee Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Wed, 17 Jul 2024 16:14:07 +0300
Subject: [PATCH 3/4] fix psalm

---
 .github/workflows/static.yml |  7 +------
 psalm-8.0.xml                | 17 -----------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 psalm-8.0.xml

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index 226442f..cf730b7 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -51,9 +51,4 @@ jobs:
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Static analysis
-        if: matrix.php == '8.0'
-        run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle --php-version=${{ matrix.php }} --config=psalm-8.0.xml | cs2pr --graceful-warnings --colorize
-
-      - name: Static analysis
-        if: matrix.php != '8.0'
-        run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle --php-version=${{ matrix.php }} --config=psalm.xml | cs2pr --graceful-warnings --colorize
+        run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle --php-version=${{ matrix.php }} | cs2pr --graceful-warnings --colorize
diff --git a/psalm-8.0.xml b/psalm-8.0.xml
deleted file mode 100644
index c77c295..0000000
--- a/psalm-8.0.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="1"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="false"
-    autoloader="vendor/codeception/codeception/autoload.php"
-    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>
-</psalm>

From e4219eeb4b24bb5bca152d2bee7402979be81f2d Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Wed, 17 Jul 2024 16:15:14 +0300
Subject: [PATCH 4/4] improve

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8a60031..2f291b3 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "codeception/module-db": "^3.0"
     },
     "require-dev": {
-        "vimeo/psalm": "^4.30|^5.25",
+        "vimeo/psalm": "^5.25",
         "vlucas/phpdotenv": "^5.4"
     },
     "autoload": {