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 7a4b3e2c0..27b32d7c7 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 18bfc9f33..e331e3504 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 986ff2548..6c8ef8379 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 58fb8e43b..1e3c4a430 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 615062cc1..4e0745bce 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 9a6660cee..9dae65d55 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 446a94285..e220458d9 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 e0fb42070..95b748459 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 93dd4458c..bc7b262fb 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 6db5b9569..45557cea0 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 a10aae1c6..4e26b5cb0 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 381d54f7a..b5780df14 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 cb51d4472..47bcd1b39 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; 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 0cbd2c6d0..dceb1d405 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 @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; use Flarum\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; diff --git a/framework/core/migrations/2015_09_20_224327_add_hide_to_discussions.php b/framework/core/migrations/2015_09_20_224327_add_hide_to_discussions.php index 0abd6caaa..3bd35e35c 100644 --- a/framework/core/migrations/2015_09_20_224327_add_hide_to_discussions.php +++ b/framework/core/migrations/2015_09_20_224327_add_hide_to_discussions.php @@ -1,6 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; use Illuminate\Database\Schema\Blueprint; use Flarum\Migrations\Migration; diff --git a/framework/core/migrations/2015_09_22_030432_rename_notification_read_time.php b/framework/core/migrations/2015_09_22_030432_rename_notification_read_time.php index e10511463..7aac39f9c 100644 --- a/framework/core/migrations/2015_09_22_030432_rename_notification_read_time.php +++ b/framework/core/migrations/2015_09_22_030432_rename_notification_read_time.php @@ -1,6 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ -namespace Flarum\Migrations\Core; +namespace Flarum\Core\Migrations; use Illuminate\Database\Schema\Blueprint; use Flarum\Migrations\Migration; diff --git a/framework/core/src/Install/Console/InstallCommand.php b/framework/core/src/Install/Console/InstallCommand.php index b4c15cdd0..ec5eb134f 100644 --- a/framework/core/src/Install/Console/InstallCommand.php +++ b/framework/core/src/Install/Console/InstallCommand.php @@ -310,10 +310,8 @@ class InstallCommand extends Command $migrator = $extensions->getMigrator(); - foreach ($extensions->getInfo() as $extension) { - $name = $extension->name; - - if ($name === 'pusher') { + foreach ($extensions->getInfo() as $name => $extension) { + if ($name === 'flarum-pusher') { continue; } @@ -329,7 +327,7 @@ class InstallCommand extends Command protected function getConfigFile() { - return base_path('../config.php'); + return base_path('config.php'); } /** diff --git a/framework/core/src/Migrations/Migrator.php b/framework/core/src/Migrations/Migrator.php index a9ecb6885..2d504ffec 100755 --- a/framework/core/src/Migrations/Migrator.php +++ b/framework/core/src/Migrations/Migrator.php @@ -246,7 +246,7 @@ class Migrator { $file = implode('_', array_slice(explode('_', $file), 4)); - $class = ($extension ? str_replace('-', '\\', $extension) : 'Core') . '\\Migrations\\'; + $class = ($extension ? str_replace('-', '\\', $extension) : 'Flarum\\Core') . '\\Migrations\\'; $class .= Str::studly($file);