From fe289c31264bf4db98dd436254d5c73f2e93fb97 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 14 Sep 2026 15:51:26 +0930
Subject: [PATCH 1/2] Isolate Redis keys per DB matrix entry; use mariadb
 connection

- Set a unique REDIS_PREFIX per matrix entry so cache/queue keys never
  collide (the config default derives the prefix from APP_NAME, which is
  identical across entries).
- Point the MariaDB entry at the 'mariadb' connection instead of 'mysql'
  so the MariaDB driver is actually exercised (Laravel 11 treats them as
  distinct drivers).
---
 .github/workflows/php-laravel-tests-db-matrix.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php-laravel-tests-db-matrix.yml b/.github/workflows/php-laravel-tests-db-matrix.yml
index e5156a946..b86885cbc 100644
--- a/.github/workflows/php-laravel-tests-db-matrix.yml
+++ b/.github/workflows/php-laravel-tests-db-matrix.yml
@@ -28,14 +28,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # MySQL and MariaDB both use the pdo mysql driver; only the service
-          # image differs. Postgres uses the pgsql driver on its own port.
           - db: mysql
             connection: mysql
             host: 127.0.0.1
             port: 3306
           - db: mariadb
-            connection: mysql
+            connection: mariadb
             host: 127.0.0.1
             port: 3307
           - db: pgsql
@@ -154,6 +152,10 @@ jobs:
           DB_PASSWORD: pixelfed
           REDIS_HOST: 127.0.0.1
           REDIS_PORT: 6379
+          # Unique Redis key prefix per matrix entry so cache/queue keys never
+          # collide across databases (the config default derives the prefix
+          # from APP_NAME, which is identical for every entry).
+          REDIS_PREFIX: pixelfed-test-${{ matrix.db }}-
         # `|| true` guarantees a 0 exit code even when the suite fails, so this
         # experimental job always reports success and never affects the score.
         run: vendor/bin/pest --compact || true

From 5bdc18e479c15c1117d1f7bcd539f8fcc6689af8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 14 Sep 2026 15:52:55 +0930
Subject: [PATCH 2/2] Bump DB matrix to PHP 8.5 and mysql 8.5

---
 .github/workflows/php-laravel-tests-db-matrix.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/php-laravel-tests-db-matrix.yml b/.github/workflows/php-laravel-tests-db-matrix.yml
index b86885cbc..d72c49698 100644
--- a/.github/workflows/php-laravel-tests-db-matrix.yml
+++ b/.github/workflows/php-laravel-tests-db-matrix.yml
@@ -57,7 +57,7 @@ jobs:
           --health-retries 5
 
       mysql:
-        image: mysql:8.4
+        image: mysql:8.5
         env:
           MYSQL_ROOT_PASSWORD: pixelfed
           MYSQL_DATABASE: pixelfed_test
@@ -109,7 +109,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql, bcmath, intl, gd, exif, iconv, redis
           coverage: none
           ini-values: memory_limit=512M
@@ -118,8 +118,8 @@ jobs:
         uses: actions/cache@v6
         with:
           path: vendor
-          key: composer-8.4-${{ hashFiles('composer.lock') }}
-          restore-keys: composer-8.4-
+          key: composer-8.5-${{ hashFiles('composer.lock') }}
+          restore-keys: composer-8.5-
 
       - name: Install Composer dependencies
         continue-on-error: true