@@ -190,3 +190,47 @@ jobs:
         with:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
           coverage-reports: build/logs/clover.xml
+
+  test-php-with-newer-phpunit:
+    name: Test on PHP ${{ matrix.php }} with PHPUnit ${{ matrix.phpunit }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { php: '8.3', phpunit: '12' }
+          - { php: '8.4', phpunit: '13' }
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+
+      - name: Install gettext and generate translation files
+        run: |
+          sudo apt-get install -y gettext
+          ./bin/generate-mo --quiet
+
+      - name: Set up PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, iconv, mysqli, zip, gd, bz2
+
+      - name: Update composer.json
+        shell: bash
+        env:
+          PHPUNIT_VERSION: ${{ matrix.phpunit }}
+        run: |
+          composer config --unset platform --no-interaction --ansi
+          composer remove --dev vimeo/psalm psalm/plugin-phpunit --no-update --no-interaction --ansi
+          composer require --dev phpunit/phpunit:^"$PHPUNIT_VERSION" --no-update --no-interaction --ansi
+          composer validate --strict
+
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v4
+        with:
+          dependency-versions: highest
+
+      - name: Run PHP tests
+        run: vendor/bin/phpunit --testsuite unit --no-coverage --no-logging --display-all-issues