Cleanup code, typehints and class references

src/Install/Console/InstallCommand.php

@@ -14,14 +14,29 @@ namespace Flarum\Install\Console;
 use Exception;
 use Flarum\Console\AbstractCommand;
 use Flarum\Database\AbstractModel;
+use Flarum\Database\Migrator;
+use Flarum\Discussion\DiscussionServiceProvider;
+use Flarum\Extension\ExtensionManager;
+use Flarum\Formatter\FormatterServiceProvider;
 use Flarum\Group\Group;
+use Flarum\Group\GroupServiceProvider;
 use Flarum\Group\Permission;
+use Flarum\Install\Prerequisite\PrerequisiteInterface;
+use Flarum\Notification\NotificationServiceProvider;
+use Flarum\Post\PostServiceProvider;
+use Flarum\Search\SearchServiceProvider;
+use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\User;
+use Flarum\User\UserServiceProvider;
 use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Database\ConnectionResolverInterface;
+use Illuminate\Database\Schema\Builder;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Validation\Factory;
 use PDO;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class InstallCommand extends AbstractCommand
 {
@@ -163,7 +178,7 @@ class InstallCommand extends AbstractCommand
 
             $this->storeConfiguration();
 
-            $resolver = $this->application->make('Illuminate\Database\ConnectionResolverInterface');
+            $resolver = $this->application->make(ConnectionResolverInterface::class);
             AbstractModel::setConnectionResolver($resolver);
             AbstractModel::setEventDispatcher($this->application->make('events'));
 
@@ -171,13 +186,13 @@ class InstallCommand extends AbstractCommand
 
             $this->writeSettings();
 
-            $this->application->register('Flarum\Formatter\FormatterServiceProvider');
-            $this->application->register('Flarum\Discussion\DiscussionServiceProvider');
-            $this->application->register('Flarum\Group\GroupServiceProvider');
-            $this->application->register('Flarum\Notification\NotificationServiceProvider');
-            $this->application->register('Flarum\Search\SearchServiceProvider');
-            $this->application->register('Flarum\Post\PostServiceProvider');
-            $this->application->register('Flarum\User\UserServiceProvider');
+            $this->application->register(FormatterServiceProvider::class);
+            $this->application->register(DiscussionServiceProvider::class);
+            $this->application->register(GroupServiceProvider::class);
+            $this->application->register(NotificationServiceProvider::class);
+            $this->application->register(SearchServiceProvider::class);
+            $this->application->register(PostServiceProvider::class);
+            $this->application->register(UserServiceProvider::class);
 
             $this->seedGroups();
             $this->seedPermissions();
@@ -240,11 +255,11 @@ class InstallCommand extends AbstractCommand
 
     protected function runMigrations()
     {
-        $this->application->bind('Illuminate\Database\Schema\Builder', function ($container) {
-            return $container->make('Illuminate\Database\ConnectionInterface')->getSchemaBuilder();
+        $this->application->bind(Builder::class, function ($container) {
+            return $container->make(ConnectionInterface::class)->getSchemaBuilder();
         });
 
-        $migrator = $this->application->make('Flarum\Database\Migrator');
+        $migrator = $this->application->make(Migrator::class);
         $migrator->getRepository()->createRepository();
 
         $migrator->run(__DIR__.'/../../../migrations');
@@ -256,7 +271,7 @@ class InstallCommand extends AbstractCommand
 
     protected function writeSettings()
     {
-        $settings = $this->application->make('Flarum\Settings\SettingsRepositoryInterface');
+        $settings = $this->application->make(SettingsRepositoryInterface::class);
 
         $this->info('Writing default settings');
 
@@ -341,7 +356,7 @@ class InstallCommand extends AbstractCommand
 
     protected function enableBundledExtensions()
     {
-        $extensions = $this->application->make('Flarum\Extension\ExtensionManager');
+        $extensions = $this->application->make(ExtensionManager::class);
 
         $migrator = $extensions->getMigrator();
 
@@ -386,7 +401,7 @@ class InstallCommand extends AbstractCommand
      */
     protected function getPrerequisites()
     {
-        return $this->application->make('Flarum\Install\Prerequisite\PrerequisiteInterface');
+        return $this->application->make(PrerequisiteInterface::class);
     }
 
     /**
@@ -394,7 +409,7 @@ class InstallCommand extends AbstractCommand
      */
     protected function getValidator()
     {
-        return new Factory($this->application->make('Symfony\Component\Translation\TranslatorInterface'));
+        return new Factory($this->application->make(TranslatorInterface::class));
     }
 
     protected function showErrors($errors)

src/Install/Controller/IndexController.php

@@ -40,7 +40,7 @@ class IndexController extends AbstractHtmlController
 
     /**
      * @param Request $request
-     * @return \Psr\Http\Message\ResponseInterface
+     * @return \Illuminate\Contracts\Support\Renderable
      */
     public function render(Request $request)
     {

src/Install/InstallServiceProvider.php

@@ -17,6 +17,7 @@ use Flarum\Http\RouteHandlerFactory;
 use Flarum\Install\Prerequisite\Composite;
 use Flarum\Install\Prerequisite\PhpExtensions;
 use Flarum\Install\Prerequisite\PhpVersion;
+use Flarum\Install\Prerequisite\PrerequisiteInterface;
 use Flarum\Install\Prerequisite\WritablePaths;
 
 class InstallServiceProvider extends AbstractServiceProvider
@@ -27,7 +28,7 @@ class InstallServiceProvider extends AbstractServiceProvider
     public function register()
     {
         $this->app->bind(
-            'Flarum\Install\Prerequisite\PrerequisiteInterface',
+            PrerequisiteInterface::class,
             function () {
                 return new Composite(
                     new PhpVersion('5.5.0'),