Move migration base class entirely into the interface

app/Database/migrations/2017_06_07_014930_create_settings_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateSettingsTable extends Migration

app/Database/migrations/2017_06_08_0000_create_users_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2017_06_08_0001_roles_permissions_tables.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class RolesPermissionsTables extends Migration

app/Database/migrations/2017_06_08_0005_create_password_resets_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2017_06_08_0006_create_sessions_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2017_06_08_191703_create_airlines_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateAirlinesTable extends Migration

app/Database/migrations/2017_06_09_010621_create_aircrafts_table.php

@@ -1,8 +1,8 @@
 <?php
 
+use App\Interfaces\Migration;
 use App\Models\Enums\AircraftState;
 use App\Models\Enums\AircraftStatus;
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateAircraftsTable extends Migration

app/Database/migrations/2017_06_10_040335_create_fares_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateFaresTable extends Migration

app/Database/migrations/2017_06_11_135707_create_airports_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateAirportsTable extends Migration

app/Database/migrations/2017_06_17_214650_create_flight_tables.php

@@ -1,7 +1,7 @@
 <?php
 
+use App\Interfaces\Migration;
 use App\Models\Enums\FlightType;
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateFlightTables extends Migration

app/Database/migrations/2017_06_21_165410_create_ranks_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateRanksTable extends Migration

app/Database/migrations/2017_06_23_011011_create_subfleet_tables.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 /**

app/Database/migrations/2017_06_28_195426_create_pirep_tables.php

@@ -1,9 +1,9 @@
 <?php
 
+use App\Interfaces\Migration;
 use App\Models\Enums\FlightType;
 use App\Models\Enums\PirepState;
 use App\Models\Enums\PirepStatus;
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreatePirepTables extends Migration

app/Database/migrations/2017_12_12_174519_create_bids_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2017_12_14_225241_create_jobs_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2017_12_14_225337_create_failed_jobs_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2017_12_20_004147_create_navdata_tables.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2017_12_20_005147_create_acars_tables.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2018_01_03_014930_create_stats_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateStatsTable extends Migration

app/Database/migrations/2018_01_08_142204_create_news_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2018_01_28_180522_create_awards_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2018_02_26_185121_create_expenses_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2018_02_28_231807_create_journal_transactions_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2018_02_28_231813_create_journals_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2018_02_28_232438_create_ledgers_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 

app/Database/migrations/2018_04_01_193443_create_files_table.php

@@ -1,8 +1,8 @@
 <?php
 
+use App\Interfaces\Migration;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
 
 class CreateFilesTable extends Migration
 {

app/Interfaces/Migration.php

@@ -2,11 +2,146 @@
 
 namespace App\Interfaces;
 
+use App\Models\Setting;
+use DB;
+
 /**
  * Class Migration
  * @package App\Interfaces
  */
 abstract class Migration extends \Illuminate\Database\Migrations\Migration
 {
+    protected $counters = [];
+    protected $offsets = [];
 
+    /**
+     * At a minimum, this function needs to be implemented
+     * @return mixed
+     */
+    abstract public function up();
+
+    /**
+     * A method to reverse a migration doesn't need to be made
+     */
+    public function down()
+    {
+
+    }
+
+    /**
+     * Dynamically figure out the offset and the start number for a group.
+     * This way we don't need to mess with how to order things
+     * When calling getNextOrderNumber(users) 31, will be returned, then 32, and so on
+     * @param      $name
+     * @param null $offset
+     * @param int  $start_offset
+     */
+    protected function addCounterGroup($name, $offset = null, $start_offset = 0)
+    {
+        if ($offset === null) {
+            $group = DB::table('settings')
+                ->where('group', $name)
+                ->first();
+
+            if ($group === null) {
+                $offset = (int) DB::table('settings')->max('offset');
+                if ($offset === null) {
+                    $offset = 0;
+                    $start_offset = 1;
+                } else {
+                    $offset += 100;
+                    $start_offset = $offset + 1;
+                }
+            } else {
+                # Now find the number to start from
+                $start_offset = (int) DB::table('settings')->where('group', $name)->max('order');
+                if ($start_offset === null) {
+                    $start_offset = $offset + 1;
+                } else {
+                    ++$start_offset;
+                }
+
+                $offset = $group->offset;
+            }
+        }
+
+        $this->counters[$name] = $start_offset;
+        $this->offsets[$name] = $offset;
+    }
+
+    /**
+     * Get the next increment number from a group
+     * @param $group
+     * @return int
+     */
+    public function getNextOrderNumber($group): int
+    {
+        if (!\in_array($group, $this->counters, true)) {
+            $this->addCounterGroup($group);
+        }
+
+        $idx = $this->counters[$group];
+        ++$this->counters[$group];
+
+        return $idx;
+    }
+
+    /**
+     * @param $key
+     * @param $attrs
+     */
+    public function addSetting($key, $attrs)
+    {
+        $group = $attrs['group'];
+        $order = $this->getNextOrderNumber($group);
+
+        $attrs = array_merge([
+            'id'          => Setting::formatKey($key),
+            'key'         => $key,
+            'offset'      => $this->offsets[$group],
+            'order'       => $order,
+            'name'        => '',
+            'group'       => $group,
+            'value'       => '',
+            'default'     => '',
+            'options'     => '',
+            'type'        => 'hidden',
+            'description' => '',
+        ], $attrs);
+
+        return $this->addData('settings', [$attrs]);
+    }
+
+    /**
+     * Update a setting
+     * @param       $key
+     * @param       $value
+     * @param array $attrs
+     */
+    public function updateSetting($key, $value, array $attrs = [])
+    {
+        $attrs['value'] = $value;
+        DB::table('settings')
+            ->where('id', Setting::formatKey($key))
+            ->update($attrs);
+    }
+
+    /**
+     * Add rows to a table
+     * @param $table
+     * @param $rows
+     */
+    public function addData($table, $rows)
+    {
+        foreach ($rows as $row) {
+            try {
+                DB::table($table)->insert($row);
+            } catch (\Exception $e) {
+                # setting already exists, just ignore it
+                if ($e->getCode() === 23000) {
+                    continue;
+                }
+            }
+        }
+    }
 }

app/Models/Migrations/Migration.php

@@ -1,137 +0,0 @@
-<?php
-/**
- * Migration base class with some extra functionality
- */
-
-namespace App\Models\Migrations;
-
-use App\Interfaces\Migration as MigrationInterface;
-use App\Models\Setting;
-use DB;
-
-/**
- * Class Migration
- * @package App\Models\Migrations
- */
-class Migration extends MigrationInterface
-{
-    protected $counters = [];
-    protected $offsets = [];
-
-    /**
-     * Dynamically figure out the offset and the start number for a group.
-     * This way we don't need to mess with how to order things
-     * When calling getNextOrderNumber(users) 31, will be returned, then 32, and so on
-     * @param      $name
-     * @param null $offset
-     * @param int  $start_offset
-     */
-    protected function addCounterGroup($name, $offset = null, $start_offset = 0)
-    {
-        if ($offset === null) {
-            $group = DB::table('settings')
-                ->where('group', $name)
-                ->first();
-
-            if ($group === null) {
-                $offset = (int) DB::table('settings')->max('offset');
-                if ($offset === null) {
-                    $offset = 0;
-                    $start_offset = 1;
-                } else {
-                    $offset += 100;
-                    $start_offset = $offset + 1;
-                }
-            } else {
-                # Now find the number to start from
-                $start_offset = (int) DB::table('settings')->where('group', $name)->max('order');
-                if ($start_offset === null) {
-                    $start_offset = $offset + 1;
-                } else {
-                    ++$start_offset;
-                }
-
-                $offset = $group->offset;
-            }
-        }
-
-        $this->counters[$name] = $start_offset;
-        $this->offsets[$name] = $offset;
-    }
-
-    /**
-     * Get the next increment number from a group
-     * @param $group
-     * @return int
-     */
-    public function getNextOrderNumber($group): int
-    {
-        if (!\in_array($group, $this->counters, true)) {
-            $this->addCounterGroup($group);
-        }
-
-        $idx = $this->counters[$group];
-        ++$this->counters[$group];
-
-        return $idx;
-    }
-
-    /**
-     * @param $key
-     * @param $attrs
-     */
-    public function addSetting($key, $attrs)
-    {
-        $group = $attrs['group'];
-        $order = $this->getNextOrderNumber($group);
-
-        $attrs = array_merge([
-            'id'          => Setting::formatKey($key),
-            'key'         => $key,
-            'offset'      => $this->offsets[$group],
-            'order'       => $order,
-            'name'        => '',
-            'group'       => $group,
-            'value'       => '',
-            'default'     => '',
-            'options'     => '',
-            'type'        => 'hidden',
-            'description' => '',
-        ], $attrs);
-
-        return $this->addData('settings', [$attrs]);
-    }
-
-    /**
-     * Update a setting
-     * @param       $key
-     * @param       $value
-     * @param array $attrs
-     */
-    public function updateSetting($key, $value, array $attrs = [])
-    {
-        $attrs['value'] = $value;
-        DB::table('settings')
-            ->where('id', Setting::formatKey($key))
-            ->update($attrs);
-    }
-
-    /**
-     * Add rows to a table
-     * @param $table
-     * @param $rows
-     */
-    public function addData($table, $rows)
-    {
-        foreach ($rows as $row) {
-            try {
-                DB::table($table)->insert($row);
-            } catch (\Exception $e) {
-                # setting already exists, just ignore it
-                if ($e->getCode() === 23000) {
-                    continue;
-                }
-            }
-        }
-    }
-}