From 5faa3b84dc2df4ab24c3c21053f73d5e9cbfc9d8 Mon Sep 17 00:00:00 2001
From: Marc Reichel <marc.reichel@artemeon.de>
Date: Sun, 6 Sep 2026 14:26:50 +0200
Subject: [PATCH] chore: add PHP 8.5 support and update branch workflows

---
 .github/workflows/integration.yml | 21 +++++++++------------
 .github/workflows/pest.yml        |  2 +-
 .github/workflows/phpstan.yml     |  1 +
 .github/workflows/pint.yml        |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 42171d5c..e9b647e2 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - 5.x
       - 4.0.x
       - 3.0.x
       - 2.0.x
@@ -15,15 +16,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version:
-          - "8.4"
+        php: [ 8.4, 8.5 ]
     steps:
       - name: "Checkout"
         uses: actions/checkout@v4
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ matrix.php }}"
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
         with:
@@ -40,8 +40,7 @@ jobs:
     needs: smoke-check
     strategy:
       matrix:
-        php-version:
-          - "8.4"
+        php: [ 8.4, 8.5 ]
         postgres-version:
           - "13"
           - "14"
@@ -60,7 +59,7 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ matrix.php }}"
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
         with:
@@ -79,8 +78,7 @@ jobs:
     needs: smoke-check
     strategy:
       matrix:
-        php-version:
-          - "8.4"
+        php: [ 8.4, 8.5 ]
         mariadb-version:
           - "10.6"
           - "10.8"
@@ -102,7 +100,7 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ matrix.php }}"
           extensions: "mysqli"
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
@@ -122,8 +120,7 @@ jobs:
     needs: smoke-check
     strategy:
       matrix:
-        php-version:
-          - "8.4"
+        php-version: [ 8.4, 8.5 ]
         mysql-version:
           - "8.0"
           - "9.0"
@@ -148,7 +145,7 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ matrix.php }}"
           extensions: "mysqli"
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
diff --git a/.github/workflows/pest.yml b/.github/workflows/pest.yml
index d4394e23..92539af3 100644
--- a/.github/workflows/pest.yml
+++ b/.github/workflows/pest.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.4"
+          php-version: 8.5
           coverage: none
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index adbf71ee..e957e4a5 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -3,6 +3,7 @@ on:
   pull_request:
   push:
     branches:
+      - 5.x
       - 4.0.x
 jobs:
   phpstan:
diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml
index 964822e0..9e0fc903 100644
--- a/.github/workflows/pint.yml
+++ b/.github/workflows/pint.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.4"
+          php-version: 8.5
           coverage: none
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}