moved router in app; expport app when loading routes

src/Utils/Controller/LuRoute.php

@@ -35,23 +35,10 @@ class LuRoute {
      */
     private $routes = array();
 
-    /**
-     * @var LuRoute
-     */
-    private static $instance = null;
-
-    private function __construct()
+    public function __construct()
     {
     }
 
-    public static function getInstance()
-    {
-        if (is_null(self::$instance)) {
-            self::$instance = new static();
-        }
-        return self::$instance;
-    }
-
     public function getRoutes()
     {
         return $this->routes;

src/Utils/Controller/LuticateApplication.php

@@ -19,6 +19,7 @@ class LuticateApplication implements MessageComponentInterface
     private $_version = 1.0;
     private $_config = null;
     private $_clients = null;
+    private $_router = null;
     
     private static $_app = null;
     
@@ -34,9 +35,26 @@ class LuticateApplication implements MessageComponentInterface
     {
         $this->_config = $configuration;
         $this->_clients = new \SplObjectStorage;
+        $this->_router = new LuRoute();
         self::$_app = $this;
     }
 
+    /**
+     * @return LuRoute
+     */
+    public function getRouter()
+    {
+        return $this->_router;
+    }
+
+    /**
+     * @param LuRoute|null $router
+     */
+    public function setRouter($router)
+    {
+        $this->_router = $router;
+    }
+
     /**
      * @param $version float
      */
@@ -55,21 +73,22 @@ class LuticateApplication implements MessageComponentInterface
     
     public function setupRoutes()
     {
-        require_once __DIR__ . '/../../../../../../app/routes.php';
-        $router = LuRoute::getInstance();
+        function($app)
+        {
+            require_once __DIR__ . '/../../../../../../app/routes.php';
+        }($this);
         
-        $router->setup();
+        $this->_router->setup();
     }
     
     public function runHttp()
     {
         $httpMethod = $_SERVER['REQUEST_METHOD'];
         $url = $_SERVER['REQUEST_URI'];
-        $router = LuRoute::getInstance();
 
         $parameters = array_merge($_GET, $_POST);
 
-        $router->dispatch($httpMethod, $url, $parameters);
+        $this->_router->dispatch($httpMethod, $url, $parameters);
     }
     
     public function runWs()