From 3ce43b1ec2e7db5a5ab6bd6b8201f1dba338df11 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Thu, 26 Feb 2026 14:49:01 +0000
Subject: [PATCH 1/2] ci: add php 8.5 as allowed-failure matrix

---
 .github/workflows/run-tests.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 2602e4d4..4a59bf0a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -70,6 +70,12 @@ jobs:
           - php: 8.3
             laravel: 11.x
             stability: prefer-lowest
+          # PHP 8.5 (allowed failure)
+          - php: '8.5'
+            laravel: 13.x
+            stability: prefer-stable
+            allow-failure: true
+    continue-on-error: ${{ matrix.allow-failure || false }}
 
     name: Static Analysis - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 
@@ -113,6 +119,13 @@ jobs:
         php: [8.4, 8.3]
         laravel: [13.x, 12.x, 11.x]
         stability: [prefer-lowest, prefer-stable]
+        include:
+          # PHP 8.5 (allowed failure)
+          - php: '8.5'
+            laravel: 13.x
+            stability: prefer-stable
+            allow-failure: true
+    continue-on-error: ${{ matrix.allow-failure || false }}
 
     name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - SQLite
 
@@ -184,6 +197,12 @@ jobs:
           - php: 8.3
             laravel: 11.x
             stability: prefer-lowest
+          # PHP 8.5 (allowed failure)
+          - php: '8.5'
+            laravel: 13.x
+            stability: prefer-stable
+            allow-failure: true
+    continue-on-error: ${{ matrix.allow-failure || false }}
 
     name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - MySQL 8.0
 
@@ -260,6 +279,12 @@ jobs:
           - php: 8.3
             laravel: 11.x
             stability: prefer-lowest
+          # PHP 8.5 (allowed failure)
+          - php: '8.5'
+            laravel: 13.x
+            stability: prefer-stable
+            allow-failure: true
+    continue-on-error: ${{ matrix.allow-failure || false }}
 
     name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - PostgreSQL 15
 

From 37361c316aabb948e9a094500e22fcd54c8f0965 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Wed, 8 Jul 2026 10:06:31 +0100
Subject: [PATCH 2/2] Fix implicit null array key usage flagged on PHP 8.5

PHP 8.5 deprecates implicit null-to-string array key coercion. Both
sites already stored these entries under the coerced '' key at runtime,
so making the key explicit is behavior-identical.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 src/Filament/Resources/Users/UserResource.php | 2 +-
 src/View/ViewManager.php                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Filament/Resources/Users/UserResource.php b/src/Filament/Resources/Users/UserResource.php
index bbf836a1..82a67a87 100644
--- a/src/Filament/Resources/Users/UserResource.php
+++ b/src/Filament/Resources/Users/UserResource.php
@@ -89,7 +89,7 @@ public static function form(Schema $schema): Schema
                     Select::make('preferred_locale')
                         ->selectablePlaceholder(false)
                         ->options([
-                            null => __('cachet::user.form.preferred_locale_system_default'),
+                            '' => __('cachet::user.form.preferred_locale_system_default'),
                             ...config('cachet.supported_locales'),
                         ])
                         ->label(__('cachet::user.form.preferred_locale')),
diff --git a/src/View/ViewManager.php b/src/View/ViewManager.php
index bb2b0e5a..fefe6f41 100644
--- a/src/View/ViewManager.php
+++ b/src/View/ViewManager.php
@@ -24,7 +24,7 @@ public function registerRenderHook(string $name, Closure $hook, string|array|nul
         }
 
         foreach ($scopes as $scopeName) {
-            $this->renderHooks[$name][$scopeName][] = $hook;
+            $this->renderHooks[$name][$scopeName ?? ''][] = $hook;
         }
     }
 
@@ -51,7 +51,7 @@ public function renderHook(string $name, string|array|null $scopes = null): Html
 
         $hooks = array_map(
             $renderHook,
-            $this->renderHooks[$name][null] ?? [],
+            $this->renderHooks[$name][''] ?? [],
         );
 
         foreach ($scopes as $scopeName) {