From 960c2e604a8a82fbf0e81d435dbc752b1a24ec4e Mon Sep 17 00:00:00 2001 From: Gianluca Arbezzano Date: Tue, 29 Sep 2015 00:57:47 +0200 Subject: [PATCH 1/2] Refactoring default request and response --- src/App.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/App.php b/src/App.php index f1772e0..e1e7372 100644 --- a/src/App.php +++ b/src/App.php @@ -46,9 +46,6 @@ public function __construct(ContainerInterface $container = null) $this->container = $container ?: static::buildContainer(Loader::load()); $container = &$this->container; - $this->response = new Response(); - $this->request = ServerRequestFactory::fromGlobals(); - if ($container->has('router') == false) { throw new Exception('Define router config'); } @@ -123,8 +120,8 @@ private function getEventManager() */ public function run($request = null, $response = null) { - ($request != null) ?: $request = $this->request; - ($response != null) ?: $response = $this->response; + ($request != null) ?: $request = ServerRequestFactory::fromGlobals(); + ($response != null) ?: $response = new Response(); $event = new HttpFlowEvent('bootstrap', $request, $response); $container = $this->getContainer(); From 155a6f39325bc22a786d2a84fa0ace79019fcfeb Mon Sep 17 00:00:00 2001 From: Gianluca Arbezzano Date: Tue, 29 Sep 2015 19:43:31 +0200 Subject: [PATCH 2/2] Increase readability --- src/App.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/App.php b/src/App.php index e1e7372..0282489 100644 --- a/src/App.php +++ b/src/App.php @@ -120,8 +120,9 @@ private function getEventManager() */ public function run($request = null, $response = null) { - ($request != null) ?: $request = ServerRequestFactory::fromGlobals(); - ($response != null) ?: $response = new Response(); + $request = ($request != null) ? $request : $request = ServerRequestFactory::fromGlobals(); + $response = ($response !== null) ? $response : $response = new Response(); + $event = new HttpFlowEvent('bootstrap', $request, $response); $container = $this->getContainer();