From 0178eb5cf8d8b2bd2af6da258f5f181fad796b5e Mon Sep 17 00:00:00 2001
From: Tigrov <rrr-r@ya.ru>
Date: Mon, 10 Mar 2025 11:27:07 +0700
Subject: [PATCH] Test PHP 8.4

---
 .github/workflows/bc.yml_                     |  2 +-
 .github/workflows/build.yml                   |  4 +++-
 .../workflows/composer-require-checker.yml    |  1 +
 .github/workflows/mutation.yml                |  2 +-
 .github/workflows/rector.yml                  |  2 +-
 .github/workflows/static.yml                  |  7 ++++---
 composer.json                                 | 20 +++++++++----------
 psalm.xml                                     |  1 +
 src/Command.php                               |  2 +-
 9 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/bc.yml_ b/.github/workflows/bc.yml_
index 5970206c..d2a73479 100644
--- a/.github/workflows/bc.yml_
+++ b/.github/workflows/bc.yml_
@@ -20,4 +20,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1']
+        ['8.4']
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5f082ce5..162552b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.3
+          - 8.4
 
         oracle:
           - 18
@@ -46,6 +46,8 @@ jobs:
             oracle: 21
           - php: 8.2
             oracle: 21
+          - php: 8.3
+            oracle: 21
 
     services:
       oci:
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
index d37dffd5..daf22788 100644
--- a/.github/workflows/composer-require-checker.yml
+++ b/.github/workflows/composer-require-checker.yml
@@ -36,6 +36,7 @@ jobs:
           - 8.1
           - 8.2
           - 8.3
+          - 8.4
 
     steps:
       - name: Checkout.
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
index d2232faa..f57b2909 100644
--- a/.github/workflows/mutation.yml
+++ b/.github/workflows/mutation.yml
@@ -34,7 +34,7 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.3
+          - 8.4
 
     services:
       oci:
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
index 73c9d27f..4f252850 100644
--- a/.github/workflows/rector.yml
+++ b/.github/workflows/rector.yml
@@ -19,4 +19,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index 2f4ca817..47eff664 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -35,9 +35,10 @@ jobs:
           - ubuntu-latest
 
         php:
-          - '8.1'
-          - '8.2'
-          - '8.3'
+          - 8.1
+          - 8.2
+          - 8.3
+          - 8.4
 
     steps:
       - name: Checkout.
diff --git a/composer.json b/composer.json
index 0ebf770a..0d1a01bf 100644
--- a/composer.json
+++ b/composer.json
@@ -31,20 +31,20 @@
     ],
     "require": {
         "ext-pdo": "*",
-        "php": "^8.1",
+        "php": "8.1 - 8.4",
         "yiisoft/db": "dev-master"
     },
     "require-dev": {
-        "maglnet/composer-require-checker": "^4.2",
-        "phpunit/phpunit": "^10.0",
-        "rector/rector": "^2.0",
-        "roave/infection-static-analysis-plugin": "^1.16",
-        "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^5.25",
-        "vlucas/phpdotenv": "^5.6",
+        "maglnet/composer-require-checker": "^4.7.1",
+        "phpunit/phpunit": "^10.5.45",
+        "rector/rector": "^2.0.10",
+        "roave/infection-static-analysis-plugin": "^1.35",
+        "spatie/phpunit-watcher": "^1.24",
+        "vimeo/psalm": "^5.26.1 || ^6.8.8",
+        "vlucas/phpdotenv": "^5.6.1",
         "yiisoft/aliases": "^2.0",
-        "yiisoft/cache-file": "^3.1",
-        "yiisoft/var-dumper": "^1.5"
+        "yiisoft/cache-file": "^3.2",
+        "yiisoft/var-dumper": "^1.7"
     },
     "autoload": {
         "psr-4": {
diff --git a/psalm.xml b/psalm.xml
index fc577119..8bb4c4cc 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <psalm
   errorLevel="1"
+  ensureOverrideAttribute="false"
   findUnusedBaselineEntry="true"
   findUnusedCode="false"
   resolveFromConfigFile="true"
diff --git a/src/Command.php b/src/Command.php
index 196a6892..8fd58a4e 100644
--- a/src/Command.php
+++ b/src/Command.php
@@ -21,7 +21,7 @@
  */
 final class Command extends AbstractPdoCommand
 {
-    public function insertWithReturningPks(string $table, array $columns): bool|array
+    public function insertWithReturningPks(string $table, array $columns): array|false
     {
         $tableSchema = $this->db->getSchema()->getTableSchema($table);
         $returnColumns = $tableSchema?->getPrimaryKey() ?? [];