From 7192c4391bee006ccc2de3db6caa89803d72d130 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 25 Apr 2016 09:17:11 +0930 Subject: [PATCH] Fix console installer not working Some commands have dependencies which causes errors when there's no config/database access, so they shouldn't be instantiated. --- src/Console/Server.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Console/Server.php b/src/Console/Server.php index 38f1c94a3..d20ca0d76 100644 --- a/src/Console/Server.php +++ b/src/Console/Server.php @@ -42,16 +42,21 @@ class Server extends AbstractServer $commands = [ InstallCommand::class, MigrateCommand::class, - InfoCommand::class, - CacheClearCommand::class, GenerateExtensionCommand::class, GenerateMigrationCommand::class, ]; + if ($app->isInstalled()) { + $commands = array_merge($commands, [ + InfoCommand::class, + CacheClearCommand::class + ]); + } + foreach ($commands as $command) { $console->add($app->make( $command, - ['config' => $app->make('flarum.config')] + ['config' => $app->isInstalled() ? $app->make('flarum.config') : []] )); }