github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 09:41:49 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity

fixes session during installation (#1418)

Browse Source 
* fixes session during installation

* Apply fixes from StyleCI

[ci skip] [skip ci]

* styling of commented code, removed unnecessary import
This commit is contained in:
Daniël Klabbers 2018-05-08 10:32:28 +02:00 committed by GitHub
parent c4a501f82a
commit b8632d693a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Foundation/Application.php
View File

@ -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;
}
/**

2
src/Http/Server.php
View File

@ -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;