Merge pull request #374 from forkify/migration

lucadegasperi · lucadegasperi · commit 561924f88383 · 2015-06-03T10:11:46.000+02:00
Simplify the Migration class and rename it to AbstractMigration
diff --git a/migrations/2014_04_24_110151_create_oauth_scopes_table.php b/migrations/2014_04_24_110151_create_oauth_scopes_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthScopesTable extends Migration
+class CreateOauthScopesTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_110304_create_oauth_grants_table.php b/migrations/2014_04_24_110304_create_oauth_grants_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthGrantsTable extends Migration
+class CreateOauthGrantsTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_110403_create_oauth_grant_scopes_table.php b/migrations/2014_04_24_110403_create_oauth_grant_scopes_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthGrantScopesTable extends Migration
+class CreateOauthGrantScopesTable extends AbstractMigration
 {
     /**
      * Run the migrations.
diff --git a/migrations/2014_04_24_110459_create_oauth_clients_table.php b/migrations/2014_04_24_110459_create_oauth_clients_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthClientsTable extends Migration
+class CreateOauthClientsTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_110557_create_oauth_client_endpoints_table.php b/migrations/2014_04_24_110557_create_oauth_client_endpoints_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthClientEndpointsTable extends Migration
+class CreateOauthClientEndpointsTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_110705_create_oauth_client_scopes_table.php b/migrations/2014_04_24_110705_create_oauth_client_scopes_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthClientScopesTable extends Migration
+class CreateOauthClientScopesTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_110817_create_oauth_client_grants_table.php b/migrations/2014_04_24_110817_create_oauth_client_grants_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthClientGrantsTable extends Migration
+class CreateOauthClientGrantsTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_111002_create_oauth_sessions_table.php b/migrations/2014_04_24_111002_create_oauth_sessions_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthSessionsTable extends Migration
+class CreateOauthSessionsTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_111109_create_oauth_session_scopes_table.php b/migrations/2014_04_24_111109_create_oauth_session_scopes_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthSessionScopesTable extends Migration
+class CreateOauthSessionScopesTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_111254_create_oauth_auth_codes_table.php b/migrations/2014_04_24_111254_create_oauth_auth_codes_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthAuthCodesTable extends Migration
+class CreateOauthAuthCodesTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_111403_create_oauth_auth_code_scopes_table.php b/migrations/2014_04_24_111403_create_oauth_auth_code_scopes_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthAuthCodeScopesTable extends Migration
+class CreateOauthAuthCodeScopesTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_111518_create_oauth_access_tokens_table.php b/migrations/2014_04_24_111518_create_oauth_access_tokens_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthAccessTokensTable extends Migration
+class CreateOauthAccessTokensTable extends AbstractMigration
 {
     /**
      * Run the migrations.
diff --git a/migrations/2014_04_24_111657_create_oauth_access_token_scopes_table.php b/migrations/2014_04_24_111657_create_oauth_access_token_scopes_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthAccessTokenScopesTable extends Migration
+class CreateOauthAccessTokenScopesTable extends AbstractMigration
 {
 
     /**
diff --git a/migrations/2014_04_24_111810_create_oauth_refresh_tokens_table.php b/migrations/2014_04_24_111810_create_oauth_refresh_tokens_table.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Database\Schema\Blueprint;
-use LucaDegasperi\OAuth2Server\Support\Migration;
+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;
 
-class CreateOauthRefreshTokensTable extends Migration
+class CreateOauthRefreshTokensTable extends AbstractMigration
 {
 
     /**
diff --git a/src/Support/AbstractMigration.php b/src/Support/AbstractMigration.php
@@ -11,29 +11,31 @@
 
 namespace LucaDegasperi\OAuth2Server\Support;
 
-use Config;
-use Schema;
-use Illuminate\Database\Migrations\Migration as BaseMigration;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Schema;
 
-abstract class Migration extends BaseMigration
+abstract class AbstractMigration extends Migration
 {
     /**
-     * The OAuth2 server database connection name.
-     * 
-     * @var string
-     */
-    protected $connectionName;
-
-    /**
+     * Create the migration helper instance.
      *
+     * @return void
      */
     public function __construct()
     {
-        $this->connectionName = (Config::get('oauth2.database') !== 'default') ? Config::get('oauth2.database') : null;
+        $database = Config::get('oauth2.database');
+
+        $this->connection = $database !== 'default' ? $database : null;
     }
 
+    /**
+     * Setup the schema with a connection.
+     *
+     * @return mixed
+     */
     public function schema()
     {
-        return Schema::connection($this->connectionName);
+        return Schema::connection($this->connection);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use Illuminate\Database\Schema\Blueprint;`
`4`		`-use LucaDegasperi\OAuth2Server\Support\Migration;`
	`4`	`+use LucaDegasperi\OAuth2Server\Support\AbstractMigration;`
`5`	`5`
`6`		`-class CreateOauthScopesTable extends Migration`
	`6`	`+class CreateOauthScopesTable extends AbstractMigration`
`7`	`7`	`{`
`8`	`8`
`9`	`9`	`/**`