Chore/tidy GitHub actions

.github/workflows/main.yml

@@ -1,9 +1,9 @@
-name: Main tests
+name: Plugin tests
 
 on: push
 
 jobs:
-  kahlan:
+  lint-and-test:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
@@ -26,52 +26,7 @@ jobs:
             ${{ runner.os }}-composer-
       - name: Install dependencies
         run: composer install --no-interaction
-      - run: vendor/bin/kahlan
-  psalm:
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        php-versions: ['8.2']
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-      - name: Install dependencies
-        run: composer install --no-interaction
-      - run: vendor/bin/psalm
-  php-cs-fixer:
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        php-versions: ['8.2']
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-      - name: Install dependencies
-        run: composer install --no-interaction
-      - run: vendor/bin/php-cs-fixer fix --dry-run -v --diff
+      - run: |
+          vendor/bin/php-cs-fixer fix --dry-run -v --diff
+          vendor/bin/kahlan
+          vendor/bin/psalm --find-unused-psalm-suppress

composer.json

@@ -19,7 +19,7 @@
     "require-dev": {
         "dxw/phar-install": "^1.1",
         "dxw/php-cs-fixer-config": "^2.0",
-        "kahlan/kahlan": "^5.2",
+        "kahlan/kahlan": "^6",
         "vimeo/psalm": "^5.14",
         "humanmade/psalm-plugin-wordpress": "^3.1"
     },