Merge pull request #257 from ploi/package-updates

Package updates, formatting & fixes

app/Exceptions/Handler.php

@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Sentry\Laravel\Integration;
 use Throwable;
+use Sentry\Laravel\Integration;
 use Illuminate\Routing\Exceptions\InvalidSignatureException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 

app/Filament/Pages/Settings.php

@@ -57,6 +57,7 @@ public function form(Form $form): Form
     {
         return $form->schema([
             Tabs::make('main')
+                ->persistTabInQueryString()
                 ->schema([
                     Tabs\Tab::make('General')
                         ->schema([
@@ -129,10 +130,9 @@ public function form(Form $form): Form
                                     ->options(InboxWorkflow::getSelectOptions())
                                     ->default(InboxWorkflow::WithoutBoardAndProject)
                                     ->helperText('This allows you to change which items show up in the inbox in the sidebar.'),
+                                TextInput::make('password')->helperText('Entering a password here will ask your users to enter a password before entering the roadmap.'),
                             ]),
 
-                            TextInput::make('password')->helperText('Entering a password here will ask your users to enter a password before entering the roadmap.'),
-
                             RichEditor::make('welcome_text')
                                 ->columnSpan(2)
                                 ->helperText('This content will show at the top of the dashboard for (for all users).'),
@@ -270,6 +270,8 @@ public function form(Form $form): Form
                         ->schema([
                             Textarea::make('custom_scripts')
                                 ->label('Custom header script')
+                                ->rows(10)
+                                ->autosize()
                                 ->helperText('This allows you to add your own custom widget, or tracking tool. Code inside here will always be placed inside the head section.')
                                 ->columnSpan(2),
                         ]),

app/Filament/Resources/CommentResource.php

@@ -18,6 +18,8 @@ class CommentResource extends Resource
 
     protected static ?string $navigationGroup = 'Manage';
 
+    protected static ?int $navigationSort = 104;
+
     public static function form(Form $form): Form
     {
         return $form

app/Filament/Resources/InboxResource.php

@@ -24,6 +24,7 @@ class InboxResource extends Resource
     protected static ?string $navigationIcon = 'heroicon-o-inbox';
 
     protected static ?string $navigationGroup = 'Manage';
+    protected static ?int $navigationSort = 100;
 
     protected static ?string $label = 'Inbox';
 

app/Filament/Resources/InboxResource/RelationManagers/CommentsRelationManager.php

@@ -2,12 +2,10 @@
 
 namespace App\Filament\Resources\InboxResource\RelationManagers;
 
-use App\Filament\Resources\CommentResource;
-use Closure;
 use Filament\Tables;
-use Filament\Forms\Form;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
+use App\Filament\Resources\CommentResource;
 use Filament\Resources\RelationManagers\RelationManager;
 
 class CommentsRelationManager extends RelationManager

app/Filament/Resources/ItemResource.php

@@ -33,6 +33,8 @@ class ItemResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'title';
 
+    protected static ?int $navigationSort = 101;
+
     public static function form(Form $form): Form
     {
         $gitHubService = (new GitHubService);

app/Filament/Resources/ItemResource/Pages/EditItem.php

@@ -7,10 +7,10 @@
 use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Toggle;
-use Filament\Notifications\Notification;
 use Filament\Support\Enums\Alignment;
 use Illuminate\Support\Facades\Storage;
 use App\Filament\Resources\ItemResource;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 
 class EditItem extends EditRecord

app/Filament/Resources/ProjectResource.php

@@ -22,6 +22,8 @@ class ProjectResource extends Resource
 
     protected static ?string $navigationGroup = 'Manage';
 
+    protected static ?int $navigationSort = 103;
+
     public static function form(Form $form): Form
     {
         $gitHubService = (new GitHubService);

app/Filament/Resources/TagResource.php

@@ -21,7 +21,7 @@ class TagResource extends Resource
 
     protected static ?string $navigationGroup = 'Manage';
 
-    protected static ?int $navigationSort = 1;
+    protected static ?int $navigationSort = 106;
 
     public static function form(Form $form): Form
     {

app/Filament/Resources/UserResource.php

@@ -10,8 +10,8 @@
 use Filament\Tables\Table;
 use Filament\Resources\Resource;
 use App\Filament\Resources\UserResource\Pages;
-use App\Filament\Resources\UserResource\RelationManagers;
 use STS\FilamentImpersonate\Tables\Actions\Impersonate;
+use App\Filament\Resources\UserResource\RelationManagers;
 
 class UserResource extends Resource
 {

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

@@ -2,10 +2,10 @@
 
 namespace App\Filament\Resources\UserResource\Pages;
 
-use App\Filament\Resources\UserResource;
 use Filament\Actions\DeleteAction;
-use Filament\Resources\Pages\EditRecord;
 use Filament\Support\Colors\Color;
+use App\Filament\Resources\UserResource;
+use Filament\Resources\Pages\EditRecord;
 use STS\FilamentImpersonate\Pages\Actions\Impersonate;
 
 class EditUser extends EditRecord

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

@@ -2,10 +2,10 @@
 
 namespace App\Filament\Resources\UserResource\RelationManagers;
 
-use App\Filament\Resources\ItemResource;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
+use App\Filament\Resources\ItemResource;
 use Filament\Resources\RelationManagers\RelationManager;
 
 class ItemsRelationManager extends RelationManager

app/Filament/Resources/VoteResource.php

@@ -18,6 +18,8 @@ class VoteResource extends Resource
 
     protected static ?string $navigationGroup = 'Manage';
 
+    protected static ?int $navigationSort = 105;
+
     public static function form(Form $form): Form
     {
         return $form

app/Http/Controllers/SitemapController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Board;
 use App\Models\Item;
+use App\Models\Board;
 use App\Models\Project;
 use Spatie\Sitemap\Sitemap;
-use Spatie\Sitemap\SitemapIndex;
 use Spatie\Sitemap\Tags\Url;
+use Spatie\Sitemap\SitemapIndex;
 use Spatie\Sitemap\Tags\Sitemap as TagSitemap;
 
 class SitemapController extends Controller

app/Livewire/Header.php

@@ -104,8 +104,8 @@ public function submitItemAction(): Action
                 if (app(GeneralSettings::class)->select_board_when_creating_item) {
                     $inputs[] = Select::make('board_id')
                         ->label(trans('table.board'))
-                        ->visible(fn($get) => $get('project_id'))
-                        ->options(fn($get) => Project::find($get('project_id'))->boards()->where('can_users_create', true)->pluck('title', 'id'))
+                        ->visible(fn ($get) => $get('project_id'))
+                        ->options(fn ($get) => Project::find($get('project_id'))->boards()->where('can_users_create', true)->pluck('title', 'id'))
                         ->required(app(GeneralSettings::class)->board_required_when_creating_item);
                 }
 

app/Livewire/Item/Create.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Item;
 
-use Filament\Notifications\Notification;
 use function auth;
 use function view;
 use App\Models\Item;
@@ -12,6 +11,7 @@
 use App\Settings\GeneralSettings;
 use Filament\Forms\Contracts\HasForms;
 use Filament\Forms\Components\TextInput;
+use Filament\Notifications\Notification;
 use Filament\Forms\Components\MarkdownEditor;
 use Filament\Forms\Concerns\InteractsWithForms;
 

app/Livewire/Modals/Item/Search.php

@@ -21,7 +21,7 @@ public function table(Table $table): Table
             ->paginated(false)
             ->query(Item::query()->limit(10))
             ->defaultSort('created_at', 'desc')
-            ->recordUrl(fn(Item $record): string => route('items.show', $record->slug))
+            ->recordUrl(fn (Item $record): string => route('items.show', $record->slug))
             ->columns([
                 TextColumn::make('title')->wrap()->searchable(),
                 TextColumn::make('votes_count')->counts('votes')->label(trans('table.total-votes')),

app/Livewire/Profile.php

@@ -147,7 +147,7 @@ public function logoutAction(): Action
             ->modalAlignment(Alignment::Left)
             ->modalDescription('Are you sure you want to do this?')
             ->color(Color::Slate)
-            ->action(fn() => $this->logout());
+            ->action(fn () => $this->logout());
     }
 
     public function deleteAction(): Action
@@ -165,7 +165,7 @@ public function deleteAction(): Action
                     ->helperText('Enter your account\'s email address to delete your account')
                     ->in([auth()->user()->email])
             ])
-            ->action(fn() => $this->delete());
+            ->action(fn () => $this->delete());
     }
 
     public function delete()
@@ -182,7 +182,7 @@ public function getLocalesProperty(): array
         $locales = ResourceBundle::getLocales('');
 
         return collect($locales)
-            ->mapWithKeys(fn($locale) => [$locale => $locale])
+            ->mapWithKeys(fn ($locale) => [$locale => $locale])
             ->toArray();
     }
 

app/Models/Project.php

@@ -4,13 +4,11 @@
 
 use App\Traits\Sluggable;
 use App\Traits\HasOgImage;
-use App\Traits\HasScopeChecks;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
 class Project extends Model
 {

app/Services/SystemChecker.php

@@ -4,8 +4,8 @@
 
 class SystemChecker
 {
-    public $remoteVersion;
-    public $currentVersion;
+    public string|null $remoteVersion;
+    public string|null $currentVersion;
 
     public string $cacheKeyCurrent = 'roadmap-current-version';
     public string $cacheKeyRemote = 'roadmap-remote-version';
@@ -18,29 +18,29 @@ public function getVersions(): self
         return $this;
     }
 
-    public function getApplicationVersion()
+    public function getApplicationVersion(): string|null
     {
         return cache()->remember($this->cacheKeyCurrent, now()->addDay(), function () {
             return shell_exec('git describe --tag --abbrev=0');
         });
     }
 
-    public function getRemoteVersion()
+    public function getRemoteVersion(): string|null
     {
         return cache()->remember($this->cacheKeyRemote, now()->addDay(), function () {
             shell_exec('git fetch --tags');
             return shell_exec('git describe --tags $(git rev-list --tags --max-count=1)');
         });
     }
 
-    public function isOutOfDate()
+    public function isOutOfDate(): bool
     {
         $this->getVersions();
 
         return $this->currentVersion < $this->remoteVersion || $this->currentVersion != $this->remoteVersion;
     }
 
-    public function flushVersionData()
+    public function flushVersionData(): void
     {
         try {
             cache()->forget($this->cacheKeyCurrent);

app/Settings/GeneralSettings.php

@@ -30,7 +30,7 @@ class GeneralSettings extends Settings
     public bool $show_changelog_author;
     public bool $show_changelog_related_items;
     public bool $disable_file_uploads;
-	public bool $disable_user_registration;
+    public bool $disable_user_registration;
     public array $excluded_matching_search_words;
     public array $profanity_words;
     public bool $show_github_link;

app/Traits/HasUpvote.php

@@ -4,11 +4,11 @@
 
 use App\Models\User;
 use App\Models\Vote;
+use Illuminate\Routing\Redirector;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Routing\Redirector;
 
 trait HasUpvote
 {