github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-08 19:01:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lazily initialise the Application instance

Browse Source 
See 04aef5814e
This commit is contained in:
Toby Zerner 2016-04-24 11:10:39 +09:30
parent 73b6ef520f
commit 7459afb89e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/core/src/Foundation/AbstractServer.php
View File

@ -62,8 +62,6 @@ abstract class AbstractServer
if (file_exists($file = $this->basePath.'/config.php')) { if (file_exists($file = $this->basePath.'/config.php')) {
$this->config = include $file; $this->config = include $file;
} }
$this->app = $this->getApp();
} }
/** /**
@ -135,6 +133,10 @@ abstract class AbstractServer
*/ */
protected function getApp() protected function getApp()
{ {
if ($this->app !== null) {
return $this->app;
}
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
$app = new Application($this->basePath, $this->publicPath); $app = new Application($this->basePath, $this->publicPath);
@ -182,6 +184,8 @@ abstract class AbstractServer
$app->boot(); $app->boot();
$this->app = $app;
return $app; return $app;
} }

6
framework/core/src/Http/AbstractServer.php
View File

@ -44,9 +44,11 @@ abstract class AbstractServer extends BaseAbstractServer
*/ */
public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $out = null) public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $out = null)
{ {
$this->collectGarbage($this->app); $app = $this->getApp();
$middleware = $this->getMiddleware($this->app); $this->collectGarbage($app);
$middleware = $this->getMiddleware($app);
return $middleware($request, $response, $out); return $middleware($request, $response, $out);
} }