repo: Lint files

app/Exports/FeedbackExport.php

@@ -11,7 +11,7 @@
 use Maatwebsite\Excel\Concerns\WithHeadings;
 use Maatwebsite\Excel\Concerns\WithMapping;
 
-class FeedbackExport implements FromCollection, WithMapping, WithHeadings, ShouldAutoSize
+class FeedbackExport implements FromCollection, ShouldAutoSize, WithHeadings, WithMapping
 {
     private $request;
 

app/Http/Controllers/BaseController.php

@@ -16,10 +16,10 @@
 
 class BaseController extends \Illuminate\Routing\Controller
 {
-    use DispatchesJobs, ValidatesRequests, RedirectsUsers;
     use AuthorizesRequests {
         authorize as protected doAuthorize;
     }
+    use DispatchesJobs, RedirectsUsers, ValidatesRequests;
 
     protected $account;
 

app/Http/Controllers/Mship/Feedback.php

@@ -64,6 +64,7 @@ public function getFeedback(Form $form)
 
                     continue;
                 }
+
                 // No values, so we cant use it :/
                 continue;
             }

app/Jobs/Middleware/RateLimited.php

@@ -7,7 +7,6 @@
 
 class RateLimited
 {
-    /** @var null */
     private $key;
 
     /** @var int */

app/Models/Mship/Account.php

@@ -165,29 +165,29 @@
  */
 class Account extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract
 {
-    use SoftDeletingTrait,
-        Rememberable,
-        Notifiable,
-        Authenticatable,
+    use Authenticatable,
         Authorizable,
+        HasBans,
+        HasCTSAccount,
+        HasDiscordAccount,
+        HasEmails,
         HasFactory,
-        HasNetworkData,
-        HasMoodleAccount,
-        HasHelpdeskAccount,
         HasForumAccount,
-        HasCTSAccount,
-        HasVisitTransferApplications,
+        HasHelpdeskAccount,
+        HasMoodleAccount,
+        HasNetworkData,
+        HasNotifications,
+        HasNovaPermissions,
+        HasPassword,
         HasQualifications,
+        HasRoles,
         HasStates,
-        HasBans,
         HasTeamSpeakRegistrations,
-        HasPassword,
-        HasNotifications,
-        HasEmails,
-        HasRoles,
-        HasNovaPermissions,
-        HasDiscordAccount,
-        HasWaitingLists;
+        HasVisitTransferApplications,
+        HasWaitingLists,
+        Notifiable,
+        Rememberable,
+        SoftDeletingTrait;
     use HasApiTokens {
         clients as oAuthClients;
         tokens as oAuthTokens;
@@ -265,8 +265,6 @@ protected static function boot()
 
     /**
      * @param  Account  $model
-     * @param  null  $extra
-     * @param  null  $data
      */
     public static function eventCreated($model, $extra = null, $data = null)
     {

app/Models/Mship/Ban/Reason.php

@@ -39,7 +39,7 @@
  */
 class Reason extends Model
 {
-    use SoftDeletes, HasFactory;
+    use HasFactory, SoftDeletes;
 
     protected $primaryKey = 'id';
 

app/Models/Mship/Concerns/HasCTSAccount.php

@@ -75,6 +75,7 @@ public function syncToCTS()
                 $newMember['visit_from'] = "{$this->primary_permanent_state->pivot->region} - {$this->primary_permanent_state->pivot->division}";
             }
             DB::table("{$ctsDatabase}.members")->insert($newMember);
+
             // go no further.
             return;
         }

app/Models/NetworkData/Atc.php

@@ -66,7 +66,7 @@
  */
 class Atc extends Model
 {
-    use PublicId, SoftDeletes, Rememberable;
+    use PublicId, Rememberable, SoftDeletes;
 
     protected static $public_id_salt = 'vatsim-uk-network-data-atc-sessions';
 

app/Models/Training/WaitingList/WaitingListAccount.php

@@ -62,9 +62,6 @@ public function account()
         return $this->belongsTo(Account::class, 'account_id');
     }
 
-    /**
-     * @param  \App\Models\Training\WaitingList\WaitingListStatus  $listStatus
-     */
     public function addStatus(WaitingListStatus $listStatus)
     {
         $nonEnded = $this->status->reject(function ($value, $key) {
@@ -79,7 +76,6 @@ public function addStatus(WaitingListStatus $listStatus)
     }
 
     /**
-     * @param  \App\Models\Training\WaitingList\WaitingListStatus  $listStatus
      * @return int
      */
     public function removeStatus(WaitingListStatus $listStatus)

app/Models/VisitTransfer/Application.php

@@ -128,7 +128,7 @@
  */
 class Application extends Model
 {
-    use PublicId, SoftDeletes, HasStatus;
+    use HasStatus, PublicId, SoftDeletes;
 
     protected static $public_id_salt = 'vatsim-uk-visiting-transfer-applications';
 

app/Models/VisitTransfer/Facility.php

@@ -65,7 +65,7 @@
  */
 class Facility extends Model
 {
-    use PublicId, Notifiable;
+    use Notifiable, PublicId;
 
     protected static $public_id_salt = 'vatsim-uk-visiting-transfer-facility';
 

app/Models/VisitTransfer/Reference.php

@@ -78,7 +78,7 @@
  */
 class Reference extends Model
 {
-    use Notifiable, SoftDeletes, HasStatus;
+    use HasStatus, Notifiable, SoftDeletes;
 
     protected $table = 'vt_reference';
 

app/Notifications/Training/RemovedFromWaitingListInactiveAccount.php

@@ -10,7 +10,7 @@
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Collection;
 
-class RemovedFromWaitingListInactiveAccount extends Notification implements ShouldQueue, DiscordNotification
+class RemovedFromWaitingListInactiveAccount extends Notification implements DiscordNotification, ShouldQueue
 {
     use Queueable;
 

app/Notifications/Training/RemovedFromWaitingListNonHomeMember.php

@@ -10,7 +10,7 @@
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Collection;
 
-class RemovedFromWaitingListNonHomeMember extends Notification implements ShouldQueue, DiscordNotification
+class RemovedFromWaitingListNonHomeMember extends Notification implements DiscordNotification, ShouldQueue
 {
     use Queueable;
 

app/Policies/Mship/Account/BanPolicy.php

@@ -36,7 +36,7 @@ public function view(Account $account, Ban $ban)
      *
      * @return \Illuminate\Auth\Access\Response|bool
      */
-    public function create(Account $account, ?Account $subject = null)
+    public function create(Account $account, Account $subject = null)
     {
         return $account->can('account.ban.create') && ! $subject?->is_banned;
     }

app/Providers/VATSIMOAuthProvider.php

@@ -34,7 +34,6 @@ public function __construct()
      *
      * @param  Token  $token
      * @return Token
-     * @return null
      */
     public static function updateToken($token)
     {

tests/TestCase.php

@@ -12,8 +12,8 @@
 
 abstract class TestCase extends BaseTestCase
 {
-    use DatabaseTransactions;
     use CreatesApplication;
+    use DatabaseTransactions;
 
     protected $knownDate;