Upgrade to Psalm 6

Co-authored-by: Niklas Keller <me@kelunik.com>

Author: trowski

.github/workflows/ci.yml

@@ -11,6 +11,7 @@ jobs:
         include:
           - operating-system: 'ubuntu-latest'
             php-version: '8.1'
+            psalm: 'skip'
 
           - operating-system: 'ubuntu-latest'
             php-version: '8.2'
@@ -20,20 +21,16 @@ jobs:
 
           - operating-system: 'ubuntu-latest'
             php-version: '8.4'
-            static-analysis: none
-            style-fix: none
 
           - operating-system: 'ubuntu-latest'
             php-version: '8.5'
-            static-analysis: none
-            style-fix: none
 
           - operating-system: 'windows-latest'
-            php-version: '8.3'
+            php-version: '8.5'
             job-description: 'on Windows'
 
           - operating-system: 'macos-latest'
-            php-version: '8.3'
+            php-version: '8.5'
             job-description: 'on macOS'
 
     name: PHP ${{ matrix.php-version }} ${{ matrix.job-description }}
@@ -69,6 +66,10 @@ jobs:
             composer-${{ runner.os }}-
             composer-
 
+      - name: Remove psalm/phar
+        run: composer remove --no-update --dev psalm/phar
+        if: matrix.psalm == 'skip'
+
       - name: Install dependencies
         uses: nick-invision/retry@v2
         with:
@@ -84,7 +85,7 @@ jobs:
 
       - name: Run static analysis
         run: vendor/bin/psalm.phar
-        if: matrix.static-analysis != 'none'
+        if: matrix.psalm != 'skip'
 
       - name: Run style fixer
         env:

README.md

@@ -6,6 +6,8 @@ This package provides interfaces and classes shared by [`amphp/mysql`](https://g
 
 - PHP 8.1+
 
+We require PHP 8.2+ for development due to the Psalm version we use, but still support PHP 8.1 at runtime. However, [PHP 8.1 no longer receives updates](https://www.php.net/supported-versions.php), so please upgrade to a newer version of PHP.
+
 ## Versioning
 
 `amphp/sql` follows the [semver](http://semver.org/) semantic versioning specification like all other `amphp` packages.

composer.json

@@ -17,7 +17,7 @@
     "require-dev": {
         "amphp/php-cs-fixer-config": "^2",
         "phpunit/phpunit": "^9",
-        "psalm/phar": "5.23"
+        "psalm/phar": "6.15.1"
     },
     "autoload": {
         "psr-4": {

psalm.xml

@@ -12,4 +12,24 @@
             <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
+
+    <issueHandlers>
+        <ClassMustBeFinal>
+            <errorLevel type="suppress">
+                <directory name="src"/>
+            </errorLevel>
+        </ClassMustBeFinal>
+
+        <PossiblyUnusedMethod>
+            <errorLevel type="suppress">
+                <directory name="src"/>
+            </errorLevel>
+        </PossiblyUnusedMethod>
+
+        <UnusedClass>
+            <errorLevel type="suppress">
+                <directory name="src"/>
+            </errorLevel>
+        </UnusedClass>
+    </issueHandlers>
 </psalm>

src/SqlTransactionIsolationLevel.php

@@ -9,6 +9,7 @@ enum SqlTransactionIsolationLevel implements SqlTransactionIsolation
     case Repeatable;
     case Serializable;
 
+    #[\Override]
     public function getLabel(): string
     {
         return match ($this) {
@@ -19,6 +20,7 @@ public function getLabel(): string
         };
     }
 
+    #[\Override]
     public function toSql(): string
     {
         return match ($this) {