From 23b787279fb01afc3c1146fbeda7d1f8c9b5ebea Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 17 Sep 2015 08:54:31 +0930
Subject: [PATCH] Namespace migrations to avoid potential conflicts

Core migrations are under the Flarum\Migrations\Core namespace.
Extension migrations must be under the
Flarum\Migrations\{ExtensionName} namespace.

closes #422
---
 .../2015_02_24_000000_create_access_tokens_table.php   |  3 ++-
 .../2015_02_24_000000_create_api_keys_table.php        |  3 ++-
 .../2015_02_24_000000_create_config_table.php          |  3 ++-
 .../2015_02_24_000000_create_discussions_table.php     |  3 ++-
 .../2015_02_24_000000_create_email_tokens_table.php    |  3 ++-
 .../2015_02_24_000000_create_groups_table.php          |  3 ++-
 .../2015_02_24_000000_create_notifications_table.php   |  3 ++-
 .../2015_02_24_000000_create_password_tokens_table.php |  3 ++-
 .../2015_02_24_000000_create_permissions_table.php     |  3 ++-
 .../2015_02_24_000000_create_posts_table.php           |  3 ++-
 ...015_02_24_000000_create_users_discussions_table.php |  3 ++-
 .../2015_02_24_000000_create_users_groups_table.php    |  3 ++-
 .../2015_02_24_000000_create_users_table.php           |  3 ++-
 .../2015_09_15_000000_create_auth_tokens_table.php     |  3 ++-
 framework/core/src/Migrations/Migrator.php             | 10 ++++++----
 15 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/framework/core/migrations/2015_02_24_000000_create_access_tokens_table.php b/framework/core/migrations/2015_02_24_000000_create_access_tokens_table.php
index 8a50abf60..7a4b3e2c0 100644
--- a/framework/core/migrations/2015_02_24_000000_create_access_tokens_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_access_tokens_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_api_keys_table.php b/framework/core/migrations/2015_02_24_000000_create_api_keys_table.php
index 0ea0c6a8f..18bfc9f33 100644
--- a/framework/core/migrations/2015_02_24_000000_create_api_keys_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_api_keys_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_config_table.php b/framework/core/migrations/2015_02_24_000000_create_config_table.php
index 9c500dd19..986ff2548 100644
--- a/framework/core/migrations/2015_02_24_000000_create_config_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_config_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_discussions_table.php b/framework/core/migrations/2015_02_24_000000_create_discussions_table.php
index b1cc68773..58fb8e43b 100644
--- a/framework/core/migrations/2015_02_24_000000_create_discussions_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_discussions_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_email_tokens_table.php b/framework/core/migrations/2015_02_24_000000_create_email_tokens_table.php
index a199c3e03..615062cc1 100644
--- a/framework/core/migrations/2015_02_24_000000_create_email_tokens_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_email_tokens_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_groups_table.php b/framework/core/migrations/2015_02_24_000000_create_groups_table.php
index d82e0cc7b..9a6660cee 100644
--- a/framework/core/migrations/2015_02_24_000000_create_groups_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_groups_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_notifications_table.php b/framework/core/migrations/2015_02_24_000000_create_notifications_table.php
index e613aca7c..446a94285 100644
--- a/framework/core/migrations/2015_02_24_000000_create_notifications_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_notifications_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_password_tokens_table.php b/framework/core/migrations/2015_02_24_000000_create_password_tokens_table.php
index c9c281a83..e0fb42070 100644
--- a/framework/core/migrations/2015_02_24_000000_create_password_tokens_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_password_tokens_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_permissions_table.php b/framework/core/migrations/2015_02_24_000000_create_permissions_table.php
index ed93a77f1..93dd4458c 100644
--- a/framework/core/migrations/2015_02_24_000000_create_permissions_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_permissions_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_posts_table.php b/framework/core/migrations/2015_02_24_000000_create_posts_table.php
index 67d8e6946..6db5b9569 100644
--- a/framework/core/migrations/2015_02_24_000000_create_posts_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_posts_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_users_discussions_table.php b/framework/core/migrations/2015_02_24_000000_create_users_discussions_table.php
index b5c341fc0..a10aae1c6 100644
--- a/framework/core/migrations/2015_02_24_000000_create_users_discussions_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_users_discussions_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_users_groups_table.php b/framework/core/migrations/2015_02_24_000000_create_users_groups_table.php
index 02fe6e5d2..381d54f7a 100644
--- a/framework/core/migrations/2015_02_24_000000_create_users_groups_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_users_groups_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_02_24_000000_create_users_table.php b/framework/core/migrations/2015_02_24_000000_create_users_table.php
index 4e5add5e2..cb51d4472 100644
--- a/framework/core/migrations/2015_02_24_000000_create_users_table.php
+++ b/framework/core/migrations/2015_02_24_000000_create_users_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/migrations/2015_09_15_000000_create_auth_tokens_table.php b/framework/core/migrations/2015_09_15_000000_create_auth_tokens_table.php
index e5e1d55f8..0cbd2c6d0 100644
--- a/framework/core/migrations/2015_09_15_000000_create_auth_tokens_table.php
+++ b/framework/core/migrations/2015_09_15_000000_create_auth_tokens_table.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This file is part of Flarum.
  *
@@ -9,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flarum\Migrations\Core;
+
 use Flarum\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/framework/core/src/Migrations/Migrator.php b/framework/core/src/Migrations/Migrator.php
index a582e18c5..49fefa756 100755
--- a/framework/core/src/Migrations/Migrator.php
+++ b/framework/core/src/Migrations/Migrator.php
@@ -130,7 +130,7 @@ class Migrator
         // First we will resolve a "real" instance of the migration class from this
         // migration file name. Once we have the instances we can run the actual
         // command such as "up" or "down", or we can just simulate the action.
-        $migration = $this->resolve($file);
+        $migration = $this->resolve($file, $extension);
 
         $migration->up();
 
@@ -181,7 +181,7 @@ class Migrator
         // First we will get the file name of the migration so we can resolve out an
         // instance of the migration. Once we get an instance we can either run a
         // pretend execution of the migration or we can run the real migration.
-        $instance = $this->resolve($file);
+        $instance = $this->resolve($file, $extension);
 
         $instance->down();
 
@@ -242,11 +242,13 @@ class Migrator
      * @param  string  $file
      * @return object
      */
-    public function resolve($file)
+    public function resolve($file, $extension = null)
     {
         $file = implode('_', array_slice(explode('_', $file), 4));
 
-        $class = Str::studly($file);
+        $class = 'Flarum\\Migrations\\' . ($extension ? Str::studly($extension) : 'Core') . '\\';
+
+        $class .= Str::studly($file);
 
         return app()->make($class);
     }