Remove Group from ClockifyTimeEntriesImporter

.env.ci

@@ -6,7 +6,6 @@ APP_DEBUG=true
 APP_URL=http://localhost
 APP_FORCE_HTTPS=false
 APP_ENABLE_REGISTRATION=true
-SUPER_ADMINS=admin@example.com
 
 # Logging
 LOG_CHANNEL=stack
@@ -65,6 +64,3 @@ GOTENBERG_URL=http://localhost:3000
 
 # Octane
 OCTANE_SERVER=frankenphp
-
-# Inertia
-INERTIA_SSR_ENABLED=false

.env.example

@@ -88,6 +88,3 @@ FORWARD_DB_PORT=54329
 VITE_HOST_NAME=vite.solidtime.test
 VITE_APP_NAME="${APP_NAME}"
 #SAIL_XDEBUG_MODE=develop,debug,coverage
-
-# This app does not ship a Node SSR bundle, so Inertia SSR must stay disabled.
-INERTIA_SSR_ENABLED=false

.env.production

@@ -13,5 +13,3 @@ LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=pgsql
-
-INERTIA_SSR_ENABLED=false

.github/workflows/extension-manifest-check.yml

@@ -1,31 +0,0 @@
-name: Extension Manifest Check
-on:
-  pull_request:
-    paths:
-      - extensions/manifest.json
-      - .github/workflows/extension-manifest-check.yml
-permissions:
-  contents: read
-jobs:
-  check-refs:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v7
-
-      # Extension refs must be pinned to a release tag (vX.Y.Z) or a full commit
-      # SHA. Branch names (main, feature/foo, ...) are only acceptable while
-      # developing and must be replaced before the pull request is merged.
-      - name: "Check extension refs are pinned"
-        run: |
-          failed=0
-          while IFS=$'\t' read -r name ref; do
-            if [[ "$ref" =~ ^v[0-9]+\.[0-9]+\.[0-9]+([-+][0-9A-Za-z.]+)?$ ]] || [[ "$ref" =~ ^[0-9a-f]{40}$ ]]; then
-              echo "✅ $name: $ref"
-            else
-              echo "::error file=extensions/manifest.json::Extension \"$name\" uses ref \"$ref\", which is not a release tag or commit SHA. Pin it before merging."
-              failed=1
-            fi
-          done < <(jq -r 'to_entries[] | [.key, .value.ref] | @tsv' extensions/manifest.json)
-          exit $failed

.gitignore

@@ -6,7 +6,6 @@ dist
 /public/storage
 /public/css
 /public/js
-/public/fonts/filament
 /public/vendor
 /lang/vendor
 /storage/*.key
@@ -44,5 +43,4 @@ yarn-error.log
 /data
 /config/caddy
 /config/composer
-/config/psysh
 /AGENTS.md

app/Auth/ActiveUserProvider.php

@@ -7,7 +7,6 @@ namespace App\Auth;
 use Illuminate\Auth\EloquentUserProvider;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Override;
 
 /**
  * User provider that only resolves non-placeholder users.
@@ -27,7 +26,7 @@ class ActiveUserProvider extends EloquentUserProvider
      * @param  Model|null  $model
      * @return Builder<Model>
      */
-    #[Override]
+    #[\Override]
     protected function newModelQuery($model = null): Builder
     {
         $query = parent::newModelQuery($model);

app/Console/Commands/SelfHost/SelfHostDatabaseConsistency.php

@@ -10,7 +10,6 @@ use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use stdClass;
 
 class SelfHostDatabaseConsistency extends Command
 {
@@ -102,7 +101,7 @@ class SelfHostDatabaseConsistency extends Command
     }
 
     /**
-     * @param  Collection<int, stdClass>  $problems
+     * @param  Collection<int, \stdClass>  $problems
      */
     private function logProblems(Collection $problems, string $message, bool &$hadAProblem): void
     {

app/Console/Commands/SelfHost/SelfHostGenerateKeysCommand.php

@@ -7,7 +7,7 @@ namespace App\Console\Commands\SelfHost;
 use Illuminate\Console\Command;
 use Illuminate\Encryption\Encrypter;
 use Illuminate\Support\Str;
-use phpseclib4\Crypt\RSA;
+use phpseclib3\Crypt\RSA;
 
 class SelfHostGenerateKeysCommand extends Command
 {

app/Exceptions/Api/EntityStillInUseApiException.php

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace App\Exceptions\Api;
 
-use Override;
-
 class EntityStillInUseApiException extends ApiException
 {
     private string $modelToDelete;
@@ -34,7 +32,7 @@ class EntityStillInUseApiException extends ApiException
     /**
      * Get the translated message for the exception.
      */
-    #[Override]
+    #[\Override]
     public function getTranslatedMessage(): string
     {
         return __('exceptions.api.'.$this->getKey(), [

app/Filament/Resources/AuditResource.php

@@ -4,17 +4,13 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\AuditResource\Pages\CreateAudit;
-use App\Filament\Resources\AuditResource\Pages\ListAudits;
-use App\Filament\Resources\AuditResource\Pages\ViewAudit;
+use App\Filament\Resources\AuditResource\Pages;
 use App\Models\Audit;
-use Filament\Actions\ViewAction;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
+use Filament\Forms;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
+use Filament\Tables;
 use Filament\Tables\Columns\IconColumn;
-use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Str;
 use Novadaemon\FilamentPrettyJson\Form\PrettyJsonField;
@@ -23,32 +19,32 @@ class AuditResource extends Resource
 {
     protected static ?string $model = Audit::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-archive-box';
+    protected static ?string $navigationIcon = 'heroicon-o-archive-box';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'System';
+    protected static ?string $navigationGroup = 'System';
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
-                TextInput::make('user_type')
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('user_type')
                     ->maxLength(255),
-                TextInput::make('user_id'),
-                TextInput::make('event')
+                Forms\Components\TextInput::make('user_id'),
+                Forms\Components\TextInput::make('event')
                     ->required()
                     ->maxLength(255),
-                TextInput::make('auditable_type')
+                Forms\Components\TextInput::make('auditable_type')
                     ->required()
                     ->maxLength(255),
-                TextInput::make('auditable_id')
+                Forms\Components\TextInput::make('auditable_id')
                     ->required(),
                 PrettyJsonField::make('old_values'),
                 PrettyJsonField::make('new_values'),
-                Textarea::make('url'),
-                TextInput::make('ip_address'),
-                TextInput::make('user_agent')
+                Forms\Components\Textarea::make('url'),
+                Forms\Components\TextInput::make('ip_address'),
+                Forms\Components\TextInput::make('user_agent')
                     ->maxLength(1023),
-                TextInput::make('tags')
+                Forms\Components\TextInput::make('tags')
                     ->maxLength(255),
             ]);
     }
@@ -57,27 +53,27 @@ class AuditResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('user.name'),
-                TextColumn::make('event'),
-                TextColumn::make('auditable_type'),
-                TextColumn::make('auditable_id'),
+                Tables\Columns\TextColumn::make('user.name'),
+                Tables\Columns\TextColumn::make('event'),
+                Tables\Columns\TextColumn::make('auditable_type'),
+                Tables\Columns\TextColumn::make('auditable_id'),
                 IconColumn::make('was_command')
                     ->getStateUsing(fn (Audit $record) => Str::startsWith($record->url, 'artisan '))
                     ->boolean(),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->sortable()
                     ->dateTime(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->sortable()
                     ->dateTime(),
             ])
             ->filters([
                 //
             ])
-            ->recordActions([
-                ViewAction::make(),
+            ->actions([
+                Tables\Actions\ViewAction::make(),
             ])
-            ->toolbarActions([
+            ->bulkActions([
             ])
             ->defaultSort('created_at', 'desc');
     }
@@ -91,9 +87,9 @@ class AuditResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListAudits::route('/'),
-            'create' => CreateAudit::route('/create'),
-            'view' => ViewAudit::route('/{record}'),
+            'index' => Pages\ListAudits::route('/'),
+            'create' => Pages\CreateAudit::route('/create'),
+            'view' => Pages\ViewAudit::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/ClientResource.php

@@ -4,18 +4,13 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\ClientResource\Pages\CreateClient;
-use App\Filament\Resources\ClientResource\Pages\EditClient;
-use App\Filament\Resources\ClientResource\Pages\ListClients;
+use App\Filament\Resources\ClientResource\Pages;
 use App\Models\Client;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\DeleteBulkAction;
-use Filament\Actions\EditAction;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 
@@ -23,16 +18,16 @@ class ClientResource extends Resource
 {
     protected static ?string $model = Client::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-briefcase';
+    protected static ?string $navigationIcon = 'heroicon-o-briefcase';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Timetracking';
+    protected static ?string $navigationGroup = 'Timetracking';
 
     protected static ?int $navigationSort = 4;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 TextInput::make('name')
                     ->label('Name')
                     ->required(),
@@ -48,17 +43,17 @@ class ClientResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->label('Name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('organization.name')
+                Tables\Columns\TextColumn::make('organization.name')
                     ->sortable()
                     ->label('Organization'),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->label('Created at')
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->label('Updated at')
                     ->sortable(),
             ])
@@ -73,12 +68,12 @@ class ClientResource extends Resource
                     ->relationship('organization', 'id')
                     ->searchable(),
             ])
-            ->recordActions([
-                EditAction::make(),
+            ->actions([
+                Tables\Actions\EditAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
@@ -93,9 +88,9 @@ class ClientResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListClients::route('/'),
-            'create' => CreateClient::route('/create'),
-            'edit' => EditClient::route('/{record}/edit'),
+            'index' => Pages\ListClients::route('/'),
+            'create' => Pages\CreateClient::route('/create'),
+            'edit' => Pages\EditClient::route('/{record}/edit'),
         ];
     }
 }

app/Filament/Resources/ClientResource/Pages/EditClient.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\ClientResource\Pages;
 
 use App\Filament\Resources\ClientResource;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditClient extends EditRecord
@@ -15,7 +15,7 @@ class EditClient extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make()
                 ->icon('heroicon-m-trash'),
         ];
     }

app/Filament/Resources/ClientResource/Pages/ListClients.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\ClientResource\Pages;
 
 use App\Filament\Resources\ClientResource;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 
 class ListClients extends ListRecords
@@ -15,7 +15,7 @@ class ListClients extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
                 ->icon('heroicon-s-plus'),
         ];
     }

app/Filament/Resources/FailedJobResource.php

@@ -7,16 +7,16 @@ namespace App\Filament\Resources;
 use App\Filament\Resources\FailedJobResource\Pages\ListFailedJobs;
 use App\Filament\Resources\FailedJobResource\Pages\ViewFailedJobs;
 use App\Models\FailedJob;
-use Filament\Actions\Action;
-use Filament\Actions\BulkAction;
-use Filament\Actions\DeleteAction;
-use Filament\Actions\DeleteBulkAction;
-use Filament\Actions\ViewAction;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\BulkAction;
+use Filament\Tables\Actions\DeleteAction;
+use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Collection;
@@ -30,19 +30,19 @@ class FailedJobResource extends Resource
 {
     protected static ?string $model = FailedJob::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-exclamation-circle';
+    protected static ?string $navigationIcon = 'heroicon-o-exclamation-circle';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'System';
+    protected static ?string $navigationGroup = 'System';
 
     public static function getNavigationBadge(): ?string
     {
         return (string) FailedJob::query()->count();
     }
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 TextInput::make('uuid')->disabled()->columnSpan(4),
                 TextInput::make('failed_at')->disabled(),
                 TextInput::make('id')->disabled(),
@@ -74,7 +74,7 @@ class FailedJobResource extends Resource
                 TextColumn::make('queue')->sortable()->searchable()->toggleable(isToggledHiddenByDefault: true),
             ])
             ->filters([])
-            ->toolbarActions([
+            ->bulkActions([
                 BulkAction::make('retry')
                     ->icon('heroicon-o-arrow-path')
                     ->label('Retry selected')
@@ -91,7 +91,7 @@ class FailedJobResource extends Resource
                     }),
                 DeleteBulkAction::make(),
             ])
-            ->recordActions([
+            ->actions([
                 DeleteAction::make(),
                 ViewAction::make(),
                 Action::make('retry')

app/Filament/Resources/OrganizationInvitationResource.php

@@ -5,21 +5,14 @@ declare(strict_types=1);
 namespace App\Filament\Resources;
 
 use App\Enums\Role;
-use App\Filament\Resources\OrganizationInvitationResource\Pages\EditOrganizationInvitation;
-use App\Filament\Resources\OrganizationInvitationResource\Pages\ListOrganizationInvitations;
-use App\Filament\Resources\OrganizationInvitationResource\Pages\ViewOrganizationInvitation;
+use App\Filament\Resources\OrganizationInvitationResource\Pages;
 use App\Models\OrganizationInvitation;
 use App\Service\OrganizationInvitationService;
-use Filament\Actions\BulkAction;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\DeleteAction;
-use Filament\Actions\EditAction;
-use Filament\Forms\Components\DateTimePicker;
+use Filament\Forms;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Collection;
 
@@ -29,18 +22,18 @@ class OrganizationInvitationResource extends Resource
 
     protected static ?string $label = 'Invitations';
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-user-plus';
+    protected static ?string $navigationIcon = 'heroicon-o-user-plus';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Users';
+    protected static ?string $navigationGroup = 'Users';
 
     protected static ?int $navigationSort = 9;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
+        return $form
             ->columns(1)
-            ->components([
-                TextInput::make('email')
+            ->schema([
+                Forms\Components\TextInput::make('email')
                     ->label('Email')
                     ->disabledOn(['edit'])
                     ->required(),
@@ -52,11 +45,11 @@ class OrganizationInvitationResource extends Resource
                     ->searchable(['name'])
                     ->disabledOn(['edit'])
                     ->required(),
-                DateTimePicker::make('created_at')
+                Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
                     ->hiddenOn(['create'])
                     ->disabled(),
-                DateTimePicker::make('updated_at')
+                Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
                     ->hiddenOn(['create'])
                     ->disabled(),
@@ -67,17 +60,17 @@ class OrganizationInvitationResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('organization.name')
+                Tables\Columns\TextColumn::make('organization.name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('email')
+                Tables\Columns\TextColumn::make('email')
                     ->sortable(),
-                TextColumn::make('role'),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('role'),
+                Tables\Columns\TextColumn::make('created_at')
                     ->label('Created At')
                     ->dateTime()
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->label('Updated At')
                     ->dateTime()
                     ->sortable()
@@ -87,13 +80,13 @@ class OrganizationInvitationResource extends Resource
             ->filters([
                 //
             ])
-            ->recordActions([
-                EditAction::make(),
-                DeleteAction::make(),
+            ->actions([
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    BulkAction::make('resend')
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\BulkAction::make('resend')
                         ->label('Resend')
                         ->action(function (Collection $records): void {
                             foreach ($records as $organizationInvite) {
@@ -113,9 +106,9 @@ class OrganizationInvitationResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListOrganizationInvitations::route('/'),
-            'edit' => EditOrganizationInvitation::route('/{record}/edit'),
-            'view' => ViewOrganizationInvitation::route('/{record}'),
+            'index' => Pages\ListOrganizationInvitations::route('/'),
+            'edit' => Pages\EditOrganizationInvitation::route('/{record}/edit'),
+            'view' => Pages\ViewOrganizationInvitation::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/OrganizationInvitationResource/Pages/EditOrganizationInvitation.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
 
 use App\Filament\Resources\OrganizationInvitationResource;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditOrganizationInvitation extends EditRecord
@@ -15,7 +15,7 @@ class EditOrganizationInvitation extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make()
                 ->icon('heroicon-m-trash'),
         ];
     }

app/Filament/Resources/OrganizationResource.php

@@ -9,10 +9,7 @@ use App\Enums\DateFormat;
 use App\Enums\IntervalFormat;
 use App\Enums\NumberFormat;
 use App\Enums\TimeFormat;
-use App\Filament\Resources\OrganizationResource\Pages\CreateOrganization;
-use App\Filament\Resources\OrganizationResource\Pages\EditOrganization;
-use App\Filament\Resources\OrganizationResource\Pages\ListOrganizations;
-use App\Filament\Resources\OrganizationResource\Pages\ViewOrganization;
+use App\Filament\Resources\OrganizationResource\Pages;
 use App\Filament\Resources\OrganizationResource\RelationManagers\InvitationsRelationManager;
 use App\Filament\Resources\OrganizationResource\RelationManagers\UsersRelationManager;
 use App\Models\Organization;
@@ -23,45 +20,38 @@ use App\Service\Import\Importers\ImportException;
 use App\Service\Import\Importers\ReportDto;
 use App\Service\Import\ImportService;
 use App\Service\TimezoneService;
-use Brick\Money\IsoCurrencyProvider;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Actions\DeleteAction;
-use Filament\Actions\EditAction;
-use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\FileUpload;
+use Brick\Money\ISOCurrencyProvider;
+use Filament\Forms;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
+use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\IconColumn;
+use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Facades\Storage;
-use League\Flysystem\UnableToReadFile;
 
 class OrganizationResource extends Resource
 {
     protected static ?string $model = Organization::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-building-office-2';
+    protected static ?string $navigationIcon = 'heroicon-o-building-office-2';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Users';
+    protected static ?string $navigationGroup = 'Users';
 
     protected static ?int $navigationSort = 7;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
+        return $form
             ->columns(1)
-            ->components([
-                TextInput::make('name')
+            ->schema([
+                Forms\Components\TextInput::make('name')
                     ->label('Name')
                     ->required()
                     ->maxLength(255),
-                Toggle::make('personal_team')
+                Forms\Components\Toggle::make('personal_team')
                     ->label('Is personal?')
                     ->hiddenOn(['create'])
                     ->required(),
@@ -89,7 +79,7 @@ class OrganizationResource extends Resource
                 Select::make('currency')
                     ->label('Currency')
                     ->options(function (): array {
-                        $currencies = IsoCurrencyProvider::getInstance()->getAvailableCurrencies();
+                        $currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
                         $select = [];
                         foreach ($currencies as $currency) {
                             $select[$currency->getCurrencyCode()] = $currency->getName().' ('.$currency->getCurrencyCode().')';
@@ -99,7 +89,7 @@ class OrganizationResource extends Resource
                     })
                     ->required()
                     ->searchable(),
-                TextInput::make('billable_rate')
+                Forms\Components\TextInput::make('billable_rate')
                     ->label('Billable rate (in Cents)')
                     ->nullable()
                     ->rules([
@@ -109,11 +99,11 @@ class OrganizationResource extends Resource
                         'max:2147483647',
                     ])
                     ->numeric(),
-                DateTimePicker::make('created_at')
+                Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
                     ->hiddenOn(['create'])
                     ->disabled(),
-                DateTimePicker::make('updated_at')
+                Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
                     ->hiddenOn(['create'])
                     ->disabled(),
@@ -127,7 +117,7 @@ class OrganizationResource extends Resource
                 TextColumn::make('name')
                     ->searchable()
                     ->sortable(),
-                IconColumn::make('personal_team')
+                Tables\Columns\IconColumn::make('personal_team')
                     ->boolean()
                     ->label('Is personal?')
                     ->sortable(),
@@ -148,9 +138,9 @@ class OrganizationResource extends Resource
             ->filters([
                 //
             ])
-            ->recordActions([
-                EditAction::make(),
-                DeleteAction::make()
+            ->actions([
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make()
                     ->using(function (Organization $record): void {
                         app(DeletionService::class)->deleteOrganization($record);
                     }),
@@ -168,7 +158,7 @@ class OrganizationResource extends Resource
                             return response()->streamDownload(function () use ($file): void {
                                 echo Storage::disk(config('filesystems.private'))->get($file);
                             }, 'export.zip');
-                        } catch (Exception $exception) {
+                        } catch (\Exception $exception) {
                             report($exception);
                             Notification::make()
                                 ->title('Export failed')
@@ -182,13 +172,9 @@ class OrganizationResource extends Resource
                     ->icon('heroicon-o-inbox-arrow-down')
                     ->action(function (Organization $record, array $data): void {
                         try {
-                            try {
-                                $file = Storage::disk(config('filament.default_filesystem_disk'))->get($data['file']);
-                            } catch (UnableToReadFile) {
-                                $file = null;
-                            }
+                            $file = Storage::disk(config('filament.default_filesystem_disk'))->get($data['file']);
                             if ($file === null) {
-                                throw new ImportException('File not found');
+                                throw new \Exception('File not found');
                             }
                             /** @var string $timezone */
                             $timezone = $data['timezone'];
@@ -223,8 +209,8 @@ class OrganizationResource extends Resource
                         }
                     })
                     ->tooltip(fn (Organization $record): string => 'Import into '.$record->name)
-                    ->schema([
-                        FileUpload::make('file')
+                    ->form([
+                        Forms\Components\FileUpload::make('file')
                             ->label('File')
                             ->required(),
                         Select::make('type')
@@ -244,7 +230,7 @@ class OrganizationResource extends Resource
                             ->required(),
                     ]),
             ])
-            ->toolbarActions([
+            ->bulkActions([
             ]);
     }
 
@@ -259,10 +245,10 @@ class OrganizationResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListOrganizations::route('/'),
-            'create' => CreateOrganization::route('/create'),
-            'edit' => EditOrganization::route('/{record}/edit'),
-            'view' => ViewOrganization::route('/{record}'),
+            'index' => Pages\ListOrganizations::route('/'),
+            'create' => Pages\CreateOrganization::route('/create'),
+            'edit' => Pages\EditOrganization::route('/{record}/edit'),
+            'view' => Pages\ViewOrganization::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/OrganizationResource/Pages/EditOrganization.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Filament\Resources\OrganizationResource\Pages;
 
 use App\Filament\Resources\OrganizationResource;
-use App\Filament\Resources\OrganizationResource\Actions\DeleteOrganization;
 use Filament\Resources\Pages\EditRecord;
 
 class EditOrganization extends EditRecord
@@ -15,7 +14,7 @@ class EditOrganization extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteOrganization::make(),
+            OrganizationResource\Actions\DeleteOrganization::make(),
         ];
     }
 }

app/Filament/Resources/OrganizationResource/Pages/ListOrganizations.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\OrganizationResource\Pages;
 
 use App\Filament\Resources\OrganizationResource;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 
 class ListOrganizations extends ListRecords
@@ -15,7 +15,7 @@ class ListOrganizations extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
                 ->icon('heroicon-s-plus'),
         ];
     }

app/Filament/Resources/OrganizationResource/RelationManagers/InvitationsRelationManager.php

@@ -9,17 +9,12 @@ use App\Filament\Resources\OrganizationInvitationResource;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Service\InvitationService;
-use Filament\Actions\Action;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\CreateAction;
-use Filament\Actions\DeleteAction;
-use Filament\Actions\DetachBulkAction;
-use Filament\Actions\EditAction;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Validation\Rule;
@@ -30,10 +25,10 @@ class InvitationsRelationManager extends RelationManager
 
     protected static ?string $title = 'Invitations';
 
-    public function form(Schema $schema): Schema
+    public function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 TextInput::make('email')
                     ->label('Email')
                     ->disabledOn(['edit'])
@@ -58,33 +53,33 @@ class InvitationsRelationManager extends RelationManager
             ->modelLabel('Invitation')
             ->pluralModelLabel('Invitations')
             ->columns([
-                TextColumn::make('email'),
-                TextColumn::make('role'),
+                Tables\Columns\TextColumn::make('email'),
+                Tables\Columns\TextColumn::make('role'),
             ])
             ->headerActions([
-                CreateAction::make()
+                Tables\Actions\CreateAction::make()
                     ->icon('heroicon-s-plus')
                     ->using(function (array $data, string $model): Model {
                         /** @var Organization $ownerRecord */
                         $ownerRecord = $this->getOwnerRecord();
 
                         return app(InvitationService::class)
-                            ->inviteUser($ownerRecord, $data['email'], ($data['role'] instanceof Role ? $data['role'] : Role::from($data['role'])), auth()->user());
+                            ->inviteUser($ownerRecord, $data['email'], Role::from($data['role']), auth()->user());
                     }),
             ])
-            ->recordActions([
+            ->actions([
                 Action::make('view')
                     ->icon('heroicon-o-eye')
                     ->color('gray')
                     ->url(fn (OrganizationInvitation $record): string => OrganizationInvitationResource::getUrl('view', [
                         'record' => $record->getKey(),
                     ])),
-                EditAction::make(),
-                DeleteAction::make(),
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DetachBulkAction::make(),
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DetachBulkAction::make(),
                 ]),
             ]);
     }

app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php

@@ -12,15 +12,14 @@ use App\Models\Organization;
 use App\Models\User;
 use App\Service\BillableRateService;
 use App\Service\MemberService;
-use Filament\Actions\Action;
-use Filament\Actions\AttachAction;
-use Filament\Actions\DetachAction;
-use Filament\Actions\EditAction;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\AttachAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Validation\Rule;
@@ -29,10 +28,10 @@ class UsersRelationManager extends RelationManager
 {
     protected static string $relationship = 'users';
 
-    public function form(Schema $schema): Schema
+    public function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 Select::make('role')
                     ->options(Role::class),
                 TextInput::make('billable_rate')
@@ -76,17 +75,17 @@ class UsersRelationManager extends RelationManager
                     ->using(function (User $record, array $data): void {
                         /** @var Organization $organization */
                         $organization = $this->getOwnerRecord();
-                        app(MemberService::class)->addMember($record, $organization, ($data['role'] instanceof Role ? $data['role'] : Role::from($data['role'])), true);
+                        app(MemberService::class)->addMember($record, $organization, Role::from($data['role']), true);
                     }),
             ])
-            ->recordActions([
+            ->actions([
                 Action::make('view')
                     ->icon('heroicon-o-eye')
                     ->color('gray')
                     ->url(fn (User $record): string => UserResource::getUrl('view', [
                         'record' => $record->getKey(),
                     ])),
-                EditAction::make()
+                Tables\Actions\EditAction::make()
                     ->using(function (User $record, array $data): User {
                         /** @var Organization $organization */
                         $organization = $this->getOwnerRecord();
@@ -98,10 +97,9 @@ class UsersRelationManager extends RelationManager
                             app(BillableRateService::class)->updateTimeEntriesBillableRateForMember($member);
                         }
 
-                        $newRole = $data['role'] instanceof Role ? $data['role'] : Role::from($data['role']);
-                        if ($newRole->value !== $member->role) {
+                        if ($data['role'] !== $member->role) {
                             try {
-                                app(MemberService::class)->changeRole($member, $organization, $newRole, true);
+                                app(MemberService::class)->changeRole($member, $organization, Role::from($data['role']), true);
                             } catch (ApiException $exception) {
                                 Notification::make()
                                     ->danger()
@@ -115,7 +113,7 @@ class UsersRelationManager extends RelationManager
 
                         return $record;
                     }),
-                DetachAction::make()
+                Tables\Actions\DetachAction::make()
                     ->using(function (User $record): void {
                         /** @var Organization $organization */
                         $organization = $this->getOwnerRecord();
@@ -135,7 +133,7 @@ class UsersRelationManager extends RelationManager
                         }
                     }),
             ])
-            ->toolbarActions([
+            ->bulkActions([
             ]);
     }
 }

app/Filament/Resources/ProjectMemberResource.php

@@ -4,19 +4,12 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\ProjectMemberResource\Pages\CreateProjectMember;
-use App\Filament\Resources\ProjectMemberResource\Pages\EditProjectMember;
-use App\Filament\Resources\ProjectMemberResource\Pages\ListProjectMembers;
-use App\Filament\Resources\ProjectMemberResource\Pages\ViewProjectMembers;
+use App\Filament\Resources\ProjectMemberResource\Pages;
 use App\Models\ProjectMember;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\DeleteBulkAction;
-use Filament\Actions\EditAction;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
+use Filament\Forms;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Table;
 
 class ProjectMemberResource extends Resource
@@ -25,11 +18,11 @@ class ProjectMemberResource extends Resource
 
     protected static bool $shouldRegisterNavigation = false;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
-                TextInput::make('billable_rate')
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('billable_rate')
                     ->label('Billable rate (in Cents)')
                     ->nullable()
                     ->rules([
@@ -39,10 +32,10 @@ class ProjectMemberResource extends Resource
                         'max:2147483647',
                     ])
                     ->numeric(),
-                Select::make('user_id')
+                Forms\Components\Select::make('user_id')
                     ->relationship('user', 'name')
                     ->required(),
-                Select::make('member_id')
+                Forms\Components\Select::make('member_id')
                     ->relationship('member', 'id')
                     ->required(),
             ]);
@@ -52,17 +45,17 @@ class ProjectMemberResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('id')
+                Tables\Columns\TextColumn::make('id')
                     ->label('ID'),
-                TextColumn::make('billable_rate')
+                Tables\Columns\TextColumn::make('billable_rate')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('project.name'),
-                TextColumn::make('user.name'),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('project.name'),
+                Tables\Columns\TextColumn::make('user.name'),
+                Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
@@ -70,12 +63,12 @@ class ProjectMemberResource extends Resource
             ->filters([
                 //
             ])
-            ->recordActions([
-                EditAction::make(),
+            ->actions([
+                Tables\Actions\EditAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
@@ -90,10 +83,10 @@ class ProjectMemberResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListProjectMembers::route('/'),
-            'create' => CreateProjectMember::route('/create'),
-            'edit' => EditProjectMember::route('/{record}/edit'),
-            'view' => ViewProjectMembers::route('/{record}'),
+            'index' => Pages\ListProjectMembers::route('/'),
+            'create' => Pages\CreateProjectMember::route('/create'),
+            'edit' => Pages\EditProjectMember::route('/{record}/edit'),
+            'view' => Pages\ViewProjectMembers::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/ProjectMemberResource/Pages/EditProjectMember.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\ProjectMemberResource\Pages;
 
 use App\Filament\Resources\ProjectMemberResource;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditProjectMember extends EditRecord
@@ -15,7 +15,7 @@ class EditProjectMember extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make()
                 ->icon('heroicon-m-trash'),
         ];
     }

app/Filament/Resources/ProjectMemberResource/Pages/ListProjectMembers.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\ProjectMemberResource\Pages;
 
 use App\Filament\Resources\ProjectMemberResource;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 
 class ListProjectMembers extends ListRecords
@@ -15,7 +15,7 @@ class ListProjectMembers extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
                 ->icon('heroicon-s-plus'),
         ];
     }

app/Filament/Resources/ProjectResource.php

@@ -4,19 +4,14 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\ProjectResource\Pages\CreateProject;
-use App\Filament\Resources\ProjectResource\Pages\EditProject;
-use App\Filament\Resources\ProjectResource\Pages\ListProjects;
+use App\Filament\Resources\ProjectResource\Pages;
 use App\Filament\Resources\ProjectResource\RelationManagers\ProjectMembersRelationManager;
 use App\Models\Project;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\DeleteBulkAction;
-use Filament\Actions\EditAction;
+use Filament\Forms;
 use Filament\Forms\Components\ColorPicker;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
+use Filament\Tables;
 use Filament\Tables\Columns\ColorColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
@@ -26,24 +21,24 @@ class ProjectResource extends Resource
 {
     protected static ?string $model = Project::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-folder';
+    protected static ?string $navigationIcon = 'heroicon-o-folder';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Timetracking';
+    protected static ?string $navigationGroup = 'Timetracking';
 
     protected static ?int $navigationSort = 2;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
-                TextInput::make('name')
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('name')
                     ->label('Name')
                     ->required()
                     ->maxLength(255),
                 ColorPicker::make('color')
                     ->label('Color')
                     ->required(),
-                TextInput::make('billable_rate')
+                Forms\Components\TextInput::make('billable_rate')
                     ->label('Billable rate (in Cents)')
                     ->nullable()
                     ->rules([
@@ -53,7 +48,7 @@ class ProjectResource extends Resource
                         'max:2147483647',
                     ])
                     ->numeric(),
-                Select::make('organization_id')
+                Forms\Components\Select::make('organization_id')
                     ->relationship(name: 'organization', titleAttribute: 'name')
                     ->searchable(['name'])
                     ->required(),
@@ -86,12 +81,12 @@ class ProjectResource extends Resource
                     ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
-            ->recordActions([
-                EditAction::make(),
+            ->actions([
+                Tables\Actions\EditAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
@@ -106,9 +101,9 @@ class ProjectResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListProjects::route('/'),
-            'create' => CreateProject::route('/create'),
-            'edit' => EditProject::route('/{record}/edit'),
+            'index' => Pages\ListProjects::route('/'),
+            'create' => Pages\CreateProject::route('/create'),
+            'edit' => Pages\EditProject::route('/{record}/edit'),
         ];
     }
 }

app/Filament/Resources/ProjectResource/Pages/EditProject.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\ProjectResource\Pages;
 
 use App\Filament\Resources\ProjectResource;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditProject extends EditRecord
@@ -15,7 +15,7 @@ class EditProject extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make()
                 ->icon('heroicon-m-trash'),
         ];
     }

app/Filament/Resources/ProjectResource/Pages/ListProjects.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\ProjectResource\Pages;
 
 use App\Filament\Resources\ProjectResource;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 
 class ListProjects extends ListRecords
@@ -15,7 +15,7 @@ class ListProjects extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
                 ->icon('heroicon-s-plus'),
         ];
     }

app/Filament/Resources/ProjectResource/RelationManagers/ProjectMembersRelationManager.php

@@ -6,10 +6,10 @@ namespace App\Filament\Resources\ProjectResource\RelationManagers;
 
 use App\Filament\Resources\ProjectMemberResource;
 use App\Models\ProjectMember;
-use Filament\Actions\Action;
+use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Table;
 
 class ProjectMembersRelationManager extends RelationManager
@@ -18,10 +18,10 @@ class ProjectMembersRelationManager extends RelationManager
 
     protected static string $relationship = 'members';
 
-    public function form(Schema $schema): Schema
+    public function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
             ]);
     }
 
@@ -30,8 +30,8 @@ class ProjectMembersRelationManager extends RelationManager
         return $table
             ->recordTitleAttribute('name')
             ->columns([
-                TextColumn::make('user.name'),
-                TextColumn::make('billable_rate')
+                Tables\Columns\TextColumn::make('user.name'),
+                Tables\Columns\TextColumn::make('billable_rate')
                     ->numeric()
                     ->sortable(),
             ])
@@ -40,7 +40,7 @@ class ProjectMembersRelationManager extends RelationManager
             ])
             ->headerActions([
             ])
-            ->recordActions([
+            ->actions([
                 Action::make('view')
                     ->icon('heroicon-o-eye')
                     ->color('gray')
@@ -54,7 +54,7 @@ class ProjectMembersRelationManager extends RelationManager
                     ]))
                     ->openUrlInNewTab(),
             ])
-            ->toolbarActions([
+            ->bulkActions([
             ]);
     }
 }

app/Filament/Resources/ReportResource.php

@@ -4,21 +4,16 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\ReportResource\Pages\EditReport;
-use App\Filament\Resources\ReportResource\Pages\ListReports;
-use App\Filament\Resources\ReportResource\Pages\ViewReport;
+use App\Filament\Resources\ReportResource\Pages;
 use App\Models\Report;
 use App\Service\Dto\ReportPropertiesDto;
-use Filament\Actions\Action;
-use Filament\Actions\DeleteAction;
-use Filament\Actions\EditAction;
-use Filament\Actions\ViewAction;
+use Filament\Forms;
 use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\ToggleColumn;
 use Filament\Tables\Filters\SelectFilter;
@@ -29,22 +24,22 @@ class ReportResource extends Resource
 {
     protected static ?string $model = Report::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-document-chart-bar';
+    protected static ?string $navigationIcon = 'heroicon-o-document-chart-bar';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Timetracking';
+    protected static ?string $navigationGroup = 'Timetracking';
 
     protected static ?int $navigationSort = 7;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
+        return $form
             ->columns(1)
-            ->components([
-                TextInput::make('name')
+            ->schema([
+                Forms\Components\TextInput::make('name')
                     ->label('Name')
                     ->required()
                     ->maxLength(255),
-                TextInput::make('description')
+                Forms\Components\TextInput::make('description')
                     ->label('Description')
                     ->nullable()
                     ->maxLength(255),
@@ -54,13 +49,13 @@ class ReportResource extends Resource
                 DateTimePicker::make('public_until')
                     ->label('Public until')
                     ->nullable(),
-                Select::make('organization_id')
+                Forms\Components\Select::make('organization_id')
                     ->label('Organization')
                     ->relationship(name: 'organization', titleAttribute: 'name')
                     ->searchable(['name'])
                     ->disabled()
                     ->required(),
-                TextInput::make('share_secret')
+                Forms\Components\TextInput::make('share_secret')
                     ->label('Share Secret')
                     ->nullable(),
                 PrettyJsonField::make('properties')
@@ -114,18 +109,18 @@ class ReportResource extends Resource
                     ->relationship('organization', 'id')
                     ->searchable(),
             ])
-            ->recordActions([
+            ->actions([
                 Action::make('public-view')
                     ->label('Public')
                     ->icon('heroicon-o-eye')
                     ->color('gray')
                     ->hidden(fn (Report $record): bool => $record->getShareableLink() === null)
                     ->url(fn (Report $record): string => $record->getShareableLink(), true),
-                ViewAction::make(),
-                EditAction::make(),
-                DeleteAction::make(),
+                Tables\Actions\ViewAction::make(),
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make(),
             ])
-            ->toolbarActions([
+            ->bulkActions([
             ]);
     }
 
@@ -138,9 +133,9 @@ class ReportResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListReports::route('/'),
-            'edit' => EditReport::route('/{record}/edit'),
-            'view' => ViewReport::route('/{record}'),
+            'index' => Pages\ListReports::route('/'),
+            'edit' => Pages\EditReport::route('/{record}/edit'),
+            'view' => Pages\ViewReport::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/ReportResource/Pages/EditReport.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\ReportResource\Pages;
 
 use App\Filament\Resources\ReportResource;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditReport extends EditRecord
@@ -15,7 +15,7 @@ class EditReport extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make()
                 ->icon('heroicon-m-trash'),
         ];
     }

app/Filament/Resources/TagResource.php

@@ -4,18 +4,13 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\TagResource\Pages\CreateTag;
-use App\Filament\Resources\TagResource\Pages\EditTag;
-use App\Filament\Resources\TagResource\Pages\ListTags;
+use App\Filament\Resources\TagResource\Pages;
 use App\Models\Tag;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\DeleteBulkAction;
-use Filament\Actions\EditAction;
-use Filament\Forms\Components\Select;
+use Filament\Forms;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 
@@ -23,20 +18,20 @@ class TagResource extends Resource
 {
     protected static ?string $model = Tag::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-tag';
+    protected static ?string $navigationIcon = 'heroicon-o-tag';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Timetracking';
+    protected static ?string $navigationGroup = 'Timetracking';
 
     protected static ?int $navigationSort = 5;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 TextInput::make('name')
                     ->label('Name')
                     ->required(),
-                Select::make('organization_id')
+                Forms\Components\Select::make('organization_id')
                     ->relationship(name: 'organization', titleAttribute: 'name')
                     ->label('Organization')
                     ->searchable(['name'])
@@ -48,17 +43,17 @@ class TagResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->label('Name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('organization.name')
+                Tables\Columns\TextColumn::make('organization.name')
                     ->sortable()
                     ->label('Organization'),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->label('Created at')
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->label('Updated at')
                     ->sortable(),
             ])
@@ -73,12 +68,12 @@ class TagResource extends Resource
                     ->relationship('organization', 'id')
                     ->searchable(),
             ])
-            ->recordActions([
-                EditAction::make(),
+            ->actions([
+                Tables\Actions\EditAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
@@ -93,9 +88,9 @@ class TagResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListTags::route('/'),
-            'create' => CreateTag::route('/create'),
-            'edit' => EditTag::route('/{record}/edit'),
+            'index' => Pages\ListTags::route('/'),
+            'create' => Pages\CreateTag::route('/create'),
+            'edit' => Pages\EditTag::route('/{record}/edit'),
         ];
     }
 }

app/Filament/Resources/TagResource/Pages/EditTag.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\TagResource\Pages;
 
 use App\Filament\Resources\TagResource;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditTag extends EditRecord
@@ -15,7 +15,7 @@ class EditTag extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make()
                 ->icon('heroicon-m-trash'),
         ];
     }

app/Filament/Resources/TagResource/Pages/ListTags.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\TagResource\Pages;
 
 use App\Filament\Resources\TagResource;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 
 class ListTags extends ListRecords
@@ -15,7 +15,7 @@ class ListTags extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
                 ->icon('heroicon-s-plus'),
         ];
     }

app/Filament/Resources/TaskResource.php

@@ -4,18 +4,13 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\TaskResource\Pages\CreateTask;
-use App\Filament\Resources\TaskResource\Pages\EditTask;
-use App\Filament\Resources\TaskResource\Pages\ListTasks;
+use App\Filament\Resources\TaskResource\Pages;
 use App\Models\Task;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\DeleteBulkAction;
-use Filament\Actions\EditAction;
+use Filament\Forms;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 
@@ -23,17 +18,17 @@ class TaskResource extends Resource
 {
     protected static ?string $model = Task::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-list-bullet';
+    protected static ?string $navigationIcon = 'heroicon-o-list-bullet';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Timetracking';
+    protected static ?string $navigationGroup = 'Timetracking';
 
     protected static ?int $navigationSort = 3;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
-                TextInput::make('name')
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('name')
                     ->label('Name')
                     ->required()
                     ->maxLength(255),
@@ -52,16 +47,16 @@ class TaskResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('project.name')
+                Tables\Columns\TextColumn::make('project.name')
                     ->sortable(),
-                TextColumn::make('organization.name')
+                Tables\Columns\TextColumn::make('organization.name')
                     ->sortable(),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->sortable(),
             ])
             ->filters([
@@ -75,12 +70,12 @@ class TaskResource extends Resource
                     ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
-            ->recordActions([
-                EditAction::make(),
+            ->actions([
+                Tables\Actions\EditAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
@@ -95,9 +90,9 @@ class TaskResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListTasks::route('/'),
-            'create' => CreateTask::route('/create'),
-            'edit' => EditTask::route('/{record}/edit'),
+            'index' => Pages\ListTasks::route('/'),
+            'create' => Pages\CreateTask::route('/create'),
+            'edit' => Pages\EditTask::route('/{record}/edit'),
         ];
     }
 }

app/Filament/Resources/TaskResource/Pages/EditTask.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\TaskResource\Pages;
 
 use App\Filament\Resources\TaskResource;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditTask extends EditRecord
@@ -15,7 +15,7 @@ class EditTask extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make()
                 ->icon('heroicon-m-trash'),
         ];
     }

app/Filament/Resources/TaskResource/Pages/ListTasks.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\TaskResource\Pages;
 
 use App\Filament\Resources\TaskResource;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 
 class ListTasks extends ListRecords
@@ -15,7 +15,7 @@ class ListTasks extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
                 ->icon('heroicon-s-plus'),
         ];
     }

app/Filament/Resources/TimeEntryResource.php

@@ -4,20 +4,16 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\TimeEntryResource\Pages\CreateTimeEntry;
-use App\Filament\Resources\TimeEntryResource\Pages\EditTimeEntry;
-use App\Filament\Resources\TimeEntryResource\Pages\ListTimeEntries;
+use App\Filament\Resources\TimeEntryResource\Pages;
 use App\Models\Member;
 use App\Models\TimeEntry;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\DeleteBulkAction;
-use Filament\Actions\EditAction;
 use Filament\Forms\Components\DateTimePicker;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
+use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
@@ -27,16 +23,16 @@ class TimeEntryResource extends Resource
 {
     protected static ?string $model = TimeEntry::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-clock';
+    protected static ?string $navigationIcon = 'heroicon-o-clock';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Timetracking';
+    protected static ?string $navigationGroup = 'Timetracking';
 
     protected static ?int $navigationSort = 1;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 TextInput::make('id')
                     ->label('ID')
                     ->readOnly()
@@ -115,12 +111,12 @@ class TimeEntryResource extends Resource
                     ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
-            ->recordActions([
-                EditAction::make(),
+            ->actions([
+                Tables\Actions\EditAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
@@ -135,9 +131,9 @@ class TimeEntryResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListTimeEntries::route('/'),
-            'create' => CreateTimeEntry::route('/create'),
-            'edit' => EditTimeEntry::route('/{record}/edit'),
+            'index' => Pages\ListTimeEntries::route('/'),
+            'create' => Pages\CreateTimeEntry::route('/create'),
+            'edit' => Pages\EditTimeEntry::route('/{record}/edit'),
         ];
     }
 }

app/Filament/Resources/TimeEntryResource/Pages/EditTimeEntry.php

@@ -6,7 +6,7 @@ namespace App\Filament\Resources\TimeEntryResource\Pages;
 
 use App\Filament\Resources\TimeEntryResource;
 use App\Models\Member;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditTimeEntry extends EditRecord
@@ -16,7 +16,7 @@ class EditTimeEntry extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make()
                 ->icon('heroicon-m-trash'),
         ];
     }

app/Filament/Resources/TimeEntryResource/Pages/ListTimeEntries.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\TimeEntryResource\Pages;
 
 use App\Filament\Resources\TimeEntryResource;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 
 class ListTimeEntries extends ListRecords
@@ -15,7 +15,7 @@ class ListTimeEntries extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
                 ->icon('heroicon-s-plus'),
         ];
     }

app/Filament/Resources/TokenResource.php

@@ -4,18 +4,12 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\TokenResource\Pages\ListTokens;
-use App\Filament\Resources\TokenResource\Pages\ViewToken;
+use App\Filament\Resources\TokenResource\Pages;
 use App\Models\Passport\Token;
-use Filament\Actions\ViewAction;
-use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
+use Filament\Forms;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\IconColumn;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Filters\TernaryFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
@@ -24,48 +18,48 @@ class TokenResource extends Resource
 {
     protected static ?string $model = Token::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-key';
+    protected static ?string $navigationIcon = 'heroicon-o-key';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Auth';
+    protected static ?string $navigationGroup = 'Auth';
 
     protected static ?int $navigationSort = 6;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
+        return $form
             ->columns(1)
-            ->components([
-                TextInput::make('id')
+            ->schema([
+                Forms\Components\TextInput::make('id')
                     ->label('ID')
                     ->disabled()
                     ->visibleOn(['update', 'show'])
                     ->readOnly()
                     ->maxLength(255),
-                TextInput::make('name')
+                Forms\Components\TextInput::make('name')
                     ->label('Name')
                     ->required()
                     ->maxLength(255),
-                Select::make('owner_id')
+                Forms\Components\Select::make('owner_id')
                     ->label('User')
                     ->relationship(name: 'user', titleAttribute: 'name')
                     ->searchable(['name'])
                     ->disabled()
                     ->required(),
-                Select::make('client_id')
+                Forms\Components\Select::make('client_id')
                     ->label('Client')
                     ->relationship(name: 'client', titleAttribute: 'name')
                     ->searchable(['name'])
                     ->required(),
-                Toggle::make('revoked')
+                Forms\Components\Toggle::make('revoked')
                     ->label('Revoked')
                     ->required(),
-                DateTimePicker::make('expires_at')
+                Forms\Components\DateTimePicker::make('expires_at')
                     ->label('Expires At')
                     ->disabled(),
-                DateTimePicker::make('created_at')
+                Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
                     ->disabled(),
-                DateTimePicker::make('updated_at')
+                Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
                     ->disabled(),
             ]);
@@ -75,32 +69,32 @@ class TokenResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('user.name')
+                Tables\Columns\TextColumn::make('user.name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('client.name')
+                Tables\Columns\TextColumn::make('client.name')
                     ->searchable()
                     ->sortable(),
-                IconColumn::make('personal_access_client')
+                Tables\Columns\IconColumn::make('personal_access_client')
                     ->state(function (Token $token): bool {
                         return in_array('personal_access', $token->client->grant_types ?? [], true);
                     })
                     ->boolean()
                     ->label('API token?'),
-                IconColumn::make('revoked')
+                Tables\Columns\IconColumn::make('revoked')
                     ->boolean()
                     ->label('Revoked?')
                     ->sortable(),
-                TextColumn::make('expires_at')
+                Tables\Columns\TextColumn::make('expires_at')
                     ->dateTime()
                     ->sortable(),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
@@ -126,10 +120,10 @@ class TokenResource extends Resource
                 TernaryFilter::make('revoked')
                     ->label('Revoked?'),
             ])
-            ->recordActions([
-                ViewAction::make(),
+            ->actions([
+                Tables\Actions\ViewAction::make(),
             ])
-            ->toolbarActions([
+            ->bulkActions([
             ]);
     }
 
@@ -142,8 +136,8 @@ class TokenResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListTokens::route('/'),
-            'view' => ViewToken::route('/{record}'),
+            'index' => Pages\ListTokens::route('/'),
+            'view' => Pages\ViewToken::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/UserResource.php

@@ -6,30 +6,21 @@ namespace App\Filament\Resources;
 
 use App\Enums\Weekday;
 use App\Exceptions\Api\ApiException;
-use App\Filament\Resources\UserResource\Pages\CreateUser;
-use App\Filament\Resources\UserResource\Pages\EditUser;
-use App\Filament\Resources\UserResource\Pages\ListUsers;
-use App\Filament\Resources\UserResource\Pages\ViewUser;
+use App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource\RelationManagers\OrganizationsRelationManager;
 use App\Filament\Resources\UserResource\RelationManagers\OwnedOrganizationsRelationManager;
 use App\Models\User;
 use App\Service\DeletionService;
 use App\Service\TimezoneService;
 use App\Service\UserService;
-use Brick\Money\IsoCurrencyProvider;
+use Brick\Money\ISOCurrencyProvider;
 use Exception;
-use Filament\Actions\BulkAction;
-use Filament\Actions\DeleteAction;
-use Filament\Actions\EditAction;
-use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Select;
+use Filament\Forms;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
+use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\IconColumn;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Filters\TernaryFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
@@ -37,26 +28,26 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
-use STS\FilamentImpersonate\Actions\Impersonate;
+use STS\FilamentImpersonate\Tables\Actions\Impersonate;
 
 class UserResource extends Resource
 {
     protected static ?string $model = User::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-user';
+    protected static ?string $navigationIcon = 'heroicon-o-user';
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Users';
+    protected static ?string $navigationGroup = 'Users';
 
     protected static ?int $navigationSort = 6;
 
-    public static function form(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
         /** @var User|null $record */
-        $record = $schema->getRecord();
+        $record = $form->getRecord();
 
-        return $schema
+        return $form
             ->columns(1)
-            ->components([
+            ->schema([
                 TextInput::make('id')
                     ->label('ID')
                     ->disabled()
@@ -78,23 +69,23 @@ class UserResource extends Resource
                         'email:rfc,strict',
                     ])
                     ->maxLength(255),
-                Toggle::make('is_placeholder')
+                Forms\Components\Toggle::make('is_placeholder')
                     ->label('Is Placeholder?')
                     ->hiddenOn(['create'])
                     ->disabledOn(['edit']),
-                DateTimePicker::make('email_verified_at')
+                Forms\Components\DateTimePicker::make('email_verified_at')
                     ->label('Email Verified At')
                     ->hiddenOn(['create'])
                     ->nullable(),
-                Toggle::make('is_email_verified')
+                Forms\Components\Toggle::make('is_email_verified')
                     ->label('Email Verified?')
                     ->visibleOn(['create']),
-                Select::make('timezone')
+                Forms\Components\Select::make('timezone')
                     ->label('Timezone')
                     ->options(fn (): array => app(TimezoneService::class)->getSelectOptions())
                     ->searchable()
                     ->required(),
-                Select::make('week_start')
+                Forms\Components\Select::make('week_start')
                     ->label('Week Start')
                     ->options(Weekday::class)
                     ->required(),
@@ -112,10 +103,10 @@ class UserResource extends Resource
                     ->visibleOn(['create'])
                     ->required(fn (string $context): bool => $context === 'create')
                     ->maxLength(255),
-                Select::make('currency')
+                Forms\Components\Select::make('currency')
                     ->label('Currency (Personal Organization)')
                     ->options(function (): array {
-                        $currencies = IsoCurrencyProvider::getInstance()->getAvailableCurrencies();
+                        $currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
                         $select = [];
                         foreach ($currencies as $currency) {
                             $select[$currency->getCurrencyCode()] = $currency->getName().' ('.$currency->getCurrencyCode().')';
@@ -126,11 +117,11 @@ class UserResource extends Resource
                     ->required()
                     ->visibleOn(['create'])
                     ->searchable(),
-                DateTimePicker::make('created_at')
+                Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
                     ->hiddenOn(['create'])
                     ->disabled(),
-                DateTimePicker::make('updated_at')
+                Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
                     ->hiddenOn(['create'])
                     ->disabled(),
@@ -141,25 +132,25 @@ class UserResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('email')
+                Tables\Columns\TextColumn::make('email')
                     ->icon('heroicon-m-envelope')
                     ->searchable()
                     ->sortable(),
-                IconColumn::make('is_real_user')
+                Tables\Columns\IconColumn::make('is_real_user')
                     ->getStateUsing(fn (User $record): bool => ! $record->is_placeholder)
                     ->label('Real user?')
                     ->boolean(),
-                IconColumn::make('email_verified')
+                Tables\Columns\IconColumn::make('email_verified')
                     ->getStateUsing(fn (User $record): bool => $record->email_verified_at !== null)
                     ->label('Email verified?')
                     ->boolean(),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
@@ -187,7 +178,7 @@ class UserResource extends Resource
                     ->attribute('email_verified_at')
                     ->nullable(),
             ])
-            ->recordActions([
+            ->actions([
                 Impersonate::make()->before(function (User $record): void {
                     if ($record->currentOrganization === null) {
                         $organization = $record->organizations()->where('personal_team', '=', true)->first();
@@ -200,8 +191,8 @@ class UserResource extends Resource
                         app(UserService::class)->switchCurrentOrganization($record, $organization);
                     }
                 }),
-                EditAction::make(),
-                DeleteAction::make()
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make()
                     ->hidden(fn (User $record) => $record->is(Auth::user()))
                     ->using(function (User $record): void {
                         try {
@@ -216,8 +207,8 @@ class UserResource extends Resource
                         }
                     }),
             ])
-            ->toolbarActions([
-                BulkAction::make('Resend verification email')
+            ->bulkActions([
+                Tables\Actions\BulkAction::make('Resend verification email')
                     ->icon('heroicon-o-paper-airplane')
                     ->action(function (Collection $records): void {
                         foreach ($records as $user) {
@@ -239,10 +230,10 @@ class UserResource extends Resource
     public static function getPages(): array
     {
         return [
-            'index' => ListUsers::route('/'),
-            'create' => CreateUser::route('/create'),
-            'edit' => EditUser::route('/{record}/edit'),
-            'view' => ViewUser::route('/{record}'),
+            'index' => Pages\ListUsers::route('/'),
+            'create' => Pages\CreateUser::route('/create'),
+            'edit' => Pages\EditUser::route('/{record}/edit'),
+            'view' => Pages\ViewUser::route('/{record}'),
         ];
     }
 }

app/Filament/Resources/UserResource/Pages/CreateUser.php

@@ -22,7 +22,7 @@ class CreateUser extends CreateRecord
             $data['email'],
             $data['password_create'],
             $data['timezone'],
-            $data['week_start'] instanceof Weekday ? $data['week_start'] : Weekday::from($data['week_start']),
+            Weekday::from($data['week_start']),
             $data['currency'],
             verifyEmail: (bool) $data['is_email_verified']
         );

app/Filament/Resources/UserResource/Pages/EditUser.php

@@ -5,9 +5,8 @@ declare(strict_types=1);
 namespace App\Filament\Resources\UserResource\Pages;
 
 use App\Filament\Resources\UserResource;
-use App\Filament\Resources\UserResource\Actions\DeleteUser;
 use Filament\Resources\Pages\EditRecord;
-use STS\FilamentImpersonate\Actions\Impersonate;
+use STS\FilamentImpersonate\Pages\Actions\Impersonate;
 
 class EditUser extends EditRecord
 {
@@ -17,7 +16,7 @@ class EditUser extends EditRecord
     {
         return [
             Impersonate::make()->record($this->getRecord()),
-            DeleteUser::make(),
+            UserResource\Actions\DeleteUser::make(),
         ];
     }
 }

app/Filament/Resources/UserResource/Pages/ListUsers.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Filament\Resources\UserResource\Pages;
 
 use App\Filament\Resources\UserResource;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 
 class ListUsers extends ListRecords
@@ -15,7 +15,7 @@ class ListUsers extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
                 ->icon('heroicon-s-plus'),
         ];
     }

app/Filament/Resources/UserResource/Pages/ViewUser.php

@@ -7,7 +7,7 @@ namespace App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
-use STS\FilamentImpersonate\Actions\Impersonate;
+use STS\FilamentImpersonate\Pages\Actions\Impersonate;
 
 class ViewUser extends ViewRecord
 {

app/Filament/Resources/UserResource/RelationManagers/OrganizationsRelationManager.php

@@ -11,13 +11,12 @@ use App\Models\Member;
 use App\Models\Organization;
 use App\Models\User;
 use App\Service\MemberService;
-use Filament\Actions\Action;
-use Filament\Actions\DetachAction;
-use Filament\Actions\EditAction;
 use Filament\Forms\Components\Select;
+use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
@@ -25,10 +24,10 @@ class OrganizationsRelationManager extends RelationManager
 {
     protected static string $relationship = 'organizations';
 
-    public function form(Schema $schema): Schema
+    public function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 Select::make('role')
                     ->options(Role::class),
             ]);
@@ -47,22 +46,21 @@ class OrganizationsRelationManager extends RelationManager
             ])
             ->headerActions([
             ])
-            ->recordActions([
+            ->actions([
                 Action::make('view')
                     ->icon('heroicon-o-eye')
                     ->color('gray')
                     ->url(fn (Organization $record): string => OrganizationResource::getUrl('view', [
                         'record' => $record->getKey(),
                     ])),
-                EditAction::make()
+                Tables\Actions\EditAction::make()
                     ->using(function (Organization $record, array $data): Organization {
                         /** @var Member $member */
                         $member = $record->getRelation('membership');
 
-                        $newRole = $data['role'] instanceof Role ? $data['role'] : Role::from($data['role']);
-                        if ($newRole->value !== $member->role) {
+                        if ($data['role'] !== $member->role) {
                             try {
-                                app(MemberService::class)->changeRole($member, $record, $newRole, true);
+                                app(MemberService::class)->changeRole($member, $record, Role::from($data['role']), true);
                             } catch (ApiException $exception) {
                                 Notification::make()
                                     ->danger()
@@ -76,7 +74,7 @@ class OrganizationsRelationManager extends RelationManager
 
                         return $record;
                     }),
-                DetachAction::make()
+                Tables\Actions\DetachAction::make()
                     ->using(function (Organization $record): void {
                         /** @var User $user */
                         $user = $this->getOwnerRecord();
@@ -96,7 +94,7 @@ class OrganizationsRelationManager extends RelationManager
                         }
                     }),
             ])
-            ->toolbarActions([
+            ->bulkActions([
             ]);
     }
 }

app/Filament/Resources/UserResource/RelationManagers/OwnedOrganizationsRelationManager.php

@@ -6,10 +6,10 @@ namespace App\Filament\Resources\UserResource\RelationManagers;
 
 use App\Filament\Resources\OrganizationResource;
 use App\Models\Organization;
-use Filament\Actions\Action;
+use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Schemas\Schema;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Table;
 
 class OwnedOrganizationsRelationManager extends RelationManager
@@ -18,10 +18,10 @@ class OwnedOrganizationsRelationManager extends RelationManager
 
     protected static string $relationship = 'ownedOrganizations';
 
-    public function form(Schema $schema): Schema
+    public function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
             ]);
     }
 
@@ -30,14 +30,14 @@ class OwnedOrganizationsRelationManager extends RelationManager
         return $table
             ->recordTitleAttribute('name')
             ->columns([
-                TextColumn::make('name'),
+                Tables\Columns\TextColumn::make('name'),
             ])
             ->filters([
                 //
             ])
             ->headerActions([
             ])
-            ->recordActions([
+            ->actions([
                 Action::make('view')
                     ->icon('heroicon-o-eye')
                     ->color('gray')
@@ -51,7 +51,7 @@ class OwnedOrganizationsRelationManager extends RelationManager
                     ]))
                     ->openUrlInNewTab(),
             ])
-            ->toolbarActions([
+            ->bulkActions([
             ]);
     }
 }

app/Filament/Widgets/ServerOverview.php

@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Cache;
 
 class ServerOverview extends Widget
 {
-    protected string $view = 'filament.widgets.server-overview';
+    protected static string $view = 'filament.widgets.server-overview';
 
     /**
      * @return array<string, mixed>

app/Filament/Widgets/TimeEntriesCreated.php

@@ -11,7 +11,7 @@ use Flowframe\Trend\TrendValue;
 
 class TimeEntriesCreated extends ChartWidget
 {
-    protected ?string $heading = 'Time Entries Created';
+    protected static ?string $heading = 'Time Entries Created';
 
     public ?string $filter = 'week';
 
@@ -53,7 +53,7 @@ class TimeEntriesCreated extends ChartWidget
         return [
             'datasets' => [
                 [
-                    'label' => $this->heading,
+                    'label' => self::$heading,
                     'data' => $data->map(fn (TrendValue $value) => $value->aggregate),
                 ],
             ],

app/Filament/Widgets/TimeEntriesImported.php

@@ -11,7 +11,7 @@ use Flowframe\Trend\TrendValue;
 
 class TimeEntriesImported extends ChartWidget
 {
-    protected ?string $heading = 'Time Entries Imported';
+    protected static ?string $heading = 'Time Entries Imported';
 
     public ?string $filter = 'week';
 
@@ -53,7 +53,7 @@ class TimeEntriesImported extends ChartWidget
         return [
             'datasets' => [
                 [
-                    'label' => $this->heading,
+                    'label' => self::$heading,
                     'data' => $data->map(fn (TrendValue $value) => $value->aggregate),
                 ],
             ],

app/Filament/Widgets/UserRegistrations.php

@@ -11,7 +11,7 @@ use Flowframe\Trend\TrendValue;
 
 class UserRegistrations extends ChartWidget
 {
-    protected ?string $heading = 'User Registrations';
+    protected static ?string $heading = 'User Registrations';
 
     public ?string $filter = 'week';
 
@@ -54,7 +54,7 @@ class UserRegistrations extends ChartWidget
         return [
             'datasets' => [
                 [
-                    'label' => $this->heading,
+                    'label' => self::$heading,
                     'data' => $data->map(fn (TrendValue $value) => $value->aggregate),
                 ],
             ],

app/Http/Controllers/Api/V1/ApiTokenController.php

@@ -14,7 +14,6 @@ use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Str;
-use RuntimeException;
 
 class ApiTokenController extends Controller
 {
@@ -63,7 +62,7 @@ class ApiTokenController extends Controller
             $tokenModel = $token->getToken();
 
             return new ApiTokenWithAccessTokenResource($tokenModel, $token->accessToken);
-        } catch (RuntimeException $exception) {
+        } catch (\RuntimeException $exception) {
             report($exception);
             if (Str::contains($exception->getMessage(), ['Personal access client not found'])) {
                 throw new PersonalAccessClientIsNotConfiguredException;

app/Http/Controllers/Api/V1/CurrencyController.php

@@ -7,7 +7,7 @@ namespace App\Http\Controllers\Api\V1;
 use App\Http\Controllers\Controller;
 use App\Service\CurrencyService;
 use Brick\Money\Currency;
-use Brick\Money\IsoCurrencyProvider;
+use Brick\Money\ISOCurrencyProvider;
 use Illuminate\Http\JsonResponse;
 
 class CurrencyController extends Controller
@@ -29,7 +29,7 @@ class CurrencyController extends Controller
                 'name' => $currency->getName(),
                 'symbol' => $currencyService->getCurrencySymbol($currency->getCurrencyCode()),
             ],
-            IsoCurrencyProvider::getInstance()->getAvailableCurrencies()
+            ISOCurrencyProvider::getInstance()->getAvailableCurrencies()
         ));
 
         return response()->json($currencies);

app/Http/Controllers/Api/V1/MemberController.php

@@ -33,7 +33,6 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
-use Throwable;
 
 class MemberController extends Controller
 {
@@ -147,7 +146,7 @@ class MemberController extends Controller
      *
      * @throws AuthorizationException
      * @throws OnlyPlaceholdersCanBeMergedIntoAnotherMember
-     * @throws Throwable
+     * @throws \Throwable
      *
      * @operationId mergeMember
      */

app/Http/Controllers/Api/V1/TimeEntryController.php

@@ -55,7 +55,6 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use LogicException;
 use Maatwebsite\Excel\Facades\Excel;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 
@@ -191,9 +190,8 @@ class TimeEntryController extends Controller
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
         if ($roundingType !== null && $roundingMinutes !== null) {
             $select = array_diff($select, ['start', 'end']);
-            // These SQL fragments are generated from a rounding enum and validated minute count.
-            $select[] = DB::raw(app(TimeEntryService::class)->getStartSelectRawForRounding($roundingType, $roundingMinutes).' as start'); // @phpstan-ignore argument.type
-            $select[] = DB::raw(app(TimeEntryService::class)->getEndSelectRawForRounding($roundingType, $roundingMinutes).' as end'); // @phpstan-ignore argument.type
+            $select[] = DB::raw(app(TimeEntryService::class)->getStartSelectRawForRounding($roundingType, $roundingMinutes).' as start');
+            $select[] = DB::raw(app(TimeEntryService::class)->getEndSelectRawForRounding($roundingType, $roundingMinutes).' as end');
         }
         $timeEntriesQuery = TimeEntry::query()
             ->whereBelongsTo($organization, 'organization')
@@ -267,7 +265,7 @@ class TimeEntryController extends Controller
             }
             $viewFile = file_get_contents(resource_path('views/reports/time-entry-index/pdf.blade.php'));
             if ($viewFile === false) {
-                throw new LogicException('View file not found');
+                throw new \LogicException('View file not found');
             }
             $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
             $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntries(
@@ -295,7 +293,7 @@ class TimeEntryController extends Controller
             ]);
             $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-index/pdf-footer.blade.php'));
             if ($footerViewFile === false) {
-                throw new LogicException('View file not found');
+                throw new \LogicException('View file not found');
             }
             $footerHtml = Blade::render($footerViewFile);
             if ($debug) {
@@ -497,7 +495,7 @@ class TimeEntryController extends Controller
             ]);
             $viewFile = file_get_contents(resource_path('views/reports/time-entry-aggregate/pdf.blade.php'));
             if ($viewFile === false) {
-                throw new LogicException('View file not found');
+                throw new \LogicException('View file not found');
             }
             $html = Blade::render($viewFile, [
                 'aggregatedData' => $aggregatedData,
@@ -514,7 +512,7 @@ class TimeEntryController extends Controller
             ]);
             $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-aggregate/pdf-footer.blade.php'));
             if ($footerViewFile === false) {
-                throw new LogicException('View file not found');
+                throw new \LogicException('View file not found');
             }
             $footerHtml = Blade::render($footerViewFile);
             if ($debug) {

app/Http/Controllers/Web/OrganizationController.php

@@ -6,7 +6,7 @@ namespace App\Http\Controllers\Web;
 
 use App\Models\Organization;
 use Brick\Money\Currency;
-use Brick\Money\IsoCurrencyProvider;
+use Brick\Money\ISOCurrencyProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
@@ -53,7 +53,7 @@ class OrganizationController extends Controller
             ],
             'currencies' => array_map(function (Currency $currency): string {
                 return $currency->getName();
-            }, IsoCurrencyProvider::getInstance()->getAvailableCurrencies()),
+            }, ISOCurrencyProvider::getInstance()->getAvailableCurrencies()),
             'permissions' => [
                 'canDeleteTeam' => $this->hasPermission($organization, 'organizations:delete'),
                 'canUpdateTeam' => $this->hasPermission($organization, 'organizations:update'),

app/Http/Controllers/Web/UserProfileController.php

@@ -16,7 +16,6 @@ use Inertia\Inertia;
 use Inertia\Response;
 use Laravel\Fortify\Actions\DisableTwoFactorAuthentication;
 use Laravel\Fortify\Features;
-use stdClass;
 
 class UserProfileController extends Controller
 {
@@ -104,7 +103,7 @@ class UserProfileController extends Controller
     /**
      * Get the current sessions.
      *
-     * @return array<int, object{agent: array{is_desktop: bool, platform: string|null, browser: string|null}, ip_address: string, is_current_device: bool, last_active: string}&stdClass>
+     * @return array<int, object{agent: array{is_desktop: bool, platform: string|null, browser: string|null}, ip_address: string, is_current_device: bool, last_active: string}&\stdClass>
      */
     public function sessions(Request $request): array
     {

app/Http/Kernel.php

@@ -11,7 +11,6 @@ use App\Http\Middleware\EnsureEmailIsVerified;
 use App\Http\Middleware\ForceHttps;
 use App\Http\Middleware\ForceJsonResponse;
 use App\Http\Middleware\HandleInertiaRequests;
-use App\Http\Middleware\PreventRequestForgery;
 use App\Http\Middleware\PreventRequestsDuringMaintenance;
 use App\Http\Middleware\RedirectIfAuthenticated;
 use App\Http\Middleware\ShareInertiaData;
@@ -19,6 +18,7 @@ use App\Http\Middleware\TrimStrings;
 use App\Http\Middleware\TrustHosts;
 use App\Http\Middleware\TrustProxies;
 use App\Http\Middleware\ValidateSignature;
+use App\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Auth\Middleware\RequirePassword;
@@ -68,7 +68,7 @@ class Kernel extends HttpKernel
             AddQueuedCookiesToResponse::class,
             StartSession::class,
             ShareErrorsFromSession::class,
-            PreventRequestForgery::class,
+            VerifyCsrfToken::class,
             SubstituteBindings::class,
             HandleInertiaRequests::class,
             ShareInertiaData::class,

app/Http/Middleware/AuthenticateFilamentPanel.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Middleware;
-
-use Filament\Http\Middleware\Authenticate as Middleware;
-use Illuminate\Http\Request;
-
-class AuthenticateFilamentPanel extends Middleware
-{
-    /**
-     * The admin panel has no login page of its own (it shares the app's
-     * session-based login), so Filament::getLoginUrl() always returns null.
-     * Fall back to the app's login route so guests are redirected instead
-     * of receiving an empty 401 response.
-     */
-    protected function redirectTo($request): ?string
-    {
-        return parent::redirectTo($request) ?? ($request->expectsJson() ? null : route('login'));
-    }
-}

app/Http/Middleware/CheckOrganizationBlocked.php

@@ -9,7 +9,6 @@ use App\Models\Organization;
 use App\Service\BillingContract;
 use Closure;
 use Illuminate\Http\Request;
-use LogicException;
 use Symfony\Component\HttpFoundation\Response;
 
 class CheckOrganizationBlocked
@@ -26,7 +25,7 @@ class CheckOrganizationBlocked
         $organization = $request->route('organization');
 
         if (! ($organization instanceof Organization)) {
-            throw new LogicException('The organization must be loaded before this middleware.');
+            throw new \LogicException('The organization must be loaded before this middleware.');
         }
 
         /** @var BillingContract $billing */

app/Http/Middleware/PreventRequestForgery.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\PreventRequestForgery as Middleware;
-
-class PreventRequestForgery extends Middleware
-{
-    /**
-     * The URIs that should be excluded.
-     *
-     * @var array<int, string>
-     */
-    protected $except = [
-        //
-    ];
-}

app/Http/Middleware/TrustHosts.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Middleware;
 
-use Closure;
 use Illuminate\Http\Middleware\TrustHosts as BaseTrustHosts;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -40,7 +39,7 @@ class TrustHosts extends BaseTrustHosts
     }
 
     /**
-     * @param  Closure(Request):Response  $next
+     * @param  \Closure(Request): Response  $next
      */
     public function handle(Request $request, $next)
     {

app/Http/Middleware/VerifyCsrfToken.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
+
+class VerifyCsrfToken extends Middleware
+{
+    /**
+     * The URIs that should be excluded from CSRF verification.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        //
+    ];
+}

app/Http/Requests/V1/Report/ReportStoreRequest.php

@@ -13,13 +13,11 @@ use App\Enums\Weekday;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use App\Service\TimeEntryFilter;
-use Closure;
 use Illuminate\Contracts\Validation\Rule as LegacyValidationRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
-use LogicException;
 
 /**
  * @property Organization $organization Organization from model binding
@@ -29,7 +27,7 @@ class ReportStoreRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|LegacyValidationRule|Closure>>
+     * @return array<string, array<string|ValidationRule|LegacyValidationRule|\Closure>>
      */
     public function rules(): array
     {
@@ -87,7 +85,7 @@ class ReportStoreRequest extends BaseFormRequest
             ],
             'properties.client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -103,7 +101,7 @@ class ReportStoreRequest extends BaseFormRequest
             ],
             'properties.project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -119,7 +117,7 @@ class ReportStoreRequest extends BaseFormRequest
             ],
             'properties.tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -139,7 +137,7 @@ class ReportStoreRequest extends BaseFormRequest
             ],
             'properties.task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -215,7 +213,7 @@ class ReportStoreRequest extends BaseFormRequest
     {
         $start = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('properties.start'));
         if ($start === null) {
-            throw new LogicException('Start date validation is not working');
+            throw new \LogicException('Start date validation is not working');
         }
 
         return $start;
@@ -225,7 +223,7 @@ class ReportStoreRequest extends BaseFormRequest
     {
         $end = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('properties.end'));
         if ($end === null) {
-            throw new LogicException('End date validation is not working');
+            throw new \LogicException('End date validation is not working');
         }
 
         return $end;

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php

@@ -19,13 +19,11 @@ use App\Models\Tag;
 use App\Models\Task;
 use App\Models\User;
 use App\Service\TimeEntryFilter;
-use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
-use LogicException;
 
 /**
  * @property Organization $organization
@@ -35,7 +33,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|Closure>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
      */
     public function rules(): array
     {
@@ -99,7 +97,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
             ],
             'project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -116,7 +114,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
             ],
             'client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -133,7 +131,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -154,7 +152,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
             ],
             'task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -238,7 +236,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
     {
         $start = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('start'), 'UTC');
         if ($start === null) {
-            throw new LogicException('Start date validation is not working');
+            throw new \LogicException('Start date validation is not working');
         }
 
         return $start;
@@ -248,7 +246,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
     {
         $end = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('end'), 'UTC');
         if ($end === null) {
-            throw new LogicException('End date validation is not working');
+            throw new \LogicException('End date validation is not working');
         }
 
         return $end;

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php

@@ -17,7 +17,6 @@ use App\Models\Tag;
 use App\Models\Task;
 use App\Models\User;
 use App\Service\TimeEntryFilter;
-use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -32,7 +31,7 @@ class TimeEntryAggregateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|Closure>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
      */
     public function rules(): array
     {
@@ -84,7 +83,7 @@ class TimeEntryAggregateRequest extends BaseFormRequest
             ],
             'project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -101,7 +100,7 @@ class TimeEntryAggregateRequest extends BaseFormRequest
             ],
             'client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -118,7 +117,7 @@ class TimeEntryAggregateRequest extends BaseFormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -139,7 +138,7 @@ class TimeEntryAggregateRequest extends BaseFormRequest
             ],
             'task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }

app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php

@@ -15,13 +15,11 @@ use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Service\TimeEntryFilter;
-use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
-use LogicException;
 
 /**
  * @property Organization $organization
@@ -31,7 +29,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|Closure>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
      */
     public function rules(): array
     {
@@ -70,7 +68,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
             ],
             'client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -87,7 +85,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
             ],
             'project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -104,7 +102,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
             ],
             'tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -125,7 +123,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
             ],
             'task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -202,7 +200,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
     {
         $start = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('start'), 'UTC');
         if ($start === null) {
-            throw new LogicException('Start date validation is not working');
+            throw new \LogicException('Start date validation is not working');
         }
 
         return $start;
@@ -212,7 +210,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
     {
         $end = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('end'), 'UTC');
         if ($end === null) {
-            throw new LogicException('End date validation is not working');
+            throw new \LogicException('End date validation is not working');
         }
 
         return $end;

app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php

@@ -15,7 +15,6 @@ use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Service\TimeEntryFilter;
-use Closure;
 use Illuminate\Contracts\Validation\Rule as RuleContract;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
@@ -30,7 +29,7 @@ class TimeEntryIndexRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|RuleContract|Closure>>
+     * @return array<string, array<string|ValidationRule|RuleContract|\Closure>>
      */
     public function rules(): array
     {
@@ -62,7 +61,7 @@ class TimeEntryIndexRequest extends BaseFormRequest
             ],
             'client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -79,7 +78,7 @@ class TimeEntryIndexRequest extends BaseFormRequest
             ],
             'project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -96,7 +95,7 @@ class TimeEntryIndexRequest extends BaseFormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }
@@ -117,7 +116,7 @@ class TimeEntryIndexRequest extends BaseFormRequest
             ],
             'task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryFilter::NONE_VALUE) {
                         return;
                     }

app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php

@@ -12,7 +12,6 @@ use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Service\PermissionStore;
-use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
@@ -27,7 +26,7 @@ class TimeEntryStoreRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|Closure|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|\Closure|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
@@ -95,7 +94,7 @@ class TimeEntryStoreRequest extends BaseFormRequest
             // Type of the time entry (work time or a break)
             'type' => [
                 Rule::enum(TimeEntryType::class),
-                function (string $attribute, mixed $value, Closure $fail): void {
+                function (string $attribute, mixed $value, \Closure $fail): void {
                     if ($value === TimeEntryType::Break->value && ! $this->organization->breaks_enabled) {
                         $fail('Breaks are disabled for this organization.');
                     }

app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php

@@ -13,7 +13,6 @@ use App\Models\Tag;
 use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Service\PermissionStore;
-use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
@@ -30,7 +29,7 @@ class TimeEntryUpdateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|Closure|ValidationRule|\Illuminate\Contracts\Validation\Rule|ProhibitedIf|ConditionalRules>>
+     * @return array<string, array<string|\Closure|ValidationRule|\Illuminate\Contracts\Validation\Rule|ProhibitedIf|ConditionalRules>>
      */
     public function rules(): array
     {
@@ -106,7 +105,7 @@ class TimeEntryUpdateRequest extends BaseFormRequest
             // Type of the time entry (work time or a break)
             'type' => [
                 Rule::enum(TimeEntryType::class),
-                function (string $attribute, mixed $value, Closure $fail) use ($timeEntry): void {
+                function (string $attribute, mixed $value, \Closure $fail) use ($timeEntry): void {
                     // While breaks are disabled, entries that already are breaks may stay
                     // breaks, but converting a work entry to a break is not allowed.
                     if ($value === TimeEntryType::Break->value

app/Models/Organization.php

@@ -19,6 +19,7 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
@@ -99,7 +100,7 @@ class Organization extends Model implements AuditableContract
     /**
      * Get all the users that belong to the team.
      *
-     * @return BelongsToMany<User, $this, Member, 'membership'>
+     * @return BelongsToMany<User, $this, Pivot, 'membership'>
      */
     public function users(): BelongsToMany
     {
@@ -132,7 +133,7 @@ class Organization extends Model implements AuditableContract
     }
 
     /**
-     * @return BelongsToMany<User, $this, Member, 'membership'>
+     * @return BelongsToMany<User, $this, Pivot, 'membership'>
      */
     public function realUsers(): BelongsToMany
     {

app/Models/User.php

@@ -20,6 +20,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Carbon;
@@ -174,7 +175,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
     }
 
     /**
-     * @return BelongsToMany<Organization, $this, Member, 'membership'>
+     * @return BelongsToMany<Organization, $this, Pivot, 'membership'>
      */
     public function organizations(): BelongsToMany
     {
@@ -189,7 +190,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
     }
 
     /**
-     * @return BelongsToMany<Organization, $this, Member, 'membership'>
+     * @return BelongsToMany<Organization, $this, Pivot, 'membership'>
      */
     public function ownedOrganizations(): BelongsToMany
     {

app/Providers/AppServiceProvider.php

@@ -25,7 +25,7 @@ use Dedoc\Scramble\Scramble;
 use Dedoc\Scramble\Support\Generator\OpenApi;
 use Dedoc\Scramble\Support\Generator\SecurityScheme;
 use Dedoc\Scramble\Support\Generator\SecuritySchemes\OAuthFlow;
-use Filament\Schemas\Components\Section;
+use Filament\Forms\Components\Section;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;

app/Providers/Filament/AdminPanelProvider.php

@@ -9,17 +9,17 @@ use App\Filament\Widgets\ServerOverview;
 use App\Filament\Widgets\TimeEntriesCreated;
 use App\Filament\Widgets\TimeEntriesImported;
 use App\Filament\Widgets\UserRegistrations;
-use App\Http\Middleware\AuthenticateFilamentPanel;
+use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Navigation\NavigationGroup;
-use Filament\Pages\Dashboard;
+use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
 use Filament\Support\Colors\Color;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Cookie\Middleware\EncryptCookies;
-use Illuminate\Foundation\Http\Middleware\PreventRequestForgery;
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Routing\Middleware\SubstituteBindings;
 use Illuminate\Session\Middleware\AuthenticateSession;
 use Illuminate\Session\Middleware\StartSession;
@@ -41,7 +41,7 @@ class AdminPanelProvider extends PanelProvider
             ->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
             ->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
             ->pages([
-                Dashboard::class,
+                Pages\Dashboard::class,
             ])
             ->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
             ->widgets([
@@ -51,6 +51,7 @@ class AdminPanelProvider extends PanelProvider
                 TimeEntriesCreated::class,
                 TimeEntriesImported::class,
             ])
+            ->viteTheme('resources/css/filament/admin/theme.css')
             ->plugins([
                 EnvironmentIndicatorPlugin::make()
                     ->color(fn () => match (App::environment()) {
@@ -71,9 +72,6 @@ class AdminPanelProvider extends PanelProvider
                 NavigationGroup::make()
                     ->label('Auth')
                     ->collapsed(),
-                NavigationGroup::make()
-                    ->label('Self Hosting')
-                    ->collapsed(),
             ])
             ->middleware([
                 EncryptCookies::class,
@@ -81,13 +79,13 @@ class AdminPanelProvider extends PanelProvider
                 StartSession::class,
                 AuthenticateSession::class,
                 ShareErrorsFromSession::class,
-                PreventRequestForgery::class,
+                VerifyCsrfToken::class,
                 SubstituteBindings::class,
                 DisableBladeIconComponents::class,
                 DispatchServingFilamentEvent::class,
             ])
             ->authMiddleware([
-                AuthenticateFilamentPanel::class,
+                Authenticate::class,
             ]);
 
         $modules = Module::allEnabled();

app/Rules/CurrencyRule.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Rules;
 
-use Brick\Money\IsoCurrencyProvider;
+use Brick\Money\ISOCurrencyProvider;
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Translation\PotentiallyTranslatedString;
@@ -24,7 +24,7 @@ class CurrencyRule implements ValidationRule
             return;
         }
 
-        $currencies = IsoCurrencyProvider::getInstance()->getAvailableCurrencies();
+        $currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
         if (array_key_exists($value, $currencies)) {
             return;
         }

app/Service/ApiService.php

@@ -15,18 +15,11 @@ use App\Models\User;
 use Exception;
 use Illuminate\Support\Facades\Http;
 use Log;
-use Nwidart\Modules\Facades\Module;
-use Throwable;
 
 class ApiService
 {
     private const string API_URL = 'https://app.solidtime.io/api/v1';
 
-    private function isPremium(): bool
-    {
-        return Module::has('Invoicing');
-    }
-
     public function checkForUpdate(): ?string
     {
         try {
@@ -37,7 +30,6 @@ class ApiService
                     'version' => config('app.version'),
                     'build' => config('app.build'),
                     'url' => config('app.url'),
-                    'is_premium' => $this->isPremium(),
                 ]);
 
             if ($response->status() === 200 && isset($response->json()['version']) && is_string($response->json()['version'])) {
@@ -50,7 +42,7 @@ class ApiService
 
                 return null;
             }
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
             Log::warning('Failed to check for update', [
                 'message' => $e->getMessage(),
             ]);
@@ -69,7 +61,6 @@ class ApiService
                     'version' => config('app.version'),
                     'build' => config('app.build'),
                     'url' => config('app.url'),
-                    'is_premium' => $this->isPremium(),
                     // telemetry data
                     'user_count' => User::count(),
                     'organization_count' => Organization::count(),

app/Service/CurrencyService.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use Brick\Money\IsoCurrencyProvider;
+use Brick\Money\ISOCurrencyProvider;
 use Brick\Money\Money;
 
 class CurrencyService
@@ -378,7 +378,7 @@ class CurrencyService
 
     public function getRandomCurrencyCode(): string
     {
-        $currencies = IsoCurrencyProvider::getInstance()->getAvailableCurrencies();
+        $currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
         $currencyCodes = array_keys($currencies);
 
         return $currencyCodes[array_rand($currencyCodes)];

app/Service/DashboardService.php

@@ -16,7 +16,6 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use RuntimeException;
 
 class DashboardService
 {
@@ -102,7 +101,7 @@ class DashboardService
         $value1 = Carbon::createFromFormat('Y-m-d', $possibleDates->first(), $timeZone);
         $value2 = Carbon::createFromFormat('Y-m-d', $possibleDates->last(), $timeZone);
         if ($value2 === null || $value1 === null) {
-            throw new RuntimeException('Provided date is not valid');
+            throw new \RuntimeException('Provided date is not valid');
         }
         if ($value1->gt($value2)) {
             $last = $value1;
@@ -152,13 +151,12 @@ class DashboardService
 
         $possibleDays = $this->lastDays($days, $timezone);
 
-        // The SQL fragment contains only a timezone offset calculated as an integer.
         $query = TimeEntry::query()
-            ->select(DB::raw('DATE('.$dateWithTimeZone.') as date, round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate')) // @phpstan-ignore argument.type
+            ->select(DB::raw('DATE('.$dateWithTimeZone.') as date, round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate'))
             ->where('user_id', '=', $user->getKey())
             ->where('organization_id', '=', $organization->getKey())
             ->workTime()
-            ->groupBy(DB::raw('DATE('.$dateWithTimeZone.')')) // @phpstan-ignore argument.type
+            ->groupBy(DB::raw('DATE('.$dateWithTimeZone.')'))
             ->orderBy('date');
 
         $query = $this->constrainDateByPossibleDates($query, $possibleDays, $timezone);
@@ -195,13 +193,12 @@ class DashboardService
         }
         $possibleDays = $this->daysOfThisWeek($timezone, $user->week_start);
 
-        // The SQL fragment contains only a timezone offset calculated as an integer.
         $query = TimeEntry::query()
-            ->select(DB::raw('DATE('.$dateWithTimeZone.') as date, round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate')) // @phpstan-ignore argument.type
+            ->select(DB::raw('DATE('.$dateWithTimeZone.') as date, round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate'))
             ->where('user_id', '=', $user->getKey())
             ->where('organization_id', '=', $organization->getKey())
             ->workTime()
-            ->groupBy(DB::raw('DATE('.$dateWithTimeZone.')')) // @phpstan-ignore argument.type
+            ->groupBy(DB::raw('DATE('.$dateWithTimeZone.')'))
             ->orderBy('date');
 
         $query = $this->constrainDateByPossibleDates($query, $possibleDays, $timezone);

app/Service/Dto/ReportPropertiesDto.php

@@ -17,7 +17,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use InvalidArgumentException;
 
 class ReportPropertiesDto implements Castable
 {
@@ -102,15 +101,15 @@ class ReportPropertiesDto implements Castable
             public function get(Model $model, string $key, mixed $value, array $attributes): ReportPropertiesDto
             {
                 if (! is_string($value)) {
-                    throw new InvalidArgumentException('The given value is not a string');
+                    throw new \InvalidArgumentException('The given value is not a string');
                 }
                 $data = json_decode($value, false);
                 if ($data === null) {
-                    throw new InvalidArgumentException('The given value is not a JSON string');
+                    throw new \InvalidArgumentException('The given value is not a JSON string');
                 }
                 foreach (self::REQUIRED_PROPERTIES as $property) {
                     if (! property_exists($data, $property)) {
-                        throw new InvalidArgumentException('The given JSON string does not contain the required property "'.$property.'"');
+                        throw new \InvalidArgumentException('The given JSON string does not contain the required property "'.$property.'"');
                     }
                 }
                 $dto = new ReportPropertiesDto;
@@ -146,7 +145,7 @@ class ReportPropertiesDto implements Castable
             public function set(Model $model, string $key, mixed $value, array $attributes): string
             {
                 if (! ($value instanceof ReportPropertiesDto)) {
-                    throw new InvalidArgumentException('The given value is not an instance of ReportPropertiesDto');
+                    throw new \InvalidArgumentException('The given value is not an instance of ReportPropertiesDto');
                 }
 
                 $data = (object) [
@@ -172,7 +171,7 @@ class ReportPropertiesDto implements Castable
 
                 $jsonString = json_encode($data);
                 if ($jsonString === false) {
-                    throw new InvalidArgumentException('Could not encode the given data to a JSON string');
+                    throw new \InvalidArgumentException('Could not encode the given data to a JSON string');
                 }
 
                 return $jsonString;
@@ -189,10 +188,10 @@ class ReportPropertiesDto implements Castable
         $collection = new Collection;
         foreach ($ids as $id) {
             if (! is_string($id)) {
-                throw new InvalidArgumentException('The given ID is not a string');
+                throw new \InvalidArgumentException('The given ID is not a string');
             }
             if ($id !== TimeEntryFilter::NONE_VALUE && ! Str::isUuid($id)) {
-                throw new InvalidArgumentException('The given ID is not a valid UUID');
+                throw new \InvalidArgumentException('The given ID is not a valid UUID');
             }
             $collection->push($id);
         }

app/Service/Import/ImportDatabaseHelper.php

@@ -9,7 +9,6 @@ use Closure;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Validator;
-use RuntimeException;
 
 /**
  * @template TModel of Model
@@ -134,7 +133,7 @@ class ImportDatabaseHelper
     {
         $jsonData = json_encode($data);
         if ($jsonData === false) {
-            throw new RuntimeException('Failed to encode data to JSON');
+            throw new \RuntimeException('Failed to encode data to JSON');
         }
 
         return md5($jsonData);
@@ -165,7 +164,7 @@ class ImportDatabaseHelper
 
             return $this->createEntity($identifierData, $createValues, $externalIdentifier);
         } else {
-            throw new RuntimeException('Not implemented');
+            throw new \RuntimeException('Not implemented');
         }
     }
 

app/Service/Import/Importers/ClockifyProjectsImporter.php

@@ -9,14 +9,13 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
-use Override;
 
 class ClockifyProjectsImporter extends DefaultImporter
 {
     /**
      * @throws ImportException
      */
-    #[Override]
+    #[\Override]
     public function importData(string $data, string $timezone): void
     {
         try {
@@ -130,13 +129,13 @@ class ClockifyProjectsImporter extends DefaultImporter
         return $billableRateKey;
     }
 
-    #[Override]
+    #[\Override]
     public function getName(): string
     {
         return __('importer.clockify_projects.name');
     }
 
-    #[Override]
+    #[\Override]
     public function getDescription(): string
     {
         return __('importer.clockify_projects.description');

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -15,7 +15,6 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
-use Override;
 
 class ClockifyTimeEntriesImporter extends DefaultImporter
 {
@@ -45,7 +44,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
     /**
      * @throws ImportException
      */
-    #[Override]
+    #[\Override]
     public function importData(string $data, string $timezone): void
     {
         try {
@@ -229,7 +228,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
             'Project',
             'Description',
             'User',
-            'Group',
             'Email',
             'Tags',
             'Start Date',
@@ -264,13 +262,13 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
         return null;
     }
 
-    #[Override]
+    #[\Override]
     public function getName(): string
     {
         return __('importer.clockify_time_entries.name');
     }
 
-    #[Override]
+    #[\Override]
     public function getDescription(): string
     {
         return __('importer.clockify_time_entries.description');

app/Service/Import/Importers/DefaultImporter.php

@@ -18,7 +18,6 @@ use App\Service\ColorService;
 use App\Service\Import\ImportDatabaseHelper;
 use App\Service\TimezoneService;
 use Illuminate\Database\Eloquent\Builder;
-use Override;
 
 abstract class DefaultImporter implements ImporterContract
 {
@@ -194,7 +193,7 @@ abstract class DefaultImporter implements ImporterContract
         }
     }
 
-    #[Override]
+    #[\Override]
     public function getReport(): ReportDto
     {
         return new ReportDto(

app/Service/Import/Importers/GenericTimeEntriesImporter.php

@@ -14,7 +14,6 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
-use Override;
 
 class GenericTimeEntriesImporter extends DefaultImporter
 {
@@ -60,7 +59,7 @@ class GenericTimeEntriesImporter extends DefaultImporter
     /**
      * @throws ImportException
      */
-    #[Override]
+    #[\Override]
     public function importData(string $data, string $timezone): void
     {
         try {
@@ -196,13 +195,13 @@ class GenericTimeEntriesImporter extends DefaultImporter
         }
     }
 
-    #[Override]
+    #[\Override]
     public function getName(): string
     {
         return __('importer.generic_time_entries.name');
     }
 
-    #[Override]
+    #[\Override]
     public function getDescription(): string
     {
         return __('importer.generic_time_entries.description');

app/Service/Import/Importers/HarvestClientsImporter.php

@@ -7,7 +7,6 @@ namespace App\Service\Import\Importers;
 use Exception;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
-use Override;
 
 class HarvestClientsImporter extends DefaultImporter
 {
@@ -21,7 +20,7 @@ class HarvestClientsImporter extends DefaultImporter
     /**
      * @throws ImportException
      */
-    #[Override]
+    #[\Override]
     public function importData(string $data, string $timezone): void
     {
         try {
@@ -63,13 +62,13 @@ class HarvestClientsImporter extends DefaultImporter
         }
     }
 
-    #[Override]
+    #[\Override]
     public function getName(): string
     {
         return __('importer.harvest_clients.name');
     }
 
-    #[Override]
+    #[\Override]
     public function getDescription(): string
     {
         return __('importer.harvest_clients.description');

app/Service/Import/Importers/HarvestProjectsImporter.php

@@ -8,7 +8,6 @@ use Exception;
 use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
-use Override;
 
 class HarvestProjectsImporter extends DefaultImporter
 {
@@ -25,7 +24,7 @@ class HarvestProjectsImporter extends DefaultImporter
     /**
      * @throws ImportException
      */
-    #[Override]
+    #[\Override]
     public function importData(string $data, string $timezone): void
     {
         try {
@@ -94,13 +93,13 @@ class HarvestProjectsImporter extends DefaultImporter
         }
     }
 
-    #[Override]
+    #[\Override]
     public function getName(): string
     {
         return __('importer.harvest_projects.name');
     }
 
-    #[Override]
+    #[\Override]
     public function getDescription(): string
     {
         return __('importer.harvest_projects.description');

app/Service/Import/Importers/ImportException.php

@@ -4,6 +4,4 @@ declare(strict_types=1);
 
 namespace App\Service\Import\Importers;
 
-use Exception;
-
-class ImportException extends Exception {}
+class ImportException extends \Exception {}

app/Service/Import/Importers/ImporterProvider.php

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace App\Service\Import\Importers;
 
-use InvalidArgumentException;
-
 class ImporterProvider
 {
     /**
@@ -51,7 +49,7 @@ class ImporterProvider
     public function getImporter(string $type): ImporterContract
     {
         if (! array_key_exists($type, $this->importers)) {
-            throw new InvalidArgumentException('Invalid importer type');
+            throw new \InvalidArgumentException('Invalid importer type');
         }
 
         return new $this->importers[$type];

app/Service/Import/Importers/TogglTimeEntriesImporter.php

@@ -14,7 +14,6 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
-use Override;
 
 class TogglTimeEntriesImporter extends DefaultImporter
 {
@@ -44,7 +43,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
     /**
      * @throws ImportException
      */
-    #[Override]
+    #[\Override]
     public function importData(string $data, string $timezone): void
     {
         try {
@@ -194,13 +193,13 @@ class TogglTimeEntriesImporter extends DefaultImporter
         }
     }
 
-    #[Override]
+    #[\Override]
     public function getName(): string
     {
         return __('importer.toggl_time_entries.name');
     }
 
-    #[Override]
+    #[\Override]
     public function getDescription(): string
     {
         return __('importer.toggl_time_entries.description');

app/Service/ReportExport/CsvExport.php

@@ -14,7 +14,6 @@ use League\Csv\CannotInsertRecord;
 use League\Csv\Exception;
 use League\Csv\UnavailableStream;
 use League\Csv\Writer;
-use LogicException;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 /**
@@ -117,7 +116,7 @@ abstract class CsvExport
     private function validateRow(array $row): void
     {
         if (array_keys($row) !== static::HEADER) {
-            throw new LogicException('Invalid row');
+            throw new \LogicException('Invalid row');
         }
     }
 }

app/Service/TimeEntryAggregationService.php

@@ -20,7 +20,6 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use InvalidArgumentException;
 
 class TimeEntryAggregationService
 {
@@ -75,9 +74,8 @@ class TimeEntryAggregationService
         $startRawSelect = app(TimeEntryService::class)->getStartSelectRawForRounding($roundingType, $roundingMinutes);
         $endRawSelect = app(TimeEntryService::class)->getEndSelectRawForRounding($roundingType, $roundingMinutes);
 
-        // SQL fragments come from enum cases, integer offsets, and formatted dates.
         $timeEntriesQuery->selectRaw(
-            ($group1Select !== null ? $group1Select.' as group_1,' : ''). // @phpstan-ignore argument.type
+            ($group1Select !== null ? $group1Select.' as group_1,' : '').
             ($group2Select !== null ? $group2Select.' as group_2,' : '').
             ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
             ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
@@ -106,7 +104,7 @@ class TimeEntryAggregationService
                 $baseTotalsPerGroup1Query = $baseTotalsQuery->clone();
                 $baseTotalsPerGroup1 = $baseTotalsPerGroup1Query
                     ->selectRaw(
-                        $group1Select.' as group_1,'. // @phpstan-ignore argument.type
+                        $group1Select.' as group_1,'.
                         ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
                         ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
                     )
@@ -171,7 +169,7 @@ class TimeEntryAggregationService
                 // Reset selects and ordering on the cloned base query
                 $baseTotals = $baseTotalsQuery
                     ->selectRaw(
-                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'. // @phpstan-ignore argument.type
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
                         ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
                     )
                     ->first();
@@ -528,7 +526,7 @@ class TimeEntryAggregationService
     public function timeSlotsBetween(Carbon $start, Carbon $end, string $timezone, Weekday $startOfWeek, TimeEntryAggregationTypeInterval $interval, string $format): Collection
     {
         if ($start->gt($end)) {
-            throw new InvalidArgumentException('Start date must be before end date');
+            throw new \InvalidArgumentException('Start date must be before end date');
         }
         $slots = new Collection;
         $current = $start->copy()->timezone($timezone);
@@ -541,7 +539,7 @@ class TimeEntryAggregationService
         } elseif ($interval === TimeEntryAggregationTypeInterval::Year) {
             $current->startOfYear();
         } else {
-            throw new InvalidArgumentException('Invalid interval');
+            throw new \InvalidArgumentException('Invalid interval');
         }
 
         while ($current->lt($end)) {

app/Service/TimezoneService.php

@@ -6,7 +6,6 @@ namespace App\Service;
 
 use App\Models\User;
 use Carbon\CarbonTimeZone;
-use Exception;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Log;
 
@@ -288,7 +287,7 @@ class TimezoneService
     {
         try {
             return new CarbonTimeZone($user->timezone);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Log::error('User has a invalid timezone', [
                 'user_id' => $user->getKey(),
                 'timezone' => $user->timezone,

app/Service/UserService.php

@@ -20,7 +20,6 @@ use App\Models\User;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Storage;
-use InvalidArgumentException;
 
 class UserService
 {
@@ -149,7 +148,7 @@ class UserService
             ->whereBelongsTo($newOwner, 'user')
             ->first();
         if ($userMembership === null) {
-            throw new InvalidArgumentException('User is not a member of the organization');
+            throw new \InvalidArgumentException('User is not a member of the organization');
         }
         $userMembership->role = Role::Owner->value;
         $userMembership->save();

app/Support/Base64File.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Support;
 
-use finfo;
 use Symfony\Component\Mime\MimeTypes;
 
 class Base64File
@@ -28,7 +27,7 @@ class Base64File
             return null;
         }
 
-        $mimeType = (new finfo(FILEINFO_MIME_TYPE))->buffer($decoded);
+        $mimeType = (new \finfo(FILEINFO_MIME_TYPE))->buffer($decoded);
         if ($mimeType === false) {
             return null;
         }

composer.json

@@ -7,34 +7,34 @@
     "require": {
         "php": "8.3.*",
         "ext-zip": "*",
-        "brick/money": "^0.15.1",
+        "brick/money": "^0.10.0",
         "datomatic/laravel-enum-helper": "^2.0.0",
-        "dedoc/scramble": "^0.13.43",
-        "filament/filament": "^5.0",
-        "flowframe/laravel-trend": "^0.5.0",
+        "dedoc/scramble": "^0.12.2",
+        "filament/filament": "^3.2",
+        "flowframe/laravel-trend": "^0.4.0",
         "gotenberg/gotenberg-php": "^2.8",
-        "guzzlehttp/guzzle": "^8.2",
-        "inertiajs/inertia-laravel": "^3.3.4",
+        "guzzlehttp/guzzle": "^7.2",
+        "inertiajs/inertia-laravel": "^2.0.3",
         "korridor/laravel-computed-attributes": "^3.1",
         "korridor/laravel-has-many-sync": "^3.1",
         "korridor/laravel-model-validation-rules": "^3.0",
         "laravel/fortify": "^1.37",
-        "laravel/framework": "^13.0",
+        "laravel/framework": "^12.19.3",
         "laravel/octane": "^2.3",
         "laravel/passport": "^13.0.5",
-        "laravel/tinker": "^3.0",
+        "laravel/tinker": "^2.8",
         "league/csv": "^9.16.0",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/iso3166": "^4.3",
-        "maatwebsite/excel": "^4.0.3",
+        "maatwebsite/excel": "^3.1",
         "mobiledetect/mobiledetectlib": "^4.11",
-        "novadaemon/filament-pretty-json": "^4.0",
-        "nwidart/laravel-modules": "^13.0.0",
+        "novadaemon/filament-pretty-json": "^2.2",
+        "nwidart/laravel-modules": "^12.0.4",
         "owen-it/laravel-auditing": "^14.0.0",
-        "pxlrbt/filament-environment-indicator": "^3.0",
+        "pxlrbt/filament-environment-indicator": "^2.1.0",
         "spatie/temporary-directory": "^2.2",
         "staudenmeir/eloquent-json-relations": "^1.1",
-        "stechstudio/filament-impersonate": "^5.0",
+        "stechstudio/filament-impersonate": "^3.8",
         "tightenco/ziggy": "^2.1.0",
         "tpetry/laravel-postgresql-enhanced": "^3.0.0",
         "wikimedia/composer-merge-plugin": "^2.1.0"

config/app.php

@@ -24,9 +24,9 @@ return [
     | Application Name
     |--------------------------------------------------------------------------
     |
-    | This value is the name of your application, which will be used when the
+    | This value is the name of your application. This value is used when the
     | framework needs to place the application's name in a notification or
-    | other UI elements where an application name needs to be displayed.
+    | any other location as required by the application or its packages.
     |
     */
 
@@ -110,8 +110,8 @@ return [
     |--------------------------------------------------------------------------
     |
     | Here you may specify the default timezone for your application, which
-    | will be used by the PHP date and date-time functions. The timezone
-    | is set to "UTC" by default as it is suitable for most use cases.
+    | will be used by the PHP date and date-time functions. We have gone
+    | ahead and set this to a sensible default for you out of the box.
     |
     */
 
@@ -123,8 +123,8 @@ return [
     |--------------------------------------------------------------------------
     |
     | The application locale determines the default locale that will be used
-    | by Laravel's translation / localization methods. This option can be
-    | set to any locale for which you plan to have translation strings.
+    | by the translation service provider. You are free to set this value
+    | to any of the locales which will be supported by the application.
     |
     */
 
@@ -178,21 +178,15 @@ return [
     | Encryption Key
     |--------------------------------------------------------------------------
     |
-    | This key is utilized by Laravel's encryption services and should be set
-    | to a random, 32 character string to ensure that all encrypted values
-    | are secure. You should do this prior to deploying the application.
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
     |
     */
 
-    'cipher' => 'AES-256-CBC',
-
     'key' => env('APP_KEY'),
 
-    'previous_keys' => [
-        ...array_filter(
-            explode(',', (string) env('APP_PREVIOUS_KEYS', ''))
-        ),
-    ],
+    'cipher' => 'AES-256-CBC',
 
     'localization' => [
         'default_currency' => env('LOCALIZATION_DEFAULT_CURRENCY', 'EUR'),
@@ -212,13 +206,13 @@ return [
     | manage Laravel's "maintenance mode" status. The "cache" driver will
     | allow maintenance mode to be controlled across multiple machines.
     |
-    | Supported drivers: "file", "cache", "array"
+    | Supported drivers: "file", "cache"
     |
     */
 
     'maintenance' => [
-        'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
-        'store' => env('APP_MAINTENANCE_STORE', 'database'),
+        'driver' => 'file',
+        // 'store' => 'redis',
     ],
 
     /*

config/auth.php

@@ -10,8 +10,8 @@ return [
     | Authentication Defaults
     |--------------------------------------------------------------------------
     |
-    | This option defines the default authentication "guard" and password
-    | reset "broker" for your application. You may change these values
+    | This option controls the default authentication "guard" and password
+    | reset options for your application. You may change these defaults
     | as required, but they're a perfect start for most applications.
     |
     */
@@ -28,11 +28,11 @@ return [
     |
     | Next, you may define every authentication guard for your application.
     | Of course, a great default configuration has been defined for you
-    | which utilizes session storage plus the Eloquent user provider.
+    | here which uses session storage and the Eloquent user provider.
     |
-    | All authentication guards have a user provider, which defines how the
+    | All authentication drivers have a user provider. This defines how the
     | users are actually retrieved out of your database or other storage
-    | system used by the application. Typically, Eloquent is utilized.
+    | mechanisms used by this application to persist your user's data.
     |
     | Supported: "session"
     |
@@ -55,12 +55,12 @@ return [
     | User Providers
     |--------------------------------------------------------------------------
     |
-    | All authentication guards have a user provider, which defines how the
+    | All authentication drivers have a user provider. This defines how the
     | users are actually retrieved out of your database or other storage
-    | system used by the application. Typically, Eloquent is utilized.
+    | mechanisms used by this application to persist your user's data.
     |
     | If you have multiple user tables or models you may configure multiple
-    | providers to represent the model / table. These providers may then
+    | sources which represent each model / table. These sources may then
     | be assigned to any extra authentication guards you have defined.
     |
     | Supported: "database", "eloquent"
@@ -80,9 +80,9 @@ return [
     | Resetting Passwords
     |--------------------------------------------------------------------------
     |
-    | These configuration options specify the behavior of Laravel's password
-    | reset functionality, including the table utilized for token storage
-    | and the user provider that is invoked to actually retrieve users.
+    | You may specify multiple password reset configurations if you have more
+    | than one user table or model in the application and you want to have
+    | separate password reset settings based on the specific user types.
     |
     | The expiry time is the number of minutes that each reset token will be
     | considered valid. This security feature keeps tokens short-lived so
@@ -108,13 +108,13 @@ return [
     | Password Confirmation Timeout
     |--------------------------------------------------------------------------
     |
-    | Here you may define the number of seconds before a password confirmation
-    | window expires and users are asked to re-enter their password via the
+    | Here you may define the amount of seconds before a password confirmation
+    | times out and the user is prompted to re-enter their password via the
     | confirmation screen. By default, the timeout lasts for three hours.
     |
     */
 
-    'password_timeout' => env('AUTH_PASSWORD_TIMEOUT', 10800),
+    'password_timeout' => 10800,
 
     'super_admins' => ! is_string(env('SUPER_ADMINS', null)) ? [] : explode(',', env('SUPER_ADMINS')),
 

config/cache.php

@@ -11,9 +11,9 @@ return [
     | Default Cache Store
     |--------------------------------------------------------------------------
     |
-    | This option controls the default cache store that will be used by the
-    | framework. This connection is utilized if another isn't explicitly
-    | specified when running a cache operation inside the application.
+    | This option controls the default cache connection that gets used while
+    | using this caching library. This connection is used when another is
+    | not explicitly specified when executing a given caching function.
     |
     */
 
@@ -28,9 +28,8 @@ return [
     | well as their drivers. You may even define multiple stores for the
     | same cache driver to group types of items stored in your caches.
     |
-    | Supported drivers: "array", "database", "file", "memcached",
-    |                    "redis", "dynamodb", "storage", "octane",
-    |                    "session", "failover", "null"
+    | Supported drivers: "apc", "array", "database", "file",
+    |         "memcached", "redis", "dynamodb", "octane", "null"
     |
     */
 
@@ -47,10 +46,9 @@ return [
 
         'database' => [
             'driver' => 'database',
-            'connection' => env('DB_CACHE_CONNECTION'),
-            'table' => env('DB_CACHE_TABLE', 'cache'),
-            'lock_connection' => env('DB_CACHE_LOCK_CONNECTION'),
-            'lock_table' => env('DB_CACHE_LOCK_TABLE'),
+            'table' => 'cache',
+            'connection' => null,
+            'lock_connection' => null,
         ],
 
         'file' => [
@@ -59,12 +57,6 @@ return [
             'lock_path' => storage_path('framework/cache/data'),
         ],
 
-        'storage' => [
-            'driver' => 'storage',
-            'disk' => env('CACHE_STORAGE_DISK'),
-            'path' => env('CACHE_STORAGE_PATH', 'framework/cache/data'),
-        ],
-
         'memcached' => [
             'driver' => 'memcached',
             'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
@@ -86,8 +78,8 @@ return [
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => env('REDIS_CACHE_CONNECTION', 'cache'),
-            'lock_connection' => env('REDIS_CACHE_LOCK_CONNECTION', 'default'),
+            'connection' => 'cache',
+            'lock_connection' => 'default',
         ],
 
         'dynamodb' => [
@@ -103,14 +95,6 @@ return [
             'driver' => 'octane',
         ],
 
-        'failover' => [
-            'driver' => 'failover',
-            'stores' => [
-                'database',
-                'array',
-            ],
-        ],
-
     ],
 
     /*
@@ -118,24 +102,12 @@ return [
     | Cache Key Prefix
     |--------------------------------------------------------------------------
     |
-    | When utilizing the APC, database, memcached, Redis, and DynamoDB cache
-    | stores, there might be other applications using the same cache. For
+    | When utilizing the APC, database, memcached, Redis, or DynamoDB cache
+    | stores there might be other applications using the same cache. For
     | that reason, you may prefix every cache key to avoid collisions.
     |
     */
 
     'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Serializable Classes
-    |--------------------------------------------------------------------------
-    |
-    | This value determines the classes that can be unserialized from cache
-    | storage. By default, no PHP classes will be unserialized from your
-    | cache to prevent gadget chain attacks if your APP_KEY is leaked.
-    |
-    */
-
-    'serializable_classes' => false,
 ];

config/database.php

@@ -12,22 +12,26 @@ return [
     |--------------------------------------------------------------------------
     |
     | Here you may specify which of the database connections below you wish
-    | to use as your default connection for database operations. This is
-    | the connection which will be utilized unless another connection
-    | is explicitly specified when you execute a query / statement.
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
     |
     */
 
-    'default' => env('DB_CONNECTION', 'pgsql'),
+    'default' => env('DB_CONNECTION', 'mysql'),
 
     /*
     |--------------------------------------------------------------------------
     | Database Connections
     |--------------------------------------------------------------------------
     |
-    | Below are all of the database connections defined for your application.
-    | An example configuration is provided for each database system which
-    | is supported by Laravel. You're free to add / remove connections.
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
     |
     */
 
@@ -35,34 +39,50 @@ return [
 
         'sqlite' => [
             'driver' => 'sqlite',
-            'url' => env('DB_URL'),
+            'url' => env('DATABASE_URL'),
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
-            'busy_timeout' => null,
-            'journal_mode' => null,
-            'synchronous' => null,
-            'transaction_mode' => 'DEFERRED',
+        ],
+
+        'mysql' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
         ],
 
         'pgsql' => [
             'driver' => 'pgsql',
-            'url' => env('DB_URL'),
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
-            'charset' => env('DB_CHARSET', 'utf8'),
+            'charset' => 'utf8',
             'prefix' => '',
             'prefix_indexes' => true,
             'search_path' => 'public',
-            'sslmode' => env('DB_SSLMODE', 'prefer'),
+            'sslmode' => 'prefer',
         ],
 
         'pgsql_test' => [
             'driver' => 'pgsql',
-            'url' => env('DB_URL'),
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_TEST_HOST', '127.0.0.1'),
             'port' => env('DB_TEST_PORT', '5432'),
             'database' => env('DB_TEST_DATABASE', 'forge'),
@@ -72,18 +92,18 @@ return [
             'prefix' => '',
             'prefix_indexes' => true,
             'search_path' => 'public',
-            'sslmode' => env('DB_SSLMODE', 'prefer'),
+            'sslmode' => 'prefer',
         ],
 
         'sqlsrv' => [
             'driver' => 'sqlsrv',
-            'url' => env('DB_URL'),
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '1433'),
-            'database' => env('DB_DATABASE', 'laravel'),
-            'username' => env('DB_USERNAME', 'root'),
+            'database' => env('DB_DATABASE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
-            'charset' => env('DB_CHARSET', 'utf8'),
+            'charset' => 'utf8',
             'prefix' => '',
             'prefix_indexes' => true,
             // 'encrypt' => env('DB_ENCRYPT', 'yes'),
@@ -99,14 +119,11 @@ return [
     |
     | This table keeps track of all the migrations that have already run for
     | your application. Using this information, we can determine which of
-    | the migrations on disk haven't actually been run on the database.
+    | the migrations on disk haven't actually been run in the database.
     |
     */
 
-    'migrations' => [
-        'table' => 'migrations',
-        'update_date_on_publish' => false,
-    ],
+    'migrations' => 'migrations',
 
     /*
     |--------------------------------------------------------------------------
@@ -115,7 +132,7 @@ return [
     |
     | Redis is an open source, fast, and advanced key-value store that also
     | provides a richer body of commands than a typical key-value system
-    | such as Memcached. You may define your connection settings here.
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
     |
     */
 
@@ -126,7 +143,6 @@ return [
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
             'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
-            'persistent' => env('REDIS_PERSISTENT', false),
         ],
 
         'default' => [
@@ -136,10 +152,6 @@ return [
             'password' => env('REDIS_PASSWORD'),
             'port' => env('REDIS_PORT', '6379'),
             'database' => env('REDIS_DB', '0'),
-            'max_retries' => env('REDIS_MAX_RETRIES', 3),
-            'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
-            'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
-            'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
         ],
 
         'cache' => [
@@ -149,10 +161,6 @@ return [
             'password' => env('REDIS_PASSWORD'),
             'port' => env('REDIS_PORT', '6379'),
             'database' => env('REDIS_CACHE_DB', '1'),
-            'max_retries' => env('REDIS_MAX_RETRIES', 3),
-            'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
-            'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
-            'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
         ],
 
     ],