getRouter should always return Router instance

ahoulgrave · Feb 10, 2018 · d93abfe · d93abfe
1 parent d0dfa25
commit d93abfe
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Bear/Routing/SymfonyRoutingAdapter.php b/src/Bear/Routing/SymfonyRoutingAdapter.php
@@ -75,16 +75,20 @@ public function resolve(string $uri, string $method): RoutingResolution
      */
     public function init(): void
     {
-        $context = new RequestContext();
-        $context->fromRequest($this->request);
-        $this->router = new Router($this->loader, $this->resource, [], $context);
     }
 
     /**
      * @return Router
      */
     public function getRouter(): Router
     {
+        if (!$this->router) {
+            $context = new RequestContext();
+            $context->fromRequest($this->request);
+
+            $this->router = new Router($this->loader, $this->resource, [], $context);
+        }
+
         return $this->router;
     }
 }