Restructure Flarum\Database namespace

framework/core/src/Console/Server.php

@@ -16,7 +16,7 @@ use Flarum\Debug\Console\CacheClearCommand;
 use Flarum\Debug\Console\InfoCommand;
 use Flarum\Foundation\AbstractServer;
 use Flarum\Install\Console\InstallCommand;
-use Flarum\Update\Console\MigrateCommand;
+use Flarum\Database\Console\MigrateCommand;
 use Symfony\Component\Console\Application;
 
 class Server extends AbstractServer

framework/core/src/Database/Console/MigrateCommand.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Update\Console;
+namespace Flarum\Database\Console;
 
 use Flarum\Console\AbstractCommand;
 use Illuminate\Contracts\Container\Container;

framework/core/src/Database/DatabaseServiceProvider.php

@@ -12,7 +12,6 @@
 namespace Flarum\Database;
 
 use Flarum\Foundation\AbstractServiceProvider;
-use Flarum\Foundation\Application;
 use Illuminate\Database\ConnectionResolver;
 use Illuminate\Database\Connectors\ConnectionFactory;
 use PDO;
@@ -46,14 +45,6 @@ class DatabaseServiceProvider extends AbstractServiceProvider
         });
 
         $this->app->alias('Illuminate\Database\ConnectionResolverInterface', 'db');
-
-        $this->app->singleton('Flarum\Database\MigrationRepositoryInterface', function ($app) {
-            return new DatabaseMigrationRepository($app['db'], 'migrations');
-        });
-
-        $this->app->bind(MigrationCreator::class, function (Application $app) {
-            return new MigrationCreator($app->make('Illuminate\Filesystem\Filesystem'), $app->basePath());
-        });
     }
 
     /**

framework/core/src/Database/MigrationServiceProvider.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Database;
+
+use Flarum\Foundation\AbstractServiceProvider;
+use Flarum\Foundation\Application;
+
+class MigrationServiceProvider extends AbstractServiceProvider
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function register()
+    {
+        $this->app->singleton('Flarum\Database\MigrationRepositoryInterface', function ($app) {
+            return new DatabaseMigrationRepository($app['db'], 'migrations');
+        });
+
+        $this->app->bind(MigrationCreator::class, function (Application $app) {
+            return new MigrationCreator($app->make('Illuminate\Filesystem\Filesystem'), $app->basePath());
+        });
+    }
+}

framework/core/src/Update/Controller/UpdateController.php

@@ -14,7 +14,7 @@ namespace Flarum\Update\Controller;
 use Exception;
 use Flarum\Foundation\Application;
 use Flarum\Http\Controller\ControllerInterface;
-use Flarum\Update\Console\MigrateCommand;
+use Flarum\Database\Console\MigrateCommand;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\StreamOutput;