diff --git a/framework/core/src/Foundation/Application.php b/framework/core/src/Foundation/Application.php index 2753291b5..61c8fd798 100644 --- a/framework/core/src/Foundation/Application.php +++ b/framework/core/src/Foundation/Application.php @@ -119,22 +119,20 @@ class Application extends Container implements ApplicationContract * * @return bool */ - public function isInstalled() + public function isInstalled(): bool { return $this->bound('flarum.config'); } - public function isUpToDate() + public function isUpToDate(): bool { $settings = $this->make(SettingsRepositoryInterface::class); try { $version = $settings->get('version'); } finally { - $isUpToDate = isset($version) && $version === $this->version(); + return isset($version) && $version === $this->version(); } - - return $isUpToDate; } /** diff --git a/framework/core/src/Http/Server.php b/framework/core/src/Http/Server.php index 9c5c1af7c..222d177fe 100644 --- a/framework/core/src/Http/Server.php +++ b/framework/core/src/Http/Server.php @@ -118,7 +118,7 @@ class Server // (Right now it tries to resolve a database connection because of the injected settings repo instance) // We could register a different settings repo when Flarum is not installed //$pipe->pipe($this->app->make(HandleErrors::class, ['debug' => true])); - $pipe->pipe($this->app->make(StartSession::class)); + //$pipe->pipe($this->app->make(StartSession::class)); $pipe->pipe($this->app->make(DispatchRoute::class, ['routes' => $this->app->make('flarum.install.routes')])); return $pipe;