github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-30 13:36:10 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Disable HandleErrors middleware during installation

Browse Source 
Temporary measure until we have a real fix in place.
This commit is contained in:
Franz Liedke 2017-12-20 00:00:23 +01:00
parent e779b89bfb
commit 54ecd48b72
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/core/src/Http/Server.php
View File

@ -67,6 +67,7 @@ class Server
*/ */
public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $out) public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $out)
{ {
// FIXME: Only call this when app is installed. Do this via middleware?
$this->collectGarbage(); $this->collectGarbage();
$middleware = $this->getMiddleware($request->getUri()->getPath()); $middleware = $this->getMiddleware($request->getUri()->getPath());
@ -119,8 +120,10 @@ class Server
{ {
$this->app->register(InstallServiceProvider::class); $this->app->register(InstallServiceProvider::class);
$pipe->pipe(new HandleErrors($this->getErrorDir(), $this->app->make('log'), true)); // FIXME: Re-enable HandleErrors middleware, if possible
// (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')])); $pipe->pipe($this->app->make(DispatchRoute::class, ['routes' => $this->app->make('flarum.install.routes')]));