From eb4d8d756f3f184cfed12abe330dc4128d69f35c Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Thu, 6 Feb 2025 15:50:53 +0400
Subject: [PATCH] Add PHP 8.4 in CI, update psalm baseline

---
 .github/workflows/ci-mssql.yml |  2 +-
 .github/workflows/ci-mysql.yml |  2 +-
 .github/workflows/ci-pgsql.yml |  2 +-
 psalm-baseline.xml             | 19 ++++---------------
 src/FileRepository.php         |  3 +++
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
index 43d00c0..2b34c22 100644
--- a/.github/workflows/ci-mssql.yml
+++ b/.github/workflows/ci-mssql.yml
@@ -14,6 +14,6 @@ jobs:
   phpunit:
     uses: cycle/gh-actions/.github/workflows/db-mssql.yml@master
     with:
-      php: '["8.1","8.2","8.3"]'
+      php: '["8.1","8.2","8.3","8.4"]'
 
 ...
diff --git a/.github/workflows/ci-mysql.yml b/.github/workflows/ci-mysql.yml
index f74f61c..e788f59 100644
--- a/.github/workflows/ci-mysql.yml
+++ b/.github/workflows/ci-mysql.yml
@@ -14,6 +14,6 @@ jobs:
   phpunit:
     uses: cycle/gh-actions/.github/workflows/db-mysql.yml@master
     with:
-      php: '["8.1","8.2","8.3"]'
+      php: '["8.1","8.2","8.3","8.4"]'
 
 ...
diff --git a/.github/workflows/ci-pgsql.yml b/.github/workflows/ci-pgsql.yml
index 40f186e..83ffad3 100644
--- a/.github/workflows/ci-pgsql.yml
+++ b/.github/workflows/ci-pgsql.yml
@@ -14,6 +14,6 @@ jobs:
   phpunit:
     uses: cycle/gh-actions/.github/workflows/db-pgsql.yml@master
     with:
-      php: '["8.1","8.2","8.3"]'
+      php: '["8.1","8.2","8.3","8.4"]'
 
 ...
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 9f77c52..8def121 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
+<files psalm-version="6.4.0@04f312ac6ea48ba1c3e5db4d815bf6d74641c0ee">
   <file src="src/Atomizer/Renderer.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$comparator]]></code>
@@ -65,9 +65,6 @@
     <ArgumentTypeCoercion>
       <code><![CDATA[$table]]></code>
     </ArgumentTypeCoercion>
-    <MixedInferredReturnType>
-      <code><![CDATA[AbstractTable]]></code>
-    </MixedInferredReturnType>
     <MixedPropertyTypeCoercion>
       <code><![CDATA[$this->schemas]]></code>
     </MixedPropertyTypeCoercion>
@@ -80,12 +77,6 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="src/Config/MigrationConfig.php">
-    <MixedInferredReturnType>
-      <code><![CDATA[bool]]></code>
-      <code><![CDATA[string]]></code>
-      <code><![CDATA[string]]></code>
-      <code><![CDATA[string]]></code>
-    </MixedInferredReturnType>
     <MixedReturnStatement>
       <code><![CDATA[$this->config['directory'] ?? '']]></code>
       <code><![CDATA[$this->config['directory'] ?? '']]></code>
@@ -98,13 +89,14 @@
     </MixedReturnStatement>
   </file>
   <file src="src/FileRepository.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[$directory]]></code>
+    </ArgumentTypeCoercion>
     <MixedArgument>
       <code><![CDATA[$directory]]></code>
-      <code><![CDATA[$filename]]></code>
     </MixedArgument>
     <MixedAssignment>
       <code><![CDATA[$directory]]></code>
-      <code><![CDATA[$filename]]></code>
     </MixedAssignment>
     <MoreSpecificReturnType>
       <code><![CDATA[\Generator<int, TFileArray>]]></code>
@@ -124,9 +116,6 @@
     <LessSpecificReturnStatement>
       <code><![CDATA[$this->capsule->getDatabase()]]></code>
     </LessSpecificReturnStatement>
-    <MixedInferredReturnType>
-      <code><![CDATA[?string]]></code>
-    </MixedInferredReturnType>
     <MixedReturnStatement>
       <code><![CDATA[static::DATABASE]]></code>
     </MixedReturnStatement>
diff --git a/src/FileRepository.php b/src/FileRepository.php
index 93b1af7..20cde99 100644
--- a/src/FileRepository.php
+++ b/src/FileRepository.php
@@ -123,6 +123,7 @@ private function getFilesIterator(): \Generator
                 $this->config->getVendorDirectories(),
             ) as $directory
         ) {
+            $directory === '' and $directory = '.';
             yield from $this->getFiles($directory);
         }
     }
@@ -130,6 +131,8 @@ private function getFilesIterator(): \Generator
     /**
      * Internal method to fetch all migration filenames.
      *
+     * @param non-empty-string $directory
+     *
      * @return \Generator<int, TFileArray>
      */
     private function getFiles(string $directory): \Generator