Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/Filament/Resources/Users/UserResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
Expand Down
4 changes: 2 additions & 2 deletions src/View/ViewManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand All @@ -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) {
Expand Down
Loading