Merge branch 'main' into dependabot/composer/laravel/helpers-1.7.0

VATSIM-UK · Feb 8, 2024 · a72281c · a72281c
2 parents 31b8a72 + b07aae1
commit a72281c
Show file tree

Hide file tree

Showing 13 changed files with 473 additions and 384 deletions.
diff --git a/app/Console/Commands/NetworkData/ProcessNetworkData.php b/app/Console/Commands/NetworkData/ProcessNetworkData.php
@@ -321,7 +321,7 @@ private function endExpiredPilotSessions($expiringPilots)
     /**
      * Retrieve and cache an airport from the database.
      *
-     * @param $ident string
+     * @param  $ident  string
      * @return mixed
      */
     private function getAirport(string $ident)

diff --git a/app/Filament/Resources/WaitingListResource/Pages/ViewWaitingList.php b/app/Filament/Resources/WaitingListResource/Pages/ViewWaitingList.php
@@ -7,13 +7,13 @@
 use App\Models\Atc\Endorsement;
 use App\Models\Mship\Account;
 use App\Models\Training\WaitingList\WaitingListFlag;
-use App\Rules\HomeMemberId;
 use Carbon\Carbon;
 use Filament\Actions;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Resources\Pages\ViewRecord;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Arr;
 
 class ViewWaitingList extends ViewRecord
@@ -44,11 +44,22 @@ protected function getHeaderActions(): array
                 ->form([
                     TextInput::make('account_id')
                         ->label('Account CID')
-                        ->rules([new HomeMemberId, fn () => function ($attribute, $value, $fail) {
+                        ->rule(fn () => function ($attribute, $value, $fail) {
                             if ($this->record->accounts->contains('id', $value)) {
                                 $fail('This account is already in this waiting list.');
                             }
-                        }])
+                        })
+                        ->rule(fn () => function ($attribute, $value, $fail) {
+                            if ($this->record->home_members_only) {
+                                try {
+                                    if (! Account::findOrFail($value)->primary_state->isDivision) {
+                                        $fail('The specified member is not a home UK member.');
+                                    }
+                                } catch (ModelNotFoundException $e) {
+                                    $fail('The specified member was not found.');
+                                }
+                            }
+                        })
                         ->required(),
                     DatePicker::make('join_date')
                         ->visible(fn () => auth()->user()->can('addAccountsAdmin', $this->record))

diff --git a/app/Libraries/UKCP.php b/app/Libraries/UKCP.php
@@ -78,7 +78,7 @@ protected function getAccountFor(Account $account)
     }
 
     /**
-     * @param $token object|string A token object or token ID string
+     * @param  $token  object|string A token object or token ID string
      * @return false|string
      */
     public static function getKeyForToken($token)
@@ -87,8 +87,8 @@ public static function getKeyForToken($token)
     }
 
     /**
-     * @param $tokenID string The full length token ID
-     * @param $account Account
+     * @param  $tokenID  string The full length token ID
+     * @param  $account  Account
      * @return string
      */
     public static function getPathForToken($tokenID, $account)

diff --git a/app/Models/Mship/Concerns/HasEmails.php b/app/Models/Mship/Concerns/HasEmails.php
@@ -76,7 +76,7 @@ public function setEmail($primaryEmail)
     /**
      * Retrieve an email address for a given SSO service.
      *
-     * @param $sso_account_id
+     * @param  $sso_account_id
      * @return string
      */
     public function getEmailForService($ssoAccountId)

diff --git a/app/Models/Training/WaitingList.php b/app/Models/Training/WaitingList.php
@@ -39,6 +39,7 @@ protected static function boot()
     const ANY_FLAGS = 'any';
 
     protected $casts = [
+        'home_members_only' => 'boolean',
         'feature_toggles' => 'array',
         'deleted_at' => 'datetime',
     ];

diff --git a/app/Policies/Training/WaitingListPolicy.php b/app/Policies/Training/WaitingListPolicy.php
@@ -64,7 +64,7 @@ public function create(Account $account)
     /**
      * Returns if the account has permission for either the ID or department type for the given permission
      *
-     * @param  string|string[]  $permissionTemplate Of sprintf format, e.g. "permsion.to.%s"
+     * @param  string|string[]  $permissionTemplate  Of sprintf format, e.g. "permsion.to.%s"
      * @return void
      */
     private function checkHasPermissionForList(Account $account, WaitingList $waitingList, mixed $permissionTemplates): bool

diff --git a/app/Rules/HomeMemberId.php b/app/Rules/HomeMemberId.php
diff --git a/composer.json b/composer.json
@@ -101,7 +101,7 @@
         "fakerphp/faker": "^1.9.1",
         "filament/upgrade": "^3.0-stable",
         "laracasts/generators": "^2.0",
-        "laravel/homestead": "^14.0.0",
+        "laravel/homestead": "^15.0.1",
         "laravel/legacy-factories": "^1.1",
         "laravel/pint": "^1.10",
         "mockery/mockery": "1.6.*",