From 417ff67cbc0cc5a780c89126a09a361103754657 Mon Sep 17 00:00:00 2001
From: priethor <27339341+priethor@users.noreply.github.com>
Date: Wed, 26 Nov 2025 18:41:36 +0100
Subject: [PATCH] Update e2e and phpunit version matrices

---
 .github/workflows/e2e.yml     | 29 +++++++++++++++++++++++++++--
 .github/workflows/phpunit.yml | 19 +++++++++++++------
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index ee24fe65..d7723143 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -3,18 +3,43 @@ name: E2E Tests
 on:
     pull_request:
         branches: [trunk]
+    push:
+        branches: [trunk]
+    # Allow manually triggering the workflow
+    workflow_dispatch:
+
+# Cancels all previous workflow runs for pull requests that have not completed
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
+# Disable permissions for all available scopes by default
+permissions: {}
 
 jobs:
     test:
-        name: Playwright e2e Tests
+        name: Node.js ${{ matrix.node }}
         runs-on: ubuntu-latest
+        permissions:
+            contents: read
+
+        strategy:
+            fail-fast: false
+            matrix:
+                event: ['${{ github.event_name }}']
+                node: ['22', '24']
+                exclude:
+                    # On PRs: only test Node 22
+                    - event: 'pull_request'
+                      node: '24'
+
         steps:
             - uses: actions/checkout@v4
 
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version-file: '.nvmrc'
+                  node-version: ${{ matrix.node }}
                   cache: 'npm'
 
             - name: Install dependencies
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index ef433694..558c6be1 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -16,13 +16,20 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      matrix:
-        include:
-          # Minimum supported PHP
-          - php: '7.4'
-          # Latest stable PHP
-          - php: '8.4'
       fail-fast: false
+      matrix:
+        event: ['${{ github.event_name }}']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        exclude:
+          # On PRs: only test minimum and latest PHP versions
+          - event: 'pull_request'
+            php: '8.0'
+          - event: 'pull_request'
+            php: '8.1'
+          - event: 'pull_request'
+            php: '8.2'
+          - event: 'pull_request'
+            php: '8.3'
 
     steps:
       - name: Checkout code