Update README, improve database handling, and upgrade dependencies

- Add sponsor badge to README
- Enhance environment preparation logic for `Uri` handling across databases
- Ensure proper handling of empty SQL statements in database classes
- Upgrade PHP requirement to `>=8.3` and dependencies to latest versions
- Refactor `Migration` methods for better error handling and type safety
- Update Psalm configuration: adjust error level, exclude test directory
- Revise GitHub Actions to drop PHP 8.1 and 8.2, add PHP 8.5, and separate Psalm workflow
- Improve composer scripts and static analysis setup

Author: byjg

.github/workflows/phpunit.yml

@@ -18,10 +18,9 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - "8.5"
           - "8.4"
           - "8.3"
-          - "8.2"
-          - "8.1"
 
     services:
       mysql:
@@ -66,21 +65,41 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-#      - name: Spin up databases
-#        run: |
-#          apk add --no-cache python3 python3-dev py3-pip build-base libffi-dev
-#          pip3 install --upgrade pip
-#          pip3 install docker-compose
-#          apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community docker
-#          docker-compose up -d postgres mysql
       - run: composer install
-      - run: ./vendor/bin/psalm
-      - run: ./vendor/bin/phpunit
+      - run: composer test
       - run: ./vendor/bin/phpunit tests/SqliteDatabase*
       - run: ./vendor/bin/phpunit tests/MysqlDatabase*
       - run: ./vendor/bin/phpunit tests/PostgresDatabase*
-#      - run: ./vendor/bin/phpunit tests/SqlServerSqlsrv*
-#      - run: ./vendor/bin/phpunit tests/SqlServerDblib*
+
+  Psalm:
+    name: Psalm Static Analyzer
+    runs-on: ubuntu-latest
+    permissions:
+      # for github/codeql-action/upload-sarif to upload SARIF results
+      security-events: write
+    container:
+      image: byjg/php:8.4-cli
+      options: --user root --privileged
+
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v4
+
+      - name: Composer
+        run: composer install
+
+      - name: Psalm
+        # Note: Ignoring error code 2, which just signals that some
+        # flaws were found, not that Psalm itself failed to run.
+        run: ./vendor/bin/psalm
+          --show-info=true
+          --report=psalm-results.sarif || [ $? = 2 ]
+
+      - name: Upload Analysis results to GitHub
+        uses: github/codeql-action/upload-sarif@v4
+        if: github.ref == 'refs/heads/master'
+        with:
+          sarif_file: psalm-results.sarif
 
   Documentation:
     if: github.ref == 'refs/heads/master'

README.md

@@ -1,5 +1,6 @@
 # Database Migration
 
+[![Sponsor](https://img.shields.io/badge/Sponsor-%23ea4aaa?logo=githubsponsors&logoColor=white&labelColor=0d1117)](https://github.com/sponsors/byjg)
 [![Build Status](https://github.com/byjg/php-migration/actions/workflows/phpunit.yml/badge.svg?branch=master)](https://github.com/byjg/php-migration/actions/workflows/phpunit.yml)
 [![Opensource ByJG](https://img.shields.io/badge/opensource-byjg-success.svg)](http://opensource.byjg.com)
 [![GitHub source](https://img.shields.io/badge/Github-source-informational?logo=github)](https://github.com/byjg/php-migration/)

composer.json

@@ -1,16 +1,16 @@
 {
   "name": "byjg/migration",
-  "description": "Simple library in PHP for database version control. Supports Sqlite, MySql, Sql Server and Postgres.",
+  "description": "A simple, framework-agnostic database migration tool that uses pure SQL commands for versioning your database.",
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
     "ext-pdo": "*",
     "byjg/anydataset-db": "^6.0",
-    "php": ">=8.1 <8.5"
+    "php": ">=8.3 <8.6"
   },
   "require-dev": {
     "phpunit/phpunit": "^10.5|^11.5",
-    "vimeo/psalm": "^5.9|^6.12"
+    "vimeo/psalm": "^6.13"
   },
   "autoload": {
     "psr-4": {
@@ -27,7 +27,7 @@
   ],
   "scripts": {
     "test": "vendor/bin/phpunit",
-    "psalm": "vendor/bin/psalm"
+    "psalm": "vendor/bin/psalm --threads=1"
   },
   "license": "MIT"
 }

psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="4"
+    errorLevel="3"
     resolveFromConfigFile="true"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
@@ -11,7 +11,6 @@
 >
     <projectFiles>
         <directory name="src" />
-        <directory name="tests" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>

src/Database/DblibDatabase.php

@@ -25,7 +25,8 @@ protected static function getDatabaseName(Uri $uri): string
     #[\Override]
     public static function prepareEnvironment(UriInterface|Uri $uri): void
     {
-        $database = static::getDatabaseName($uri);
+        $uriInstance = $uri instanceof Uri ? $uri : new Uri($uri->__toString());
+        $database = static::getDatabaseName($uriInstance);
         $dbDriver = static::getDbDriverWithoutDatabase($uri);
         $dbDriver->execute("IF NOT EXISTS(select * from sys.databases where name='$database') CREATE DATABASE $database");
     }
@@ -82,6 +83,10 @@ public function executeSql(string $sql): void
     {
         $statements = preg_split("/;(\r\n|\r|\n)/", $sql);
 
+        if ($statements === false) {
+            $statements = [$sql];
+        }
+
         foreach ($statements as $sql) {
             $this->executeSqlInternal($sql);
         }

src/Database/MySqlDatabase.php

@@ -19,7 +19,8 @@ public static function schema(): array
     #[\Override]
     public static function prepareEnvironment(UriInterface|Uri $uri): void
     {
-        $database = static::getDatabaseName($uri);
+        $uriInstance = $uri instanceof Uri ? $uri : new Uri($uri->__toString());
+        $database = static::getDatabaseName($uriInstance);
         $dbDriver = static::getDbDriverWithoutDatabase($uri);
         $dbDriver->execute("CREATE SCHEMA IF NOT EXISTS `$database` DEFAULT CHARACTER SET utf8 ;");
     }

src/Database/PgsqlDatabase.php

@@ -20,7 +20,8 @@ public static function schema(): string
     #[\Override]
     public static function prepareEnvironment(UriInterface|Uri $uri): void
     {
-        $database = static::getDatabaseName($uri);
+        $uriInstance = $uri instanceof Uri ? $uri : new Uri($uri->__toString());
+        $database = static::getDatabaseName($uriInstance);
         $dbDriver = static::getDbDriverWithoutDatabase($uri, 'postgres');
         static::createDatabaseIfNotExists($dbDriver, $database);
     }
@@ -75,6 +76,10 @@ public function executeSql(string $sql): void
     {
         $statements = preg_split("/;(\r\n|\r|\n)/", $sql);
 
+        if ($statements === false) {
+            $statements = [$sql];
+        }
+
         foreach ($statements as $sql) {
             $this->executeSqlInternal($sql);
         }

src/Database/SqliteDatabase.php

@@ -65,6 +65,10 @@ public function executeSql(string $sql): void
     {
         $statements = preg_split("/;(\r\n|\r|\n)/", $sql);
 
+        if ($statements === false) {
+            $statements = [$sql];
+        }
+
         foreach ($statements as $sql) {
             $this->executeSqlInternal($sql);
         }

src/Migration.php

@@ -82,7 +82,8 @@ public function withTransactionEnabled($enabled = true): static
      */
     public static function registerDatabase(string $class): void
     {
-        if (!in_array(DatabaseInterface::class, class_implements($class))) {
+        $implements = class_implements($class);
+        if ($implements === false || !in_array(DatabaseInterface::class, $implements)) {
             throw new InvalidArgumentException('Class not implements DatabaseInterface!');
         }
 
@@ -110,7 +111,9 @@ public function getDbCommand(): DatabaseInterface
     {
         if (is_null($this->dbCommand)) {
             $class = $this->getDatabaseClassName();
-            $this->dbCommand = new $class($this->uri, $this->migrationTable);
+            /** @var DatabaseInterface $instance */
+            $instance = new $class($this->uri, $this->migrationTable);
+            $this->dbCommand = $instance;
         }
         return $this->dbCommand;
     }
@@ -167,7 +170,12 @@ public function getMigrationSql(int $version, int $increment): ?string
             . "/" . ($increment < 0 ? "down" : "up")
             . "/*.sql";
 
-        $result = array_filter(glob($filePattern), function ($file) use ($version) {
+        $files = glob($filePattern);
+        if ($files === false) {
+            $files = [];
+        }
+
+        $result = array_filter($files, function ($file) use ($version) {
             return preg_match("/^0*$version(-[\w\d-]*)?\.sql$/", basename($file));
         });
 
@@ -204,14 +212,20 @@ public function getFileContent(string|null $file): array
             return $data;
         }
 
-        $data["content"] = file_get_contents($file);
+        $content = file_get_contents($file);
+
+        if ($content === false) {
+            return $data;
+        }
+
+        $data["content"] = $content;
 
-        if (preg_match("/--\s*@description:\s*(?<name>.*)/", $data["content"], $description)) {
+        if (preg_match("/--\s*@description:\s*(?<name>.*)/", $content, $description)) {
             $data["description"] = $description["name"];
         }
 
         $data["exists"] = true;
-        $data["checksum"] = sha1($data["content"]);
+        $data["checksum"] = sha1($content);
 
         return $data;
     }
@@ -417,7 +431,7 @@ public function down(?int $upVersion = null, bool $force = false): void
      */
     public function addCallbackProgress(callable $callable): void
     {
-        $this->callableProgress = $callable;
+        $this->callableProgress = $callable instanceof Closure ? $callable : Closure::fromCallable($callable);
     }
 
     /**