Fix formatting and interfaces in nearly every file

.travis/Formatting.xml

@@ -0,0 +1,27 @@
+<code_scheme name="PHPVMS" version="173">
+  <option name="RIGHT_MARGIN" value="100" />
+  <PHPCodeStyleSettings>
+    <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
+    <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+    <option name="LOWER_CASE_NULL_CONST" value="true" />
+    <option name="ALIGN_CLASS_CONSTANTS" value="true" />
+    <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+  </PHPCodeStyleSettings>
+  <XML>
+    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+  </XML>
+  <codeStyleSettings language="JAVA">
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JSON">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="PHP">
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+  </codeStyleSettings>
+</code_scheme>

app/Awards/PilotFlightAwards.php

@@ -2,14 +2,14 @@
 
 namespace App\Awards;
 
-use App\Interfaces\AwardInterface;
+use App\Interfaces\Award;
 
 /**
  * Simple example of an awards class, where you can apply an award when a user
  * has 100 flights. All award classes need to extend the AwardInterface
  * @package App\Awards
  */
-class PilotFlightAwards extends AwardInterface
+class PilotFlightAwards extends Award
 {
     /**
      * Set the name of this award class to make it easier to see when

app/Bootstrap/LoadConfiguration.php

@@ -24,7 +24,6 @@ class LoadConfiguration extends \Illuminate\Foundation\Bootstrap\LoadConfigurati
      *
      * @param  \Illuminate\Contracts\Foundation\Application $app
      * @param  \Illuminate\Contracts\Config\Repository      $repository
-     * @return void
      * @throws \Exception
      */
     protected function loadConfigurationFiles(Application $app, RepositoryContract $repository)

app/Console/Command.php

@@ -2,12 +2,20 @@
 
 namespace App\Console;
 
-use Illuminate\Console\Command;
-use Symfony\Component\Process\Process;
 use Log;
+use Symfony\Component\Process\Process;
 
-class BaseCommand extends Command
+/**
+ * Class BaseCommand
+ * @package App\Console
+ */
+abstract class Command extends \Illuminate\Console\Command
 {
+    /**
+     * @return mixed
+     */
+    abstract public function handle();
+
     /**
      * Splice the logger and replace the active handlers with
      * the handlers from the "cron" stack in config/logging.php
@@ -17,7 +25,7 @@ class BaseCommand extends Command
      *
      * @param string $channel_name Channel name to grab the handlers from
      */
-    public function redirectLoggingToStdout($channel_name)
+    public function redirectLoggingToStdout($channel_name): void
     {
         $logger = app(\Illuminate\Log\Logger::class);
 
@@ -47,10 +55,9 @@ class BaseCommand extends Command
      * @param $filename
      * @return \Generator
      */
-    public function readFile($filename)
+    public function readFile($filename): ?\Generator
     {
         $fp = fopen($filename, 'rb');
-
         while (($line = fgets($fp)) !== false) {
             $line = rtrim($line, "\r\n");
             if ($line[0] === ';') {
@@ -70,7 +77,7 @@ class BaseCommand extends Command
      * @throws \Symfony\Component\Process\Exception\RuntimeException
      * @throws \Symfony\Component\Process\Exception\LogicException
      */
-    public function runCommand($cmd, $return = false, $verbose = true)
+    public function runCommand($cmd, $return = false, $verbose = true): string
     {
         if (\is_array($cmd)) {
             $cmd = join(' ', $cmd);

app/Console/Commands/AcarsReplay.php

@@ -2,12 +2,16 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Facades\Utils;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Collection;
 
-class AcarsReplay extends BaseCommand
+/**
+ * Class AcarsReplay
+ * @package App\Console\Commands
+ */
+class AcarsReplay extends Command
 {
     protected $signature = 'phpvms:replay {files} {--manual} {--write-all} {--no-submit}';
     protected $description = 'Replay an ACARS file';
@@ -35,7 +39,6 @@ class AcarsReplay extends BaseCommand
      */
     protected $httpClient;
 
-
     /**
      * Return an instance of an HTTP client all ready to post
      */
@@ -51,23 +54,19 @@ class AcarsReplay extends BaseCommand
         ]);
     }
 
-    /*protected function getArguments()
-    {
-        return [
-            ['--files', InputOption::VALUE_OPTIONAL]
-        ];
-    }*/
-
     /**
      * Make a request to start a PIREP
      * @param \stdClass $flight
      * @return string
+     * @throws \RuntimeException
      */
     protected function startPirep($flight): string
     {
         # convert the planned flight time to be completely in minutes
-        $pft = Utils::hoursToMinutes($flight->planned_hrsenroute,
+        $pft = Utils::hoursToMinutes(
-                                     $flight->planned_minenroute);
+            $flight->planned_hrsenroute,
+            $flight->planned_minenroute
+        );
 
         $flight_number = substr($flight->callsign, 3);
 
@@ -85,6 +84,7 @@ class AcarsReplay extends BaseCommand
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return $body->id;
     }
 
@@ -92,6 +92,7 @@ class AcarsReplay extends BaseCommand
      * Mark the PIREP as filed
      * @param $pirep_id
      * @return mixed
+     * @throws \RuntimeException
      */
     protected function filePirep($pirep_id)
     {
@@ -100,6 +101,7 @@ class AcarsReplay extends BaseCommand
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return $body;
     }
 
@@ -107,6 +109,7 @@ class AcarsReplay extends BaseCommand
      * @param $pirep_id
      * @param $data
      * @return array
+     * @throws \RuntimeException
      */
     protected function postUpdate($pirep_id, $data)
     {
@@ -136,6 +139,7 @@ class AcarsReplay extends BaseCommand
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return [
             $data->callsign,
             $position['lat'],
@@ -149,22 +153,24 @@ class AcarsReplay extends BaseCommand
     /**
      * Parse this file and run the updates
      * @param array $files
+     * @throws \RuntimeException
      */
     protected function updatesFromFile(array $files)
     {
         /**
          * @var $flights Collection
          */
-        $flights = collect($files)->transform(function ($f)
+        $flights = collect($files)->transform(function ($f) {
-        {
             $file = storage_path('/replay/'.$f.'.json');
             if (file_exists($file)) {
                 $this->info('Loading '.$file);
                 $contents = file_get_contents($file);
                 $contents = \json_decode($contents);
+
                 return collect($contents->updates);
             } else {
                 $this->error($file.' not found, skipping');
+
                 return false;
             }
         })
@@ -178,8 +184,7 @@ class AcarsReplay extends BaseCommand
         /**
          * File the initial pirep to get a "preflight" status
          */
-        $flights->each(function ($updates, $idx)
+        $flights->each(function ($updates, $idx) {
-        {
             $update = $updates->first();
             $pirep_id = $this->startPirep($update);
             $this->pirepList[$update->callsign] = $pirep_id;
@@ -221,8 +226,8 @@ class AcarsReplay extends BaseCommand
 
     /**
      * Execute the console command.
-     *
      * @return mixed
+     * @throws \RuntimeException
      */
     public function handle()
     {

app/Console/Commands/CreateDatabase.php

@@ -2,15 +2,22 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use Log;
 
-class CreateDatabase extends BaseCommand
+/**
+ * Class CreateDatabase
+ * @package App\Console\Commands
+ */
+class CreateDatabase extends Command
 {
     protected $signature = 'database:create {--reset} {--conn=?}';
     protected $description = 'Create a database';
     protected $os;
 
+    /**
+     * CreateDatabase constructor.
+     */
     public function __construct()
     {
         parent::__construct();
@@ -39,6 +46,7 @@ class CreateDatabase extends BaseCommand
             $conn = $dbSvc->createPDO($dsn, $user, $pass);
         } catch (\PDOException $e) {
             Log::error($e);
+
             return false;
         }
 
@@ -59,6 +67,7 @@ class CreateDatabase extends BaseCommand
             $conn->exec($sql);
         } catch (\PDOException $e) {
             Log::error($e);
+
             return false;
         }
     }
@@ -115,13 +124,9 @@ class CreateDatabase extends BaseCommand
 
         if (config($dbkey.'driver') === 'mysql') {
             $this->create_mysql($dbkey);
-        }
+        } elseif (config($dbkey.'driver') === 'sqlite') {
-
-        elseif (config($dbkey . 'driver') === 'sqlite') {
             $this->create_sqlite($dbkey);
-        }
+        } // TODO: Eventually
-
-        // TODO: Eventually
         elseif (config($dbkey.'driver') === 'postgres') {
             $this->create_postgres($dbkey);
         }

app/Console/Commands/DevCommands.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Models\Acars;
 use App\Models\Airline;
 use App\Models\Pirep;
@@ -12,7 +12,11 @@ use DB;
 use PDO;
 use Symfony\Component\Yaml\Yaml;
 
-class DevCommands extends BaseCommand
+/**
+ * Class DevCommands
+ * @package App\Console\Commands
+ */
+class DevCommands extends Command
 {
     protected $signature = 'phpvms {cmd} {param?}';
     protected $description = 'Developer commands';

app/Console/Commands/DevInstall.php

@@ -2,14 +2,14 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use Modules\Installer\Services\ConfigService;
 
 /**
  * Create a fresh development install
  * @package App\Console\Commands
  */
-class DevInstall extends BaseCommand
+class DevInstall extends Command
 {
     protected $signature = 'phpvms:dev-install {--reset-db}';
     protected $description = 'Run a developer install and run the sample migration';

app/Console/Commands/ImportFromClassic.php

@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 
-class ImportFromClassic extends BaseCommand
+class ImportFromClassic extends Command
 {
     protected $signature = 'phpvms:importer {db_host} {db_name} {db_user} {db_pass?} {table_prefix=phpvms_}';
     protected $description = 'Import from an older version of phpVMS';

app/Console/Commands/Install.php

@@ -2,9 +2,13 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 
-class Install extends BaseCommand
+/**
+ * Class Install
+ * @package App\Console\Commands
+ */
+class Install extends Command
 {
     protected $signature = 'phpvms:install 
                                 {--update}
@@ -13,11 +17,17 @@ class Install extends BaseCommand
 
     protected $description = 'Install or update phpVMS';
 
+    /**
+     * Install constructor.
+     */
     public function __construct()
     {
         parent::__construct();
     }
 
+    /**
+     * @return mixed|void
+     */
     public function handle()
     {
         $this->info('Installing phpVMS...');
@@ -44,16 +54,14 @@ class Install extends BaseCommand
 
         $this->info('Running database migrations...');
         $this->call('migrate');
-
         # TODO: Call initial seed data, for the groups and other supporting data
     }
 
     /**
      * Write a local config file
      */
-    protected function writeLocalConfig()
+    protected function writeLocalConfig(): void
     {
-
     }
 
     /**
@@ -71,7 +79,6 @@ class Install extends BaseCommand
         if (!$airline_code) {
             $airline_code = $this->ask('Enter your airline code');
         }
-
         # TODO: Prompt for admin user/password
     }
 }

app/Console/Commands/NavdataImport.php

@@ -2,15 +2,33 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Models\Enums\NavaidType;
 use App\Models\Navdata;
 
-class NavdataImport extends BaseCommand
+/**
+ * Class NavdataImport
+ * @package App\Console\Commands
+ */
+class NavdataImport extends Command
 {
     protected $signature = 'phpvms:navdata';
     protected $description = '';
 
+    /**
+     * @return mixed|void
+     * @throws \League\Geotools\Exception\InvalidArgumentException
+     */
+    public function handle()
+    {
+        $this->info('Emptying the current navdata...');
+        Navdata::query()->truncate();
+
+        $this->info('Looking for nav files...');
+        $this->read_wp_nav_aid();
+        $this->read_wp_nav_fix();
+    }
+
     /**
      * Read and parse in the navaid file
      * @throws \League\Geotools\Exception\InvalidArgumentException
@@ -49,6 +67,7 @@ class NavdataImport extends BaseCommand
         $file_path = storage_path('/navdata/WPNAVAID.txt');
         if (!file_exists($file_path)) {
             $this->error('WPNAVAID.txt not found in storage/navdata');
+
             return false;
         }
 
@@ -58,7 +77,6 @@ class NavdataImport extends BaseCommand
         $imported = 0;
 
         foreach ($generator as $line) {
-
             $navaid = [
                 'id'    => trim(substr($line, 24, 4)), // ident column
                 'name'  => trim(substr($line, 0, 24)),
@@ -70,8 +88,7 @@ class NavdataImport extends BaseCommand
             ];
 
             # Map to the Navaid enum
-            switch($navaid['type'])
+            switch ($navaid['type']) {
-            {
                 case 'ILS':
                     $navaid['type'] = NavaidType::LOC;
                     break;
@@ -139,6 +156,7 @@ class NavdataImport extends BaseCommand
         $file_path = storage_path('/navdata/WPNAVFIX.txt');
         if (!file_exists($file_path)) {
             $this->error('WPNAVFIX.txt not found in storage/navdata');
+
             return false;
         }
 
@@ -171,14 +189,4 @@ class NavdataImport extends BaseCommand
 
         $this->info('Imported a total of '.$imported.' nav fixes');
     }
-
-    public function handle()
-    {
-        $this->info('Emptying the current navdata...');
-        Navdata::query()->truncate();
-
-        $this->info('Looking for nav files...');
-        $this->read_wp_nav_aid();
-        $this->read_wp_nav_fix();
-    }
 }

app/Console/Commands/TestApi.php

@@ -2,13 +2,16 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use GuzzleHttp\Client;
 
-class TestApi extends BaseCommand
+/**
+ * Class TestApi
+ * @package App\Console\Commands
+ */
+class TestApi extends Command
 {
     protected $signature = 'phpvms:test-api {apikey} {url}';
-
     protected $httpClient;
 
     /**

app/Console/Commands/Version.php

@@ -2,10 +2,14 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use Symfony\Component\Yaml\Yaml;
 
-class Version extends BaseCommand
+/**
+ * Class Version
+ * @package App\Console\Commands
+ */
+class Version extends Command
 {
     protected $signature = 'phpvms:version {--write} {--base-only}';
 

app/Console/Commands/YamlExport.php

@@ -2,16 +2,24 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Services\DatabaseService;
 use DB;
 use Symfony\Component\Yaml\Yaml;
 
-class YamlExport extends BaseCommand
+/**
+ * Class YamlExport
+ * @package App\Console\Commands
+ */
+class YamlExport extends Command
 {
     protected $signature = 'phpvms:export {tables*}';
     protected $description = 'YAML table export';
 
+    /**
+     * YamlExport constructor.
+     * @param DatabaseService $dbSvc
+     */
     public function __construct(DatabaseService $dbSvc)
     {
         parent::__construct();

app/Console/Commands/YamlImport.php

@@ -2,16 +2,23 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Services\DatabaseService;
 
-class YamlImport extends BaseCommand
+/**
+ * Class YamlImport
+ * @package App\Console\Commands
+ */
+class YamlImport extends Command
 {
     protected $signature = 'phpvms:import {files*}';
     protected $description = 'Developer commands';
-
     protected $dbSvc;
 
+    /**
+     * YamlImport constructor.
+     * @param DatabaseService $dbSvc
+     */
     public function __construct(DatabaseService $dbSvc)
     {
         parent::__construct();
@@ -20,6 +27,7 @@ class YamlImport extends BaseCommand
 
     /**
      * Run dev related commands
+     * @throws \Exception
      */
     public function handle()
     {
@@ -30,10 +38,6 @@ class YamlImport extends BaseCommand
         }
 
         $ignore_errors = true;
-        /*$ignore_errors = $this->option('ignore_errors');
-        if(!$ignore_errors) {
-            $ignore_errors = false;
-        }*/
 
         foreach ($files as $file) {
             if (!file_exists($file)) {

app/Console/Cron/Monthly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Events\CronMonthly;
 
 /**
@@ -10,12 +10,15 @@ use App\Events\CronMonthly;
  * listeners, etc can just be called to run those tasks
  * @package App\Console\Cron
  */
-class Monthly extends BaseCommand
+class Monthly extends Command
 {
     protected $signature = 'cron:monthly';
     protected $description = 'Run the monthly cron tasks';
     protected $schedule;
 
+    /**
+     *
+     */
     public function handle(): void
     {
         $this->redirectLoggingToStdout('cron');

app/Console/Cron/Nightly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Events\CronNightly;
 
 /**
@@ -10,12 +10,15 @@ use App\Events\CronNightly;
  * listeners, etc can just be called to run those tasks
  * @package App\Console\Cron
  */
-class Nightly extends BaseCommand
+class Nightly extends Command
 {
     protected $signature = 'cron:nightly';
     protected $description = 'Run the nightly cron tasks';
     protected $schedule;
 
+    /**
+     *
+     */
     public function handle(): void
     {
         $this->redirectLoggingToStdout('cron');

app/Console/Cron/Weekly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Events\CronMonthly;
 
 /**
@@ -10,12 +10,15 @@ use App\Events\CronMonthly;
  * listeners, etc can just be called to run those tasks
  * @package App\Console\Cron
  */
-class Weekly extends BaseCommand
+class Weekly extends Command
 {
     protected $signature = 'cron:monthly';
     protected $description = 'Run the monthly cron tasks';
     protected $schedule;
 
+    /**
+     *
+     */
     public function handle(): void
     {
         $this->redirectLoggingToStdout('cron');

app/Console/Kernel.php

@@ -8,13 +8,12 @@ use App\Console\Cron\Weekly;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
+/**
+ * Class Kernel
+ * @package App\Console
+ */
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
     protected $commands = [
         Commands\AcarsReplay::class,
         Commands\CreateDatabase::class,

app/Console/Services/Database.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Services;
 
-use Doctrine\DBAL\Driver\PDOException;
+use PDOException;
 use PDO;
 
 /**

app/Console/Services/Importer.php

@@ -15,7 +15,7 @@ use App\Models\Rank;
 use App\Models\Subfleet;
 use App\Models\User;
 use Carbon\Carbon;
-use Doctrine\DBAL\Driver\PDOException;
+use PDOException;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
@@ -133,7 +133,8 @@ class Importer
     /**
      * @param $message
      */
-    protected function error($message) {
+    protected function error($message)
+    {
         $this->log->writeln('<error>'.$message.'</error>');
     }
 
@@ -144,8 +145,7 @@ class Importer
     {
         if (\is_array($message)) {
             print_r($message);
-        }
+        } else {
-        else {
             $this->log->writeln('<info>'.$message.'</info>');
         }
     }
@@ -173,6 +173,7 @@ class Importer
     {
         try {
             $model->save();
+
             return true;
         } catch (QueryException $e) {
             if ($e->getCode() !== '23000') {
@@ -225,6 +226,7 @@ class Importer
     protected function parseDate($date)
     {
         $carbon = Carbon::parse($date);
+
         return $carbon;
     }
 
@@ -263,6 +265,7 @@ class Importer
         $rows = $this->conn->query($sql)->fetchColumn();
 
         $this->info('Found '.$rows.' rows in '.$table);
+
         return (int) $rows;
     }
 
@@ -284,8 +287,7 @@ class Importer
 
         $total_rows = $this->getTotalRows($table);
 
-        while($offset < $total_rows)
+        while ($offset < $total_rows) {
-        {
             $rows_to_read = $offset + $read_rows;
             if ($rows_to_read > $total_rows) {
                 $rows_to_read = $total_rows;
@@ -344,8 +346,7 @@ class Importer
         $this->comment('--- RANK IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('ranks') as $row)
+        foreach ($this->readRows('ranks') as $row) {
-        {
             $rank = Rank::firstOrCreate(
                 ['name' => $row->rank],
                 ['image_url' => $row->rankimage, 'hours' => $row->minhours]
@@ -371,8 +372,7 @@ class Importer
         $this->comment('--- AIRLINE IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('airlines') as $row)
+        foreach ($this->readRows('airlines') as $row) {
-        {
             $airline = Airline::firstOrCreate(
                 ['icao' => $row->code],
                 ['iata' => $row->code, 'name' => $row->name, 'active' => $row->enabled]
@@ -401,8 +401,7 @@ class Importer
         $this->info('Subfleet ID is '.$subfleet->id);
 
         $count = 0;
-        foreach($this->readRows('aircraft') as $row)
+        foreach ($this->readRows('aircraft') as $row) {
-        {
             $aircraft = Aircraft::firstOrCreate(
                 ['name' => $row->fullname, 'registration' => $row->registration],
                 ['icao'        => $row->icao,
@@ -428,8 +427,7 @@ class Importer
         $this->comment('--- AIRPORT IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('airports') as $row)
+        foreach ($this->readRows('airports') as $row) {
-        {
             $attrs = [
                 'id'      => trim($row->icao),
                 'icao'    => trim($row->icao),
@@ -461,8 +459,7 @@ class Importer
         $this->comment('--- FLIGHT SCHEDULE IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('schedules') as $row)
+        foreach ($this->readRows('schedules') as $row) {
-        {
             $airline_id = $this->getMapping('airlines', $row->code);
 
             $flight_num = trim($row->flightnum);
@@ -509,8 +506,7 @@ class Importer
         $this->comment('--- PIREP IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('pireps') as $row)
+        foreach ($this->readRows('pireps') as $row) {
-        {
             $pirep_id = $row->pirepid;
             $user_id = $this->getMapping('users', $row->pilotid);
             $airline_id = $this->getMapping('airlines', $row->code);
@@ -596,7 +592,6 @@ class Importer
 
         $count = 0;
         foreach ($this->readRows('pilots', 50) as $row) {
-
             # TODO: What to do about pilot ids
 
             $name = $row->firstname.' '.$row->lastname;
@@ -641,7 +636,6 @@ class Importer
      */
     protected function findLastPireps()
     {
-
     }
 
     /**

app/Database/factories/AirlineFactory.php

@@ -12,9 +12,12 @@ $factory->define(App\Models\Airline::class, function (Faker $faker) {
         'icao'    => function (array $apt) use ($faker) {
             $hashids = new Hashids(microtime(), 5);
             $mt = str_replace('.', '', microtime(true));
+
             return $hashids->encode($mt);
         },
-        'iata' => function (array $apt) { return $apt['icao']; },
+        'iata'    => function (array $apt) {
+            return $apt['icao'];
+        },
         'name'    => $faker->sentence(3),
         'country' => $faker->country,
         'active'  => 1

app/Database/factories/AirportFactory.php

@@ -6,7 +6,6 @@ use Faker\Generator as Faker;
  * Add any number of airports. Don't really care if they're real or not
  */
 $factory->define(App\Models\Airport::class, function (Faker $faker) {
-
     return [
         'id'                   => function () {
             $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
@@ -18,8 +17,12 @@ $factory->define(App\Models\Airport::class, function (Faker $faker) {
 
             return $string;
         },
-        'icao' => function(array $apt) { return $apt['id']; },
+        'icao'                 => function (array $apt) {
-        'iata' => function (array $apt) { return $apt['id']; },
+            return $apt['id'];
+        },
+        'iata'                 => function (array $apt) {
+            return $apt['id'];
+        },
         'name'                 => $faker->sentence(3),
         'country'              => $faker->country,
         'timezone'             => $faker->timezone,

app/Database/factories/PirepFactory.php

@@ -7,7 +7,6 @@ use Faker\Generator as Faker;
  * Create a new PIREP
  */
 $factory->define(App\Models\Pirep::class, function (Faker $faker) {
-
     return [
         'id'                  => null,
         'airline_id'          => function () {

app/Database/factories/UserFactory.php

@@ -3,8 +3,7 @@
 use App\Models\Enums\UserState;
 use Faker\Generator as Faker;
 
-$factory->define(App\Models\User::class, function (Faker $faker)
+$factory->define(App\Models\User::class, function (Faker $faker) {
-{
     static $password;
 
     return [

app/Database/migrations/2017_06_08_0001_roles_permissions_tables.php

@@ -81,7 +81,6 @@ class RolesPermissionsTables extends Migration
             ],
         ];
 
-
         $this->addData('roles', $roles);
     }
 

app/Database/migrations/2017_06_08_191703_create_airlines_table.php

@@ -5,7 +5,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateAirlinesTable extends Migration
 {
-
     /**
      * Run the migrations.
      *

app/Database/migrations/2017_06_09_010621_create_aircrafts_table.php

@@ -27,7 +27,6 @@ class CreateAircraftsTable extends Migration
             $table->unique('registration');
             $table->index('airport_id');
         });
-
     }
 
     public function down()

app/Database/migrations/2017_06_10_040335_create_fares_table.php

@@ -5,7 +5,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateFaresTable extends Migration
 {
-
     /**
      * Run the migrations.
      *

app/Database/migrations/2017_06_17_214650_create_flight_tables.php

@@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateFlightTables extends Migration
 {
-
     /**
      * Run the migrations.
      *

app/Database/migrations/2017_06_21_165410_create_ranks_table.php

@@ -5,7 +5,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreateRanksTable extends Migration
 {
-
     /**
      * Run the migrations.
      *

app/Database/migrations/2017_06_28_195426_create_pirep_tables.php

@@ -8,7 +8,6 @@ use Illuminate\Database\Schema\Blueprint;
 
 class CreatePirepTables extends Migration
 {
-
     /**
      * Run the migrations.
      *

app/Database/migrations/2018_01_03_014930_create_stats_table.php

@@ -22,7 +22,6 @@ class CreateStatsTable extends Migration
             $table->primary('id');
             $table->timestamps();
         });
-
         /*$this->addCounterGroups([
             'flights' => 1,
         ]);

app/Database/migrations/2018_01_28_180522_create_awards_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateAwardsTable extends Migration
 {
@@ -30,7 +30,6 @@ class CreateAwardsTable extends Migration
             $table->index(['ref_class']);
         });
 
-
         Schema::create('user_awards', function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('user_id');

app/Database/migrations/2018_02_26_185121_create_expenses_table.php

@@ -9,7 +9,6 @@ class CreateExpensesTable extends Migration
     public function up()
     {
         Schema::create('expenses', function (Blueprint $table) {
-
             $table->increments('id');
             $table->unsignedInteger('airline_id')->nullable();
 

app/Events/CronMonthly.php

@@ -14,6 +14,9 @@ class CronMonthly
 {
     use Dispatchable, SerializesModels;
 
+    /**
+     * CronMonthly constructor.
+     */
     public function __construct()
     {
 

app/Events/CronNightly.php

@@ -14,6 +14,9 @@ class CronNightly
 {
     use Dispatchable, SerializesModels;
 
+    /**
+     * CronNightly constructor.
+     */
     public function __construct()
     {
 

app/Events/CronWeekly.php

@@ -14,6 +14,9 @@ class CronWeekly
 {
     use Dispatchable, SerializesModels;
 
+    /**
+     * CronWeekly constructor.
+     */
     public function __construct()
     {
 

app/Events/Expenses.php

@@ -32,7 +32,6 @@ use Illuminate\Queue\SerializesModels;
 class Expenses
 {
     use Dispatchable, SerializesModels;
-
     public $pirep;
 
     /**

app/Events/PirepAccepted.php

@@ -7,12 +7,20 @@ use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class PirepAccepted
+ * @package App\Events
+ */
 class PirepAccepted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     public $pirep;
 
+    /**
+     * PirepAccepted constructor.
+     * @param Pirep $pirep
+     */
     public function __construct(Pirep $pirep)
     {
         $this->pirep = $pirep;

app/Events/PirepFiled.php

@@ -10,7 +10,6 @@ use Illuminate\Queue\SerializesModels;
 class PirepFiled
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
-
     public $pirep;
 
     public function __construct(Pirep $pirep)

app/Events/PirepRejected.php

@@ -7,12 +7,20 @@ use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class PirepRejected
+ * @package App\Events
+ */
 class PirepRejected
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     public $pirep;
 
+    /**
+     * PirepRejected constructor.
+     * @param Pirep $pirep
+     */
     public function __construct(Pirep $pirep)
     {
         $this->pirep = $pirep;

app/Events/TestEvent.php

@@ -7,6 +7,10 @@ use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class TestEvent
+ * @package App\Events
+ */
 class TestEvent
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
@@ -15,6 +19,7 @@ class TestEvent
 
     /**
      * Create a new event instance.
+     * @param User $user
      */
     public function __construct(User $user)
     {

app/Events/UserAccepted.php

@@ -7,12 +7,20 @@ use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class UserAccepted
+ * @package App\Events
+ */
 class UserAccepted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     public $user;
 
+    /**
+     * UserAccepted constructor.
+     * @param User $user
+     */
     public function __construct(User $user)
     {
         $this->user = $user;

app/Events/UserRegistered.php

@@ -7,12 +7,20 @@ use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class UserRegistered
+ * @package App\Events
+ */
 class UserRegistered
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     public $user;
 
+    /**
+     * UserRegistered constructor.
+     * @param User $user
+     */
     public function __construct(User $user)
     {
         $this->user = $user;

app/Events/UserStateChanged.php

@@ -17,6 +17,11 @@ class UserStateChanged
 
     public $old_state, $user;
 
+    /**
+     * UserStateChanged constructor.
+     * @param User $user
+     * @param      $old_state
+     */
     public function __construct(User $user, $old_state)
     {
         $this->old_state = $old_state;

app/Events/UserStatsChanged.php

@@ -7,6 +7,10 @@ use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * Class UserStatsChanged
+ * @package App\Events
+ */
 class UserStatsChanged
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;

app/Exceptions/AircraftPermissionDenied.php

@@ -1,16 +1,21 @@
 <?php
-/**
- *
- */
 
 namespace App\Exceptions;
 
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
+/**
+ * Class AircraftPermissionDenied
+ * @package App\Exceptions
+ */
 class AircraftPermissionDenied extends HttpException
 {
-    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = [])
+    public function __construct(
-    {
+        string $message = null,
+        \Exception $previous = null,
+        int $code = 0,
+        array $headers = []
+    ) {
         parent::__construct(
             400,
             'User is not allowed to fly this aircraft',

app/Exceptions/BidExists.php

@@ -1,16 +1,21 @@
 <?php
-/**
- *
- */
 
 namespace App\Exceptions;
 
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
+/**
+ * Class BidExists
+ * @package App\Exceptions
+ */
 class BidExists extends HttpException
 {
-    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = [])
+    public function __construct(
-    {
+        string $message = null,
+        \Exception $previous = null,
+        int $code = 0,
+        array $headers = []
+    ) {
         parent::__construct(
             409,
             'A bid already exists for this flight',

app/Exceptions/Handler.php

@@ -67,7 +67,6 @@ class Handler extends ExceptionHandler
     public function render($request, Exception $exception)
     {
         if ($request->is('api/*')) {
-
             $headers = [];
 
             Log::error('API Error', $exception->getTrace());
@@ -133,6 +132,7 @@ class Handler extends ExceptionHandler
     {
         if ($request->expectsJson() || $request->is('api/*')) {
             $error = $this->createError(401, 'Unauthenticated');
+
             return response()->json($error, 401);
         }
 

app/Exceptions/PirepCancelled.php

@@ -1,16 +1,21 @@
 <?php
-/**
- *
- */
 
 namespace App\Exceptions;
 
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
+/**
+ * Class PirepCancelled
+ * @package App\Exceptions
+ */
 class PirepCancelled extends HttpException
 {
-    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = [])
+    public function __construct(
-    {
+        string $message = null,
+        \Exception $previous = null,
+        int $code = 0,
+        array $headers = []
+    ) {
         parent::__construct(
             400,
             'PIREP has been cancelled, updates are not allowed',

app/Exceptions/SettingNotFound.php

@@ -1,13 +1,13 @@
 <?php
-/**
- *
- */
 
 namespace App\Exceptions;
 
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
+/**
+ * Class SettingNotFound
+ * @package App\Exceptions
+ */
 class SettingNotFound extends HttpException
 {
-
 }

app/Facades/Utils.php

@@ -5,8 +5,15 @@ namespace App\Facades;
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Facade;
 
+/**
+ * Class Utils
+ * @package App\Facades
+ */
 class Utils extends Facade
 {
+    /**
+     * @return string
+     */
     protected static function getFacadeAccessor()
     {
         return 'utils';
@@ -56,7 +63,6 @@ class Utils extends Facade
         return $body;
     }
 
-
     /**
      * Returns a 40 character API key that a user can use
      * @return string
@@ -168,7 +174,8 @@ class Utils extends Facade
      * @param array $day_enums Array of values from config("enum.days")
      * @return int
      */
-    public static function setDays(int $datefield, array $day_enums) {
+    public static function setDays(int $datefield, array $day_enums)
+    {
         foreach ($day_enums as $day) {
             $datefield |= $day;
         }
@@ -182,7 +189,8 @@ class Utils extends Facade
      * @param int $day_enum  Value from config("enum.days")
      * @return bool
      */
-    public static function hasDay(int $datefield, int $day_enum) {
+    public static function hasDay(int $datefield, int $day_enum)
+    {
         return ($datefield & $day_enum) === $datefield;
     }
 }

app/Http/Controllers/Admin/AircraftController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreateAircraftRequest;
 use App\Http\Requests\UpdateAircraftRequest;
+use App\Interfaces\Controller;
 use App\Models\Aircraft;
 use App\Models\Enums\AircraftStatus;
 use App\Models\Expense;
@@ -13,8 +14,11 @@ use Flash;
 use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 
-
+/**
-class AircraftController extends BaseController
+ * Class AircraftController
+ * @package App\Http\Controllers\Admin
+ */
+class AircraftController extends Controller
 {
     private $aircraftRepo;
 
@@ -63,6 +67,7 @@ class AircraftController extends BaseController
         $aircraft = $this->aircraftRepo->create($attrs);
 
         Flash::success('Aircraft saved successfully.');
+
         return redirect(route('admin.aircraft.edit', ['id' => $aircraft->id]));
     }
 
@@ -75,6 +80,7 @@ class AircraftController extends BaseController
 
         if (empty($aircraft)) {
             Flash::error('Aircraft not found');
+
             return redirect(route('admin.aircraft.index'));
         }
 
@@ -92,6 +98,7 @@ class AircraftController extends BaseController
 
         if (empty($aircraft)) {
             Flash::error('Aircraft not found');
+
             return redirect(route('admin.aircraft.index'));
         }
 
@@ -112,6 +119,7 @@ class AircraftController extends BaseController
 
         if (empty($aircraft)) {
             Flash::error('Aircraft not found');
+
             return redirect(route('admin.aircraft.index'));
         }
 
@@ -119,6 +127,7 @@ class AircraftController extends BaseController
         $this->aircraftRepo->update($attrs, $id);
 
         Flash::success('Aircraft updated successfully.');
+
         return redirect(route('admin.aircraft.index'));
     }
 
@@ -131,12 +140,14 @@ class AircraftController extends BaseController
 
         if (empty($aircraft)) {
             Flash::error('Aircraft not found');
+
             return redirect(route('admin.aircraft.index'));
         }
 
         $this->aircraftRepo->delete($id);
 
         Flash::success('Aircraft deleted successfully.');
+
         return redirect(route('admin.aircraft.index'));
     }
 
@@ -147,6 +158,7 @@ class AircraftController extends BaseController
     protected function return_expenses_view(?Aircraft $aircraft)
     {
         $aircraft->refresh();
+
         return view('admin.aircraft.expenses', [
             'aircraft' => $aircraft,
         ]);

app/Http/Controllers/Admin/AirlinesController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreateAirlineRequest;
 use App\Http\Requests\UpdateAirlineRequest;
+use App\Interfaces\Controller;
 use App\Repositories\AirlineRepository;
 use App\Support\Countries;
 use Flash;
@@ -11,9 +12,12 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
-class AirlinesController extends BaseController
+/**
+ * Class AirlinesController
+ * @package App\Http\Controllers\Admin
+ */
+class AirlinesController extends Controller
 {
-    /** @var  AirlineRepository */
     private $airlineRepo;
 
     /**
@@ -59,6 +63,7 @@ class AirlinesController extends BaseController
         $airlines = $this->airlineRepo->create($input);
 
         Flash::success('Airlines saved successfully.');
+
         return redirect(route('admin.airlines.index'));
     }
 
@@ -73,6 +78,7 @@ class AirlinesController extends BaseController
 
         if (empty($airlines)) {
             Flash::error('Airlines not found');
+
             return redirect(route('admin.airlines.index'));
         }
 
@@ -92,6 +98,7 @@ class AirlinesController extends BaseController
 
         if (empty($airline)) {
             Flash::error('Airline not found');
+
             return redirect(route('admin.airlines.index'));
         }
 
@@ -114,6 +121,7 @@ class AirlinesController extends BaseController
 
         if (empty($airlines)) {
             Flash::error('Airlines not found');
+
             return redirect(route('admin.airlines.index'));
         }
 
@@ -135,12 +143,14 @@ class AirlinesController extends BaseController
 
         if (empty($airlines)) {
             Flash::error('Airlines not found');
+
             return redirect(route('admin.airlines.index'));
         }
 
         $this->airlineRepo->delete($id);
 
         Flash::success('Airlines deleted successfully.');
+
         return redirect(route('admin.airlines.index'));
     }
 }

app/Http/Controllers/Admin/AirportController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreateAirportRequest;
 use App\Http\Requests\UpdateAirportRequest;
+use App\Interfaces\Controller;
 use App\Models\Airport;
 use App\Models\Expense;
 use App\Repositories\AirportRepository;
@@ -13,14 +14,15 @@ use Illuminate\Http\Request;
 use Jackiedo\Timezonelist\Facades\Timezonelist;
 use Response;
 
-
+/**
-class AirportController extends BaseController
+ * Class AirportController
+ * @package App\Http\Controllers\Admin
+ */
+class AirportController extends Controller
 {
-    /** @var  AirportRepository */
     private $airportRepo;
 
     /**
-     * AirportController constructor.
      * @param AirportRepository $airportRepo
      */
     public function __construct(
@@ -77,6 +79,7 @@ class AirportController extends BaseController
         $this->airportRepo->create($input);
 
         Flash::success('Airport saved successfully.');
+
         return redirect(route('admin.airports.index'));
     }
 
@@ -91,6 +94,7 @@ class AirportController extends BaseController
 
         if (empty($airport)) {
             Flash::error('Airport not found');
+
             return redirect(route('admin.airports.index'));
         }
 
@@ -110,6 +114,7 @@ class AirportController extends BaseController
 
         if (empty($airport)) {
             Flash::error('Airport not found');
+
             return redirect(route('admin.airports.index'));
         }
 
@@ -132,6 +137,7 @@ class AirportController extends BaseController
 
         if (empty($airport)) {
             Flash::error('Airport not found');
+
             return redirect(route('admin.airports.index'));
         }
 
@@ -141,6 +147,7 @@ class AirportController extends BaseController
         $this->airportRepo->update($attrs, $id);
 
         Flash::success('Airport updated successfully.');
+
         return redirect(route('admin.airports.index'));
     }
 
@@ -155,12 +162,14 @@ class AirportController extends BaseController
 
         if (empty($airport)) {
             Flash::error('Airport not found');
+
             return redirect(route('admin.airports.index'));
         }
 
         $this->airportRepo->delete($id);
 
         Flash::success('Airport deleted successfully.');
+
         return redirect(route('admin.airports.index'));
     }
 
@@ -171,6 +180,7 @@ class AirportController extends BaseController
     protected function return_expenses_view(?Airport $airport)
     {
         $airport->refresh();
+
         return view('admin.airports.expenses', [
             'airport' => $airport,
         ]);
@@ -224,6 +234,7 @@ class AirportController extends BaseController
         $airport = $this->airportRepo->findWithoutFail($id);
         if (empty($airport)) {
             Flash::error('Flight not found');
+
             return redirect(route('admin.flights.index'));
         }
 

app/Http/Controllers/Admin/AwardController.php

@@ -4,19 +4,25 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreateAwardRequest;
 use App\Http\Requests\UpdateAwardRequest;
+use App\Interfaces\Controller;
 use App\Repositories\AwardRepository;
 use App\Services\AwardService;
-use Illuminate\Http\Request;
 use Flash;
+use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
-class AwardController extends BaseController
+class AwardController extends Controller
 {
     /** @var  AwardRepository */
     private $awardRepository,
         $awardSvc;
 
+    /**
+     * AwardController constructor.
+     * @param AwardRepository $awardRepo
+     * @param AwardService    $awardSvc
+     */
     public function __construct(
         AwardRepository $awardRepo,
         AwardService $awardSvc
@@ -72,6 +78,7 @@ class AwardController extends BaseController
     public function create()
     {
         $class_refs = $this->getAwardClassesAndDescriptions();
+
         return view('admin.awards.create', [
             'award_classes'      => $class_refs['awards'],
             'award_descriptions' => $class_refs['descriptions'],
@@ -103,6 +110,7 @@ class AwardController extends BaseController
         $award = $this->awardRepository->findWithoutFail($id);
         if (empty($award)) {
             Flash::error('Award not found');
+
             return redirect(route('admin.awards.index'));
         }
 
@@ -121,10 +129,12 @@ class AwardController extends BaseController
         $award = $this->awardRepository->findWithoutFail($id);
         if (empty($award)) {
             Flash::error('Award not found');
+
             return redirect(route('admin.awards.index'));
         }
 
         $class_refs = $this->getAwardClassesAndDescriptions();
+
         return view('admin.awards.edit', [
             'award'              => $award,
             'award_classes'      => $class_refs['awards'],
@@ -144,6 +154,7 @@ class AwardController extends BaseController
         $award = $this->awardRepository->findWithoutFail($id);
         if (empty($award)) {
             Flash::error('Award not found');
+
             return redirect(route('admin.awards.index'));
         }
 
@@ -165,6 +176,7 @@ class AwardController extends BaseController
         $award = $this->awardRepository->findWithoutFail($id);
         if (empty($award)) {
             Flash::error('Fare not found');
+
             return redirect(route('admin.awards.index'));
         }
 

app/Http/Controllers/Admin/BaseController.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Http\Controllers\Controller;
-use Response;
-
-
-class BaseController extends Controller
-{
-
-}

app/Http/Controllers/Admin/DashboardController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Facades\Utils;
+use App\Interfaces\Controller;
 use App\Repositories\NewsRepository;
 use App\Repositories\PirepRepository;
 use App\Repositories\UserRepository;
@@ -13,9 +14,15 @@ use Log;
 use Version;
 use vierbergenlars\SemVer\version as semver;
 
-class DashboardController extends BaseController
+/**
+ * Class DashboardController
+ * @package App\Http\Controllers\Admin
+ */
+class DashboardController extends Controller
 {
-    private $newsRepo, $pirepRepo, $userRepo;
+    private $newsRepo,
+            $pirepRepo,
+            $userRepo;
 
     /**
      * DashboardController constructor.

app/Http/Controllers/Admin/ExpenseController.php

@@ -2,8 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Http\Requests\CreateAirlineRequest;
+use App\Interfaces\Controller;
-use App\Http\Requests\UpdateAirlineRequest;
 use App\Models\Enums\ExpenseType;
 use App\Models\Expense;
 use App\Repositories\AirlineRepository;
@@ -13,7 +12,11 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
-class ExpenseController extends BaseController
+/**
+ * Class ExpenseController
+ * @package App\Http\Controllers\Admin
+ */
+class ExpenseController extends Controller
 {
     private $airlineRepo,
             $expenseRepo;
@@ -73,6 +76,7 @@ class ExpenseController extends BaseController
         $this->expenseRepo->create($input);
 
         Flash::success('Expense saved successfully.');
+
         return redirect(route('admin.expenses.index'));
     }
 
@@ -87,6 +91,7 @@ class ExpenseController extends BaseController
 
         if (empty($expenses)) {
             Flash::error('expenses not found');
+
             return redirect(route('admin.expenses.index'));
         }
 
@@ -106,6 +111,7 @@ class ExpenseController extends BaseController
 
         if (empty($expense)) {
             Flash::error('Expense not found');
+
             return redirect(route('admin.expenses.index'));
         }
 
@@ -129,12 +135,14 @@ class ExpenseController extends BaseController
 
         if (empty($expenses)) {
             Flash::error('Expense not found');
+
             return redirect(route('admin.expenses.index'));
         }
 
         $this->expenseRepo->update($request->all(), $id);
 
         Flash::success('Expense updated successfully.');
+
         return redirect(route('admin.expenses.index'));
     }
 
@@ -149,12 +157,14 @@ class ExpenseController extends BaseController
 
         if (empty($expenses)) {
             Flash::error('Expense not found');
+
             return redirect(route('admin.expenses.index'));
         }
 
         $this->expenseRepo->delete($id);
 
         Flash::success('Expense deleted successfully.');
+
         return redirect(route('admin.expenses.index'));
     }
 }

app/Http/Controllers/Admin/FareController.php

@@ -4,15 +4,19 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreateFareRequest;
 use App\Http\Requests\UpdateFareRequest;
+use App\Interfaces\Controller;
 use App\Repositories\FareRepository;
 use Flash;
 use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
-class FareController extends BaseController
+/**
+ * Class FareController
+ * @package App\Http\Controllers\Admin
+ */
+class FareController extends Controller
 {
-    /** @var  FareRepository */
     private $fareRepository;
 
     /**
@@ -75,6 +79,7 @@ class FareController extends BaseController
         $fare = $this->fareRepository->findWithoutFail($id);
         if (empty($fare)) {
             Flash::error('Fare not found');
+
             return redirect(route('admin.fares.index'));
         }
 
@@ -91,6 +96,7 @@ class FareController extends BaseController
         $fare = $this->fareRepository->findWithoutFail($id);
         if (empty($fare)) {
             Flash::error('Fare not found');
+
             return redirect(route('admin.fares.index'));
         }
 
@@ -109,6 +115,7 @@ class FareController extends BaseController
         $fare = $this->fareRepository->findWithoutFail($id);
         if (empty($fare)) {
             Flash::error('Fare not found');
+
             return redirect(route('admin.fares.index'));
         }
 
@@ -128,6 +135,7 @@ class FareController extends BaseController
         $fare = $this->fareRepository->findWithoutFail($id);
         if (empty($fare)) {
             Flash::error('Fare not found');
+
             return redirect(route('admin.fares.index'));
         }
 

app/Http/Controllers/Admin/FinanceController.php

@@ -2,12 +2,11 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Interfaces\Controller;
 use App\Models\Enums\JournalType;
 use App\Models\Journal;
 use App\Models\JournalTransaction;
 use App\Repositories\AirlineRepository;
-use App\Repositories\JournalRepository;
-use App\Services\Finance\PirepFinanceService;
 use App\Support\Dates;
 use App\Support\Money;
 use Illuminate\Http\Request;
@@ -16,25 +15,17 @@ use Illuminate\Http\Request;
  * Class FinanceController
  * @package App\Http\Controllers\Admin
  */
-class FinanceController extends BaseController
+class FinanceController extends Controller
 {
-    private $airlineRepo,
+    private $airlineRepo;
-            $financeSvc,
-            $journalRepo;
 
     /**
      * @param AirlineRepository   $airlineRepo
-     * @param PirepFinanceService $financeSvc
-     * @param JournalRepository $journalRepo
      */
     public function __construct(
-        AirlineRepository $airlineRepo,
+        AirlineRepository $airlineRepo
-        PirepFinanceService $financeSvc,
-        JournalRepository $journalRepo
     ) {
         $this->airlineRepo = $airlineRepo;
-        $this->financeSvc = $financeSvc;
-        $this->journalRepo = $journalRepo;
     }
 
     /**
@@ -59,7 +50,6 @@ class FinanceController extends BaseController
 
         # group by the airline
         foreach ($airlines as $airline) {
-
             # Return all the transactions, grouped by the transaction group
             $transactions = JournalTransaction::groupBy('transaction_group')
                 ->selectRaw('transaction_group, currency, 
@@ -102,6 +92,5 @@ class FinanceController extends BaseController
      */
     public function show($id)
     {
-
     }
 }

app/Http/Controllers/Admin/FlightController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreateFlightRequest;
 use App\Http\Requests\UpdateFlightRequest;
+use App\Interfaces\Controller;
 use App\Models\Enums\FlightType;
 use App\Models\Flight;
 use App\Models\FlightFields;
@@ -19,7 +20,11 @@ use Flash;
 use Illuminate\Http\Request;
 use Response;
 
-class FlightController extends BaseController
+/**
+ * Class FlightController
+ * @package App\Http\Controllers\Admin
+ */
+class FlightController extends Controller
 {
     private $airlineRepo,
             $airportRepo,
@@ -84,6 +89,7 @@ class FlightController extends BaseController
     public function index(Request $request)
     {
         $flights = $this->flightRepo->searchCriteria($request, false)->paginate();
+
         return view('admin.flights.index', [
             'flights'  => $flights,
             'airlines' => $this->airlineRepo->selectBoxList(true),
@@ -131,6 +137,7 @@ class FlightController extends BaseController
         $flights = $this->flightRepo->findWhere($where);
         if ($flights->count() > 0) {
             Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
+
             return redirect()->back()->withInput($request->all());
         }
 
@@ -142,6 +149,7 @@ class FlightController extends BaseController
         $flight = $this->flightRepo->create($input);
 
         Flash::success('Flight saved successfully.');
+
         return redirect(route('admin.flights.edit', $flight->id));
     }
 
@@ -155,10 +163,12 @@ class FlightController extends BaseController
 
         if (empty($flight)) {
             Flash::error('Flight not found');
+
             return redirect(route('admin.flights.index'));
         }
 
         $avail_subfleets = $this->getAvailSubfleets($flight);
+
         return view('admin.flights.show', [
             'flight'          => $flight,
             'avail_subfleets' => $avail_subfleets,
@@ -174,6 +184,7 @@ class FlightController extends BaseController
         $flight = $this->flightRepo->findWithoutFail($id);
         if (empty($flight)) {
             Flash::error('Flight not found');
+
             return redirect(route('admin.flights.index'));
         }
 
@@ -205,6 +216,7 @@ class FlightController extends BaseController
 
         if (empty($flight)) {
             Flash::error('Flight not found');
+
             return redirect(route('admin.flights.index'));
         }
 
@@ -227,6 +239,7 @@ class FlightController extends BaseController
         $flights = $this->flightRepo->findWhere($where);
         if ($flights->count() > 0) {
             Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
+
             return redirect()->back()->withInput($request->all());
         }
 
@@ -239,6 +252,7 @@ class FlightController extends BaseController
         $this->flightRepo->update($input, $id);
 
         Flash::success('Flight updated successfully.');
+
         return redirect(route('admin.flights.index'));
     }
 
@@ -253,12 +267,14 @@ class FlightController extends BaseController
 
         if (empty($flight)) {
             Flash::error('Flight not found');
+
             return redirect(route('admin.flights.index'));
         }
 
         $this->flightSvc->deleteFlight($flight);
 
         Flash::success('Flight deleted successfully.');
+
         return redirect(route('admin.flights.index'));
     }
 
@@ -269,6 +285,7 @@ class FlightController extends BaseController
     protected function return_fields_view($flight)
     {
         $flight->refresh();
+
         return view('admin.flights.flight_fields', [
             'flight' => $flight,
         ]);
@@ -285,6 +302,7 @@ class FlightController extends BaseController
         $flight = $this->flightRepo->findWithoutFail($id);
         if (empty($flight)) {
             Flash::error('Flight not found');
+
             return redirect(route('admin.flights.index'));
         }
 
@@ -295,16 +313,12 @@ class FlightController extends BaseController
             $field->name = $request->name;
             $field->value = $request->value;
             $field->save();
-        }
+        } elseif ($request->isMethod('put')) {
-
-        elseif ($request->isMethod('put')) {
             $field = FlightFields::where('id', $request->field_id)->first();
             $field->value = $request->value;
             $field->save();
             // update the field value
-        }
+        } // remove custom field from flight
-
-        // remove custom field from flight
         elseif ($request->isMethod('delete')) {
             FlightFields::destroy($request->field_id);
         }
@@ -319,6 +333,7 @@ class FlightController extends BaseController
     protected function return_subfleet_view($flight)
     {
         $avail_subfleets = $this->getAvailSubfleets($flight);
+
         return view('admin.flights.subfleets', [
             'flight'          => $flight,
             'avail_subfleets' => $avail_subfleets,
@@ -335,15 +350,14 @@ class FlightController extends BaseController
         $flight = $this->flightRepo->findWithoutFail($id);
         if (empty($flight)) {
             Flash::error('Flight not found');
+
             return redirect(route('admin.flights.index'));
         }
 
         // add aircraft to flight
         if ($request->isMethod('post')) {
             $flight->subfleets()->syncWithoutDetaching([$request->subfleet_id]);
-        }
+        } // remove aircraft from flight
-
-        // remove aircraft from flight
         elseif ($request->isMethod('delete')) {
             $flight->subfleets()->detach($request->subfleet_id);
         }
@@ -374,6 +388,7 @@ class FlightController extends BaseController
     protected function return_fares_view(Flight $flight)
     {
         $flight->refresh();
+
         return view('admin.flights.fares', [
             'flight'      => $flight,
             'avail_fares' => $this->getAvailFares($flight),
@@ -400,6 +415,7 @@ class FlightController extends BaseController
         if ($request->isMethod('delete')) {
             $fare = $this->fareRepo->findWithoutFail($request->fare_id);
             $this->fareSvc->delFareFromFlight($flight, $fare);
+
             return $this->return_fares_view($flight);
         }
 

app/Http/Controllers/Admin/PirepController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Facades\Utils;
 use App\Http\Requests\CreatePirepRequest;
 use App\Http\Requests\UpdatePirepRequest;
+use App\Interfaces\Controller;
 use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
 use App\Models\Pirep;
@@ -27,8 +28,11 @@ use Log;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
-
+/**
-class PirepController extends BaseController
+ * Class PirepController
+ * @package App\Http\Controllers\Admin
+ */
+class PirepController extends Controller
 {
     private $airportRepo,
             $airlineRepo,
@@ -140,7 +144,6 @@ class PirepController extends BaseController
     {
         $fares = [];
         foreach ($pirep->aircraft->subfleet->fares as $fare) {
-
             $field_name = 'fare_'.$fare->id;
             if (!$request->filled($field_name)) {
                 $count = 0;
@@ -247,6 +250,7 @@ class PirepController extends BaseController
         $this->saveFares($pirep, $request);
 
         Flash::success('Pirep saved successfully.');
+
         return redirect(route('admin.pireps.index'));
     }
 
@@ -261,6 +265,7 @@ class PirepController extends BaseController
 
         if (empty($pirep)) {
             Flash::error('Pirep not found');
+
             return redirect(route('admin.pireps.index'));
         }
 
@@ -280,6 +285,7 @@ class PirepController extends BaseController
         $pirep = $this->pirepRepo->findWithoutFail($id);
         if (empty($pirep)) {
             Flash::error('Pirep not found');
+
             return redirect(route('admin.pireps.index'));
         }
 
@@ -327,6 +333,7 @@ class PirepController extends BaseController
 
         if (empty($pirep)) {
             Flash::error('Pirep not found');
+
             return redirect(route('admin.pireps.index'));
         }
 
@@ -351,6 +358,7 @@ class PirepController extends BaseController
         $this->saveFares($pirep, $request);
 
         Flash::success('Pirep updated successfully.');
+
         return redirect(route('admin.pireps.index'));
     }
 
@@ -365,12 +373,14 @@ class PirepController extends BaseController
 
         if (empty($pirep)) {
             Flash::error('Pirep not found');
+
             return redirect(route('admin.pireps.index'));
         }
 
         $this->pirepRepo->delete($id);
 
         Flash::success('Pirep deleted successfully.');
+
         return redirect(route('admin.pireps.index'));
     }
 
@@ -390,6 +400,7 @@ class PirepController extends BaseController
         }
 
         $pirep->refresh();
+
         return view('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => false]);
     }
 

app/Http/Controllers/Admin/PirepFieldController.php

@@ -4,15 +4,19 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreatePirepFieldRequest;
 use App\Http\Requests\UpdatePirepFieldRequest;
+use App\Interfaces\Controller;
 use App\Repositories\PirepFieldRepository;
 use Flash;
 use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
-class PirepFieldController extends BaseController
+/**
+ * Class PirepFieldController
+ * @package App\Http\Controllers\Admin
+ */
+class PirepFieldController extends Controller
 {
-    /** @var  PirepFieldRepository */
     private $pirepFieldRepo;
 
     /**
@@ -65,6 +69,7 @@ class PirepFieldController extends BaseController
         $this->pirepFieldRepo->create($attrs);
 
         Flash::success('Field added successfully.');
+
         return redirect(route('admin.pirepfields.index'));
     }
 
@@ -79,6 +84,7 @@ class PirepFieldController extends BaseController
 
         if (empty($field)) {
             Flash::error('PirepField not found');
+
             return redirect(route('admin.pirepfields.index'));
         }
 
@@ -98,6 +104,7 @@ class PirepFieldController extends BaseController
 
         if (empty($field)) {
             Flash::error('Field not found');
+
             return redirect(route('admin.pirepfields.index'));
         }
 
@@ -116,6 +123,7 @@ class PirepFieldController extends BaseController
 
         if (empty($field)) {
             Flash::error('PirepField not found');
+
             return redirect(route('admin.pirepfields.index'));
         }
 
@@ -125,6 +133,7 @@ class PirepFieldController extends BaseController
         $this->pirepFieldRepo->update($attrs, $id);
 
         Flash::success('Field updated successfully.');
+
         return redirect(route('admin.pirepfields.index'));
     }
 
@@ -139,12 +148,14 @@ class PirepFieldController extends BaseController
 
         if (empty($field)) {
             Flash::error('Field not found');
+
             return redirect(route('admin.pirepfields.index'));
         }
 
         $this->pirepFieldRepo->delete($id);
 
         Flash::success('Field deleted successfully.');
+
         return redirect(route('admin.pirepfields.index'));
     }
 }

app/Http/Controllers/Admin/RankController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreateRankRequest;
 use App\Http\Requests\UpdateRankRequest;
+use App\Interfaces\Controller;
 use App\Repositories\RankRepository;
 use App\Repositories\SubfleetRepository;
 use App\Services\FleetService;
@@ -13,9 +14,12 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
-class RankController extends BaseController
+/**
+ * Class RankController
+ * @package App\Http\Controllers\Admin
+ */
+class RankController extends Controller
 {
-    /** @var  RankRepository */
     private $fleetSvc,
             $rankRepository,
             $subfleetRepo;
@@ -109,6 +113,7 @@ class RankController extends BaseController
 
         if (empty($rank)) {
             Flash::error('Ranking not found');
+
             return redirect(route('admin.ranks.index'));
         }
 
@@ -128,10 +133,12 @@ class RankController extends BaseController
 
         if (empty($rank)) {
             Flash::error('Ranking not found');
+
             return redirect(route('admin.ranks.index'));
         }
 
         $avail_subfleets = $this->getAvailSubfleets($rank);
+
         return view('admin.ranks.edit', [
             'rank'            => $rank,
             'avail_subfleets' => $avail_subfleets,
@@ -151,6 +158,7 @@ class RankController extends BaseController
 
         if (empty($rank)) {
             Flash::error('Ranking not found');
+
             return redirect(route('admin.ranks.index'));
         }
 
@@ -158,6 +166,7 @@ class RankController extends BaseController
         Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
 
         Flash::success('Ranking updated successfully.');
+
         return redirect(route('admin.ranks.index'));
     }
 
@@ -172,12 +181,14 @@ class RankController extends BaseController
 
         if (empty($rank)) {
             Flash::error('Ranking not found');
+
             return redirect(route('admin.ranks.index'));
         }
 
         $this->rankRepository->delete($id);
 
         Flash::success('Ranking deleted successfully.');
+
         return redirect(route('admin.ranks.index'));
     }
 
@@ -188,6 +199,7 @@ class RankController extends BaseController
     protected function return_subfleet_view($rank)
     {
         $avail_subfleets = $this->getAvailSubfleets($rank);
+
         return view('admin.ranks.subfleets', [
             'rank'            => $rank,
             'avail_subfleets' => $avail_subfleets,
@@ -205,6 +217,7 @@ class RankController extends BaseController
         $rank = $this->rankRepository->findWithoutFail($id);
         if (empty($rank)) {
             Flash::error('Rank not found!');
+
             return redirect(route('admin.ranks.index'));
         }
 
@@ -212,17 +225,13 @@ class RankController extends BaseController
         if ($request->isMethod('post')) {
             $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
             $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
-        }
+        } elseif ($request->isMethod('put')) {
-
-        elseif($request->isMethod('put')) {
             $override = [];
             $override[$request->name] = $request->value;
             $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
 
             $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
-        }
+        } // remove aircraft from flight
-
-        // remove aircraft from flight
         elseif ($request->isMethod('delete')) {
             $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
             $this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);

app/Http/Controllers/Admin/SettingsController.php

@@ -2,11 +2,16 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Interfaces\Controller;
 use App\Models\Setting;
 use Illuminate\Http\Request;
 use Log;
 
-class SettingsController extends BaseController
+/**
+ * Class SettingsController
+ * @package App\Http\Controllers\Admin
+ */
+class SettingsController extends Controller
 {
     /**
      * Display the settings. Group them by the setting group
@@ -40,6 +45,7 @@ class SettingsController extends BaseController
         }
 
         flash('Settings saved!');
+
         return redirect('/admin/settings');
     }
 }

app/Http/Controllers/Admin/SubfleetController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\CreateSubfleetRequest;
 use App\Http\Requests\UpdateSubfleetRequest;
+use App\Interfaces\Controller;
 use App\Models\Airline;
 use App\Models\Enums\FuelType;
 use App\Models\Expense;
@@ -19,9 +20,12 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
 
-class SubfleetController extends BaseController
+/**
+ * Class SubfleetController
+ * @package App\Http\Controllers\Admin
+ */
+class SubfleetController extends Controller
 {
-    /** @var  SubfleetRepository */
     private $aircraftRepo,
             $fareRepo,
             $fareSvc,
@@ -129,6 +133,7 @@ class SubfleetController extends BaseController
         $subfleet = $this->subfleetRepo->create($input);
 
         Flash::success('Subfleet saved successfully.');
+
         return redirect(route('admin.subfleets.edit', ['id' => $subfleet->id]));
     }
 
@@ -143,10 +148,12 @@ class SubfleetController extends BaseController
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
+
             return redirect(route('admin.subfleets.index'));
         }
 
         $avail_fares = $this->getAvailFares($subfleet);
+
         return view('admin.subfleets.show', [
             'subfleet'    => $subfleet,
             'avail_fares' => $avail_fares,
@@ -164,6 +171,7 @@ class SubfleetController extends BaseController
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
+
             return redirect(route('admin.subfleets.index'));
         }
 
@@ -192,12 +200,14 @@ class SubfleetController extends BaseController
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
+
             return redirect(route('admin.subfleets.index'));
         }
 
         $this->subfleetRepo->update($request->all(), $id);
 
         Flash::success('Subfleet updated successfully.');
+
         return redirect(route('admin.subfleets.index'));
     }
 
@@ -212,6 +222,7 @@ class SubfleetController extends BaseController
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
+
             return redirect(route('admin.subfleets.index'));
         }
 
@@ -220,12 +231,14 @@ class SubfleetController extends BaseController
         $aircraft = $this->aircraftRepo->findWhere(['subfleet_id' => $id], ['id']);
         if ($aircraft->count() > 0) {
             Flash::error('There are aircraft still assigned to this subfleet, you can\'t delete it!')->important();
+
             return redirect(route('admin.subfleets.index'));
         }
 
         $this->subfleetRepo->delete($id);
 
         Flash::success('Subfleet deleted successfully.');
+
         return redirect(route('admin.subfleets.index'));
     }
 
@@ -284,23 +297,20 @@ class SubfleetController extends BaseController
         if ($request->isMethod('post')) {
             $rank = $this->rankRepo->find($request->input('rank_id'));
             $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
-        }
+        } elseif ($request->isMethod('put')) {
-
-        elseif ($request->isMethod('put')) {
             $override = [];
             $rank = $this->rankRepo->find($request->input('rank_id'));
             $override[$request->name] = $request->value;
 
             $this->fleetSvc->addSubfleetToRank($subfleet, $rank, $override);
-        }
+        } // dissassociate fare from teh aircraft
-
-        // dissassociate fare from teh aircraft
         elseif ($request->isMethod('delete')) {
             $rank = $this->rankRepo->find($request->input('rank_id'));
             $this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
         }
 
         $subfleet->save();
+
         return $this->return_ranks_view($subfleet);
     }
 
@@ -311,6 +321,7 @@ class SubfleetController extends BaseController
     protected function return_expenses_view(?Subfleet $subfleet)
     {
         $subfleet->refresh();
+
         return view('admin.subfleets.expenses', [
             'subfleet' => $subfleet,
         ]);
@@ -379,17 +390,13 @@ class SubfleetController extends BaseController
         if ($request->isMethod('post')) {
             $fare = $this->fareRepo->find($request->fare_id);
             $this->fareSvc->setForSubfleet($subfleet, $fare);
-        }
+        } // update the pivot table with overrides for the fares
-
-        // update the pivot table with overrides for the fares
         elseif ($request->isMethod('put')) {
             $override = [];
             $fare = $this->fareRepo->find($request->fare_id);
             $override[$request->name] = $request->value;
             $this->fareSvc->setForSubfleet($subfleet, $fare, $override);
-        }
+        } // dissassociate fare from teh aircraft
-
-        // dissassociate fare from teh aircraft
         elseif ($request->isMethod('delete')) {
             $fare = $this->fareRepo->find($request->fare_id);
             $this->fareSvc->delFareFromSubfleet($subfleet, $fare);

app/Http/Controllers/Admin/UserController.php

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Facades\Utils;
 use App\Http\Requests\CreateUserRequest;
 use App\Http\Requests\UpdateUserRequest;
-use App\Models\Airline;
+use App\Interfaces\Controller;
 use App\Models\Rank;
 use App\Models\Role;
 use App\Models\User;
@@ -23,7 +23,11 @@ use Log;
 use Prettus\Repository\Exceptions\RepositoryException;
 use Response;
 
-class UserController extends BaseController
+/**
+ * Class UserController
+ * @package App\Http\Controllers\Admin
+ */
+class UserController extends Controller
 {
     private $airlineRepo,
             $airportRepo,
@@ -105,6 +109,7 @@ class UserController extends BaseController
         $user = $this->userRepo->create($input);
 
         Flash::success('User saved successfully.');
+
         return redirect(route('admin.users.index'));
     }
 
@@ -119,6 +124,7 @@ class UserController extends BaseController
 
         if (empty($user)) {
             Flash::error('User not found');
+
             return redirect(route('admin.users.index'));
         }
 
@@ -152,6 +158,7 @@ class UserController extends BaseController
 
         if (empty($user)) {
             Flash::error('User not found');
+
             return redirect(route('admin.users.index'));
         }
 
@@ -192,6 +199,7 @@ class UserController extends BaseController
 
         if (empty($user)) {
             Flash::error('User not found');
+
             return redirect(route('admin.users.index'));
         }
 
@@ -217,6 +225,7 @@ class UserController extends BaseController
         }
 
         Flash::success('User updated successfully.');
+
         return redirect(route('admin.users.index'));
     }
 
@@ -231,12 +240,14 @@ class UserController extends BaseController
 
         if (empty($user)) {
             Flash::error('User not found');
+
             return redirect(route('admin.users.index'));
         }
 
         $this->userRepo->delete($id);
 
         Flash::success('User deleted successfully.');
+
         return redirect(route('admin.users.index'));
     }
 
@@ -255,6 +266,7 @@ class UserController extends BaseController
         $user->save();
 
         flash('New API key generated!')->success();
+
         return redirect(route('admin.users.edit', ['id' => $id]));
     }
 }

app/Http/Controllers/Api/AcarsController.php

@@ -2,30 +2,31 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Interfaces\Controller;
 use App\Repositories\AcarsRepository;
-use App\Repositories\PirepRepository;
 use App\Services\GeoService;
 use Illuminate\Http\Request;
 
-
+/**
-class AcarsController extends RestController
+ * Class AcarsController
+ * @package App\Http\Controllers\Api
+ */
+class AcarsController extends Controller
 {
-    protected $acarsRepo, $geoSvc, $pirepRepo;
+    private $acarsRepo,
+            $geoSvc;
 
     /**
      * AcarsController constructor.
      * @param GeoService      $geoSvc
      * @param AcarsRepository $acarsRepo
-     * @param PirepRepository $pirepRepo
      */
     public function __construct(
         GeoService $geoSvc,
-        AcarsRepository $acarsRepo,
+        AcarsRepository $acarsRepo
-        PirepRepository $pirepRepo
     ) {
         $this->geoSvc = $geoSvc;
         $this->acarsRepo = $acarsRepo;
-        $this->pirepRepo = $pirepRepo;
     }
 
     /**

app/Http/Controllers/Api/AirlineController.php

@@ -3,12 +3,17 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Resources\Airline as AirlineResource;
+use App\Interfaces\Controller;
 use App\Repositories\AirlineRepository;
 use Illuminate\Http\Request;
 
-class AirlineController extends RestController
+/**
+ * Class AirlineController
+ * @package App\Http\Controllers\Api
+ */
+class AirlineController extends Controller
 {
-    protected $airlineRepo;
+    private $airlineRepo;
 
     /**
      * AirlineController constructor.
@@ -43,6 +48,7 @@ class AirlineController extends RestController
     public function get($id)
     {
         $id = strtoupper($id);
+
         return new AirlineResource($this->airlineRepo->find($id));
     }
 }

app/Http/Controllers/Api/AirportController.php

@@ -3,15 +3,20 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Resources\Airport as AirportResource;
+use App\Interfaces\Controller;
 use App\Repositories\AirportRepository;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Log;
 use VaCentral\Airport as AirportLookup;
 
-class AirportController extends RestController
+/**
+ * Class AirportController
+ * @package App\Http\Controllers\Api
+ */
+class AirportController extends Controller
 {
-    protected $airportRepo;
+    private $airportRepo;
 
     /**
      * AirportController constructor.
@@ -66,6 +71,7 @@ class AirportController extends RestController
     public function get($id)
     {
         $id = strtoupper($id);
+
         return new AirportResource($this->airportRepo->find($id));
     }
 
@@ -84,6 +90,7 @@ class AirportController extends RestController
                     return AirportLookup::get($id);
                 } catch (\VaCentral\HttpException $e) {
                     Log::error($e);
+
                     return [];
                 }
             }

app/Http/Controllers/Api/FleetController.php

@@ -4,13 +4,19 @@ namespace App\Http\Controllers\Api;
 
 use App\Http\Resources\Aircraft as AircraftResource;
 use App\Http\Resources\Subfleet as SubfleetResource;
+use App\Interfaces\Controller;
 use App\Repositories\AircraftRepository;
 use App\Repositories\SubfleetRepository;
 use Illuminate\Http\Request;
 
-class FleetController extends RestController
+/**
+ * Class FleetController
+ * @package App\Http\Controllers\Api
+ */
+class FleetController extends Controller
 {
-    protected $aircraftRepo, $subfleetRepo;
+    private $aircraftRepo,
+            $subfleetRepo;
 
     /**
      * FleetController constructor.

app/Http/Controllers/Api/FlightController.php

@@ -4,10 +4,10 @@ namespace App\Http\Controllers\Api;
 
 use App\Http\Resources\Flight as FlightResource;
 use App\Http\Resources\Navdata as NavdataResource;
+use App\Interfaces\Controller;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Repositories\FlightRepository;
 use App\Services\FlightService;
-use App\Services\UserService;
 use Auth;
 use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
@@ -17,24 +17,22 @@ use Prettus\Repository\Exceptions\RepositoryException;
  * Class FlightController
  * @package App\Http\Controllers\Api
  */
-class FlightController extends RestController
+class FlightController extends Controller
 {
-    protected $flightRepo, $flightSvc, $userSvc;
+    private $flightRepo,
+            $flightSvc;
 
     /**
      * FlightController constructor.
      * @param FlightRepository $flightRepo
      * @param FlightService    $flightSvc
-     * @param UserService $userSvc
      */
     public function __construct(
         FlightRepository $flightRepo,
-        FlightService $flightSvc,
+        FlightService $flightSvc
-        UserService $userSvc
     ) {
         $this->flightRepo = $flightRepo;
         $this->flightSvc = $flightSvc;
-        $this->userSvc = $userSvc;
     }
 
     /**

app/Http/Controllers/Api/PirepController.php

@@ -16,6 +16,7 @@ use App\Http\Resources\AcarsRoute as AcarsRouteResource;
 use App\Http\Resources\JournalTransaction as JournalTransactionResource;
 use App\Http\Resources\Pirep as PirepResource;
 use App\Http\Resources\PirepComment as PirepCommentResource;
+use App\Interfaces\Controller;
 use App\Models\Acars;
 use App\Models\Enums\AcarsType;
 use App\Models\Enums\PirepSource;
@@ -35,7 +36,11 @@ use Auth;
 use Illuminate\Http\Request;
 use Log;
 
-class PirepController extends RestController
+/**
+ * Class PirepController
+ * @package App\Http\Controllers\Api
+ */
+class PirepController extends Controller
 {
     private $acarsRepo,
             $fareSvc,
@@ -49,6 +54,7 @@ class PirepController extends RestController
     /**
      * PirepController constructor.
      * @param AcarsRepository     $acarsRepo
+     * @param FareService         $fareSvc
      * @param PirepFinanceService $financeSvc
      * @param GeoService          $geoSvc
      * @param JournalRepository   $journalRepo
@@ -361,8 +367,7 @@ class PirepController extends RestController
 
         $count = 0;
         $positions = $request->post('positions');
-        foreach($positions as $position)
+        foreach ($positions as $position) {
-        {
             $position['pirep_id'] = $id;
             $position['type'] = AcarsType::FLIGHT_PATH;
 
@@ -399,7 +404,6 @@ class PirepController extends RestController
         $count = 0;
         $logs = $request->post('logs');
         foreach ($logs as $log) {
-
             $log['pirep_id'] = $id;
             $log['type'] = AcarsType::LOG;
 
@@ -431,7 +435,6 @@ class PirepController extends RestController
         $count = 0;
         $logs = $request->post('events');
         foreach ($logs as $log) {
-
             $log['pirep_id'] = $id;
             $log['type'] = AcarsType::LOG;
             $log['log'] = $log['event'];
@@ -453,6 +456,7 @@ class PirepController extends RestController
     public function comments_get($id, Request $request)
     {
         $pirep = $this->pirepRepo->find($id);
+
         return PirepCommentResource::collection($pirep->comments);
     }
 
@@ -490,6 +494,7 @@ class PirepController extends RestController
     {
         $pirep = $this->pirepRepo->find($id);
         $transactions = $this->journalRepo->getAllForObject($pirep);
+
         return JournalTransactionResource::collection($transactions);
     }
 
@@ -509,6 +514,7 @@ class PirepController extends RestController
 
         $pirep->refresh();
         $transactions = $this->journalRepo->getAllForObject($pirep);
+
         return JournalTransactionResource::collection($transactions['transactions']);
     }
 

app/Http/Controllers/Api/SettingsController.php

@@ -3,12 +3,17 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Resources\Setting as SettingResource;
+use App\Interfaces\Controller;
 use App\Repositories\SettingRepository;
 use Illuminate\Http\Request;
 
-class SettingsController extends RestController
+/**
+ * Class SettingsController
+ * @package App\Http\Controllers\Api
+ */
+class SettingsController extends Controller
 {
-    protected $settingRepo;
+    private $settingRepo;
 
     /**
      * SettingsController constructor.

app/Http/Controllers/Api/StatusController.php

@@ -2,9 +2,14 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Interfaces\Controller;
 use PragmaRX\Version\Package\Facade as Version;
 
-class StatusController extends RestController
+/**
+ * Class StatusController
+ * @package App\Http\Controllers\Api
+ */
+class StatusController extends Controller
 {
     /**
      * @return \Illuminate\Http\JsonResponse

app/Http/Controllers/Api/UserController.php

@@ -3,12 +3,12 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Resources\Bid as BidResource;
-use App\Http\Resources\Flight as FlightResource;
 use App\Http\Resources\Pirep as PirepResource;
 use App\Http\Resources\Subfleet as SubfleetResource;
 use App\Http\Resources\User as UserResource;
-use App\Models\Enums\PirepState;
+use App\Interfaces\Controller;
 use App\Models\Bid;
+use App\Models\Enums\PirepState;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Repositories\FlightRepository;
 use App\Repositories\PirepRepository;
@@ -21,10 +21,13 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Prettus\Repository\Exceptions\RepositoryException;
 
-
+/**
-class UserController extends RestController
+ * Class UserController
+ * @package App\Http\Controllers\Api
+ */
+class UserController extends Controller
 {
-    protected $flightRepo,
+    private $flightRepo,
             $flightSvc,
             $pirepRepo,
             $subfleetRepo,
@@ -106,6 +109,7 @@ class UserController extends RestController
             $flight_id = $request->input('flight_id');
             $flight = $this->flightRepo->find($flight_id);
             $bid = $this->flightSvc->addBid($flight, $user);
+
             return new BidResource($bid);
         }
 
@@ -123,6 +127,7 @@ class UserController extends RestController
 
         # Return the flights they currently have bids on
         $bids = Bid::where(['user_id' => $user->id])->get();
+
         return BidResource::collection($bids);
     }
 

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -2,9 +2,13 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
+/**
+ * Class ForgotPasswordController
+ * @package App\Http\Controllers\Auth
+ */
 class ForgotPasswordController extends Controller
 {
     use SendsPasswordResetEmails;

app/Http/Controllers/Auth/LoginController.php

@@ -2,13 +2,17 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Models\Enums\UserState;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
+/**
+ * Class LoginController
+ * @package App\Http\Controllers\Auth
+ */
 class LoginController extends Controller
 {
     use AuthenticatesUsers;
@@ -45,7 +49,6 @@ class LoginController extends Controller
 
         // TODO: How to handle ON_LEAVE?
         if ($user->state !== UserState::ACTIVE) {
-
             Log::info('Trying to login '.$user->pilot_id.', state '
                 .UserState::label($user->state));
 

app/Http/Controllers/Auth/RegisterController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Facades\Utils;
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Models\Enums\UserState;
 use App\Models\User;
 use App\Repositories\AirlineRepository;
@@ -16,6 +16,10 @@ use Jackiedo\Timezonelist\Facades\Timezonelist;
 use Log;
 use Validator;
 
+/**
+ * Class RegisterController
+ * @package App\Http\Controllers\Auth
+ */
 class RegisterController extends Controller
 {
     use RegistersUsers;
@@ -26,7 +30,7 @@ class RegisterController extends Controller
      */
     protected $redirectTo = '/';
 
-    protected $airlineRepo,
+    private $airlineRepo,
             $airportRepo,
             $userService;
 
@@ -141,6 +145,7 @@ class RegisterController extends Controller
         }
 
         $this->guard()->login($user);
+
         return redirect('/dashboard');
     }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -2,16 +2,20 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
 
+/**
+ * Class ResetPasswordController
+ * @package App\Http\Controllers\Auth
+ */
 class ResetPasswordController extends Controller
 {
-    protected $redirectTo = '/login';
-
     use ResetsPasswords;
 
+    protected $redirectTo = '/login';
+
     /**
      * @param Request $request
      * @param null    $token

app/Http/Controllers/Controller.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
-
-class Controller extends BaseController
-{
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-
-    /**
-     * Display a view but pull it from the active skin
-     * @param string $template
-     * @param array $vars
-     * @param array $merge_data
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function view($template, array $vars=[], $merge_data=[])
-    {
-        return view($template, $vars, $merge_data);
-    }
-}

app/Http/Controllers/Frontend/AcarsController.php

@@ -2,14 +2,19 @@
 
 namespace App\Http\Controllers\Frontend;
 
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Repositories\AcarsRepository;
 use App\Services\GeoService;
 use Illuminate\Http\Request;
 
+/**
+ * Class AcarsController
+ * @package App\Http\Controllers\Frontend
+ */
 class AcarsController extends Controller
 {
-    private $acarsRepo, $geoSvc;
+    private $acarsRepo,
+            $geoSvc;
 
     /**
      * AcarsController constructor.

app/Http/Controllers/Frontend/DashboardController.php

@@ -2,26 +2,26 @@
 
 namespace App\Http\Controllers\Frontend;
 
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Repositories\PirepRepository;
-use App\Repositories\UserRepository;
 use Illuminate\Support\Facades\Auth;
 
+/**
+ * Class DashboardController
+ * @package App\Http\Controllers\Frontend
+ */
 class DashboardController extends Controller
 {
-    private $pirepRepo, $userRepo;
+    private $pirepRepo;
 
     /**
      * DashboardController constructor.
      * @param PirepRepository $pirepRepo
-     * @param UserRepository $userRepo
      */
     public function __construct(
-        PirepRepository $pirepRepo,
+        PirepRepository $pirepRepo
-        UserRepository $userRepo
     ) {
         $this->pirepRepo = $pirepRepo;
-        $this->userRepo = $userRepo;
     }
 
     /**
@@ -34,7 +34,8 @@ class DashboardController extends Controller
 
         try {
             $last_pirep = $this->pirepRepo->find($user->last_pirep_id);
-        } catch(\Exception $e) { }
+        } catch (\Exception $e) {
+        }
 
         return view('dashboard.index', [
             'user'       => $user,

app/Http/Controllers/Frontend/FlightController.php

@@ -2,19 +2,22 @@
 
 namespace App\Http\Controllers\Frontend;
 
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Models\Bid;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Repositories\FlightRepository;
-use App\Services\FlightService;
 use App\Services\GeoService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Log;
 use Prettus\Repository\Exceptions\RepositoryException;
 
+/**
+ * Class FlightController
+ * @package App\Http\Controllers\Frontend
+ */
 class FlightController extends Controller
 {
     private $airlineRepo,
@@ -27,20 +30,18 @@ class FlightController extends Controller
      * @param AirlineRepository $airlineRepo
      * @param AirportRepository $airportRepo
      * @param FlightRepository  $flightRepo
-     * @param FlightService $flightSvc
      * @param GeoService        $geoSvc
      */
     public function __construct(
         AirlineRepository $airlineRepo,
         AirportRepository $airportRepo,
         FlightRepository $flightRepo,
-        FlightService $flightSvc,
         GeoService $geoSvc
-    ) {
+    )
+    {
         $this->airlineRepo = $airlineRepo;
         $this->airportRepo = $airportRepo;
         $this->flightRepo = $flightRepo;
-        $this->flightSvc = $flightSvc;
         $this->geoSvc = $geoSvc;
     }
 
@@ -107,6 +108,7 @@ class FlightController extends Controller
         $flight = $this->flightRepo->find($id);
         if (empty($flight)) {
             Flash::error('Flight not found!');
+
             return redirect(route('frontend.dashboard.index'));
         }
 

app/Http/Controllers/Frontend/HomeController.php

@@ -2,10 +2,14 @@
 
 namespace App\Http\Controllers\Frontend;
 
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Models\User;
 use Illuminate\Database\QueryException;
 
+/**
+ * Class HomeController
+ * @package App\Http\Controllers\Frontend
+ */
 class HomeController extends Controller
 {
     /**

app/Http/Controllers/Frontend/PirepController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Frontend;
 
 use App\Facades\Utils;
-use App\Http\Controllers\Controller;
 use App\Http\Requests\CreatePirepRequest;
 use App\Http\Requests\UpdatePirepRequest;
+use App\Interfaces\Controller;
 use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
 use App\Models\Pirep;
@@ -25,7 +25,10 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Log;
 
-
+/**
+ * Class PirepController
+ * @package App\Http\Controllers\Frontend
+ */
 class PirepController extends Controller
 {
     private $aircraftRepo,
@@ -134,7 +137,6 @@ class PirepController extends Controller
     {
         $fares = [];
         foreach ($pirep->aircraft->subfleet->fares as $fare) {
-
             $field_name = 'fare_'.$fare->id;
             if (!$request->filled($field_name)) {
                 $count = 0;
@@ -181,6 +183,7 @@ class PirepController extends Controller
         $pirep = $this->pirepRepo->find($id);
         if (empty($pirep)) {
             Flash::error('Pirep not found');
+
             return redirect(route('frontend.pirep.index'));
         }
 
@@ -242,6 +245,7 @@ class PirepController extends Controller
         $dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
         if ($dupe_pirep !== false) {
             flash()->error('This PIREP has already been filed.');
+
             return redirect(route('frontend.pireps.create'))->withInput();
         }
 
@@ -268,6 +272,7 @@ class PirepController extends Controller
         $pirep = $this->pirepRepo->findWithoutFail($id);
         if (empty($pirep)) {
             Flash::error('Pirep not found');
+
             return redirect(route('frontend.pireps.index'));
         }
 
@@ -313,6 +318,7 @@ class PirepController extends Controller
 
         if (empty($pirep)) {
             Flash::error('Pirep not found');
+
             return redirect(route('admin.pireps.index'));
         }
 
@@ -336,6 +342,7 @@ class PirepController extends Controller
         $this->saveFares($pirep, $request);
 
         Flash::success('Pirep updated successfully.');
+
         return redirect(route('frontend.pireps.show', ['id' => $pirep->id]));
     }
 }

app/Http/Controllers/Frontend/ProfileController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Frontend;
 
 use App\Facades\Utils;
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Models\User;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
@@ -17,6 +17,10 @@ use Jackiedo\Timezonelist\Facades\Timezonelist;
 use Log;
 use Validator;
 
+/**
+ * Class ProfileController
+ * @package App\Http\Controllers\Frontend
+ */
 class ProfileController extends Controller
 {
     private $airlineRepo,
@@ -65,6 +69,7 @@ class ProfileController extends Controller
         $user = User::where('id', $id)->first();
         if (empty($user)) {
             Flash::error('User not found!');
+
             return redirect(route('frontend.dashboard.index'));
         }
 
@@ -86,6 +91,7 @@ class ProfileController extends Controller
         $user = User::where('id', Auth::user()->id)->first();
         if (empty($user)) {
             Flash::error('User not found!');
+
             return redirect(route('frontend.dashboard.index'));
         }
 
@@ -137,6 +143,7 @@ class ProfileController extends Controller
         $this->userRepo->update($req_data, $id);
 
         Flash::success('Profile updated successfully!');
+
         return redirect(route('frontend.profile.index'));
     }
 
@@ -154,6 +161,7 @@ class ProfileController extends Controller
         $user->save();
 
         flash('New API key generated!')->success();
+
         return redirect(route('frontend.profile.index'));
     }
 }

app/Http/Controllers/Frontend/UserController.php

@@ -2,10 +2,14 @@
 
 namespace App\Http\Controllers\Frontend;
 
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Repositories\UserRepository;
 use Illuminate\Http\Request;
 
+/**
+ * Class UserController
+ * @package App\Http\Controllers\Frontend
+ */
 class UserController extends Controller
 {
     private $userRepo;

app/Http/Kernel.php

@@ -11,7 +11,6 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
-
     protected $middlewareGroups = [
         'web' => [
             \App\Http\Middleware\InstalledCheck::class,
@@ -30,7 +29,6 @@ class Kernel extends HttpKernel
             'json',
         ],
     ];
-
     protected $routeMiddleware = [
         'api.auth'   => \App\Http\Middleware\ApiAuth::class,
         'auth'       => \Illuminate\Auth\Middleware\Authenticate::class,

app/Http/Middleware/JsonResponse.php

@@ -13,6 +13,7 @@ class JsonResponse
     {
         $response = $next($request);
         $response->headers->set('Content-Type', 'application/json');
+
         return $response;
     }
 }

app/Http/Requests/Acars/EventRequest.php

@@ -12,9 +12,14 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class EventRequest extends FormRequest
 {
+    /**
+     * @return bool
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+     */
     public function authorize()
     {
         $pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
+
         return $pirep->user_id === Auth::id();
     }
 

app/Http/Requests/Acars/FileRequest.php

@@ -15,6 +15,7 @@ class FileRequest extends FormRequest
     public function authorize()
     {
         $pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
+
         return $pirep->user_id === Auth::id();
     }
 

app/Http/Requests/Acars/LogRequest.php

@@ -15,6 +15,7 @@ class LogRequest extends FormRequest
     public function authorize()
     {
         $pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
+
         return $pirep->user_id === Auth::id();
     }
 

app/Http/Requests/Acars/PositionRequest.php

@@ -15,6 +15,7 @@ class PositionRequest extends FormRequest
     public function authorize()
     {
         $pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
+
         return $pirep->user_id === Auth::id();
     }
 

app/Http/Requests/Acars/RouteRequest.php

@@ -15,6 +15,7 @@ class RouteRequest extends FormRequest
     public function authorize()
     {
         $pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
+
         return $pirep->user_id === Auth::id();
     }
 

app/Http/Requests/Acars/UpdateRequest.php

@@ -15,6 +15,7 @@ class UpdateRequest extends FormRequest
     public function authorize()
     {
         $pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
+
         return $pirep->user_id === Auth::id();
     }
 

app/Http/Requests/CreateAircraftRequest.php

@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class CreateAircraftRequest extends FormRequest
 {
-
     /**
      * Determine if the user is authorized to make this request.
      *

app/Http/Requests/CreateAirlineRequest.php

@@ -17,6 +17,7 @@ class CreateAirlineRequest extends FormRequest
         $rules = Airline::$rules;
         $rules['iata'] .= '|unique:airlines';
         $rules['icao'] .= '|unique:airlines';
+
         return $rules;
     }
 }